[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 03/19] hw/arm/bcm2835_peripherals: Name various address space
From: |
Alistair Francis |
Subject: |
Re: [PATCH 03/19] hw/arm/bcm2835_peripherals: Name various address spaces |
Date: |
Fri, 27 Sep 2019 14:38:36 -0700 |
On Thu, Sep 26, 2019 at 10:36 AM Philippe Mathieu-Daudé <address@hidden> wrote:
>
> Various address spaces from the BCM2835 are reported as
> 'anonymous' in memory tree:
>
> (qemu) info mtree
>
> address-space: anonymous
> 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox
> 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb
> 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property
>
> address-space: anonymous
> 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu
> 0000000000000000-000000003fffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 0000000040000000-000000007fffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 000000007e000000-000000007effffff (prio 1, i/o): alias
> bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff
> 0000000080000000-00000000bfffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 00000000c0000000-00000000ffffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
>
> [...]
>
> Since the address_space_init() function takes a 'name' argument,
> set it to correctly describe each address space:
>
> (qemu) info mtree
>
> address-space: bcm2835-mbox-memory
> 0000000000000000-000000000000008f (prio 0, i/o): bcm2835-mbox
> 0000000000000010-000000000000001f (prio 0, i/o): bcm2835-fb
> 0000000000000080-000000000000008f (prio 0, i/o): bcm2835-property
>
> address-space: bcm2835-fb-memory
> 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu
> 0000000000000000-000000003fffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 0000000040000000-000000007fffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 000000007e000000-000000007effffff (prio 1, i/o): alias
> bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff
> 0000000080000000-00000000bfffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 00000000c0000000-00000000ffffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
>
> address-space: bcm2835-property-memory
> 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu
> 0000000000000000-000000003fffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 0000000040000000-000000007fffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 000000007e000000-000000007effffff (prio 1, i/o): alias
> bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff
> 0000000080000000-00000000bfffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 00000000c0000000-00000000ffffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
>
> address-space: bcm2835-dma-memory
> 0000000000000000-00000000ffffffff (prio 0, i/o): bcm2835-gpu
> 0000000000000000-000000003fffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 0000000040000000-000000007fffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 000000007e000000-000000007effffff (prio 1, i/o): alias
> bcm2835-peripherals @bcm2835-peripherals 0000000000000000-0000000000ffffff
> 0000000080000000-00000000bfffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
> 00000000c0000000-00000000ffffffff (prio 0, i/o): alias
> bcm2835-gpu-ram-alias[*] @ram 0000000000000000-000000003fffffff
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Alistair
> ---
> hw/display/bcm2835_fb.c | 2 +-
> hw/dma/bcm2835_dma.c | 2 +-
> hw/misc/bcm2835_mbox.c | 2 +-
> hw/misc/bcm2835_property.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
> index 8f856878cd..85aaa54330 100644
> --- a/hw/display/bcm2835_fb.c
> +++ b/hw/display/bcm2835_fb.c
> @@ -425,7 +425,7 @@ static void bcm2835_fb_realize(DeviceState *dev, Error
> **errp)
> s->initial_config.base = s->vcram_base + BCM2835_FB_OFFSET;
>
> s->dma_mr = MEMORY_REGION(obj);
> - address_space_init(&s->dma_as, s->dma_mr, NULL);
> + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_FB "-memory");
>
> bcm2835_fb_reset(dev);
>
> diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
> index 6acc2b644e..1e458d7fba 100644
> --- a/hw/dma/bcm2835_dma.c
> +++ b/hw/dma/bcm2835_dma.c
> @@ -383,7 +383,7 @@ static void bcm2835_dma_realize(DeviceState *dev, Error
> **errp)
> }
>
> s->dma_mr = MEMORY_REGION(obj);
> - address_space_init(&s->dma_as, s->dma_mr, NULL);
> + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_DMA "-memory");
>
> bcm2835_dma_reset(dev);
> }
> diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
> index 7690b9afaf..77285624c9 100644
> --- a/hw/misc/bcm2835_mbox.c
> +++ b/hw/misc/bcm2835_mbox.c
> @@ -311,7 +311,7 @@ static void bcm2835_mbox_realize(DeviceState *dev, Error
> **errp)
> }
>
> s->mbox_mr = MEMORY_REGION(obj);
> - address_space_init(&s->mbox_as, s->mbox_mr, NULL);
> + address_space_init(&s->mbox_as, s->mbox_mr, TYPE_BCM2835_MBOX "-memory");
> bcm2835_mbox_reset(dev);
> }
>
> diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
> index 0a1a3eb5d9..43a5465c5d 100644
> --- a/hw/misc/bcm2835_property.c
> +++ b/hw/misc/bcm2835_property.c
> @@ -407,7 +407,7 @@ static void bcm2835_property_realize(DeviceState *dev,
> Error **errp)
> }
>
> s->dma_mr = MEMORY_REGION(obj);
> - address_space_init(&s->dma_as, s->dma_mr, NULL);
> + address_space_init(&s->dma_as, s->dma_mr, TYPE_BCM2835_PROPERTY
> "-memory");
>
> /* TODO: connect to MAC address of USB NIC device, once we emulate it */
> qemu_macaddr_default_if_unset(&s->macaddr);
> --
> 2.20.1
>
>
- [PATCH 00/19] hw/arm/raspi: Improve Raspberry Pi 2/3 reliability, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 01/19] hw/arm/raspi: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 04/19] hw/arm/bcm2835: Rename some definitions, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 02/19] hw/arm/bcm2835_peripherals: Improve logging, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 03/19] hw/arm/bcm2835_peripherals: Name various address spaces, Philippe Mathieu-Daudé, 2019/09/26
- Re: [PATCH 03/19] hw/arm/bcm2835_peripherals: Name various address spaces,
Alistair Francis <=
- [PATCH 05/19] hw/arm/bcm2835: Add various unimplemented peripherals, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 07/19] hw/misc/bcm2835_mbox: Add trace events, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 06/19] hw/char/bcm2835_aux: Add trace events, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 09/19] hw/arm/bcm2835_peripherals: Use the thermal sensor block, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 08/19] hw/misc/bcm2835_thermal: Add a dummy BCM2835 thermal sensor, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 10/19] hw/timer/bcm2835: Add the BCM2835 SYS_timer, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 11/19] hw/arm/bcm2835_peripherals: Use the SYS_timer, Philippe Mathieu-Daudé, 2019/09/26
- [PATCH 12/19] hw/arm/bcm2835_peripherals: Add Clock/Power/Reset Manager blocks, Philippe Mathieu-Daudé, 2019/09/26