From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Andrew Baumann" <Andrew.Baumann@microsoft.com>, "Aurelien Jarno" <aurelien@aurel32.net>, kvm@vger.kernel.org, "Alex Williamson" <alex.williamson@redhat.com>, "Aleksandar Markovic" <amarkovic@wavecomp.com>, "Joel Stanley" <joel@jms.id.au>, qemu-arm@nongnu.org, "Marcelo Tosatti" <mtosatti@redhat.com>, "Alistair Francis" <alistair@alistair23.me>, "Michael S. Tsirkin" <mst@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Richard Henderson" <rth@twiddle.net>, "Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Paul Burton" <pburton@wavecomp.com>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Paolo Bonzini" <pbonzini@redhat.com> Subject: [PATCH 1/8] hw/arm/nrf51_soc: Use memory_region_add_subregion() when priority is 0 Date: Sat, 14 Dec 2019 16:56:07 +0100 [thread overview] Message-ID: <20191214155614.19004-2-philmd@redhat.com> (raw) In-Reply-To: <20191214155614.19004-1-philmd@redhat.com> It is pointless to overlap a memory subregion with priority 0. Use the simpler memory_region_add_subregion() function. This patch was produced with the following spatch script: @@ expression region; expression offset; expression subregion; @@ -memory_region_add_subregion_overlap(region, offset, subregion, 0) +memory_region_add_subregion(region, offset, subregion) Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/arm/nrf51_soc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index 74029169d0..ade06b225f 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -94,7 +94,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) return; } mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->uart), 0); - memory_region_add_subregion_overlap(&s->container, NRF51_UART_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_UART_BASE, mr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart), 0, qdev_get_gpio_in(DEVICE(&s->cpu), BASE_TO_IRQ(NRF51_UART_BASE))); @@ -107,7 +107,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) } mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->rng), 0); - memory_region_add_subregion_overlap(&s->container, NRF51_RNG_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_RNG_BASE, mr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->rng), 0, qdev_get_gpio_in(DEVICE(&s->cpu), BASE_TO_IRQ(NRF51_RNG_BASE))); @@ -127,13 +127,13 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) } mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 0); - memory_region_add_subregion_overlap(&s->container, NRF51_NVMC_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_NVMC_BASE, mr); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 1); - memory_region_add_subregion_overlap(&s->container, NRF51_FICR_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_FICR_BASE, mr); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 2); - memory_region_add_subregion_overlap(&s->container, NRF51_UICR_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_UICR_BASE, mr); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 3); - memory_region_add_subregion_overlap(&s->container, NRF51_FLASH_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_FLASH_BASE, mr); /* GPIO */ object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err); @@ -143,7 +143,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) } mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0); - memory_region_add_subregion_overlap(&s->container, NRF51_GPIO_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_GPIO_BASE, mr); /* Pass all GPIOs to the SOC layer so they are available to the board */ qdev_pass_gpios(DEVICE(&s->gpio), dev_soc, NULL); -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Alistair Francis" <alistair@alistair23.me>, "Paul Burton" <pburton@wavecomp.com>, "Eduardo Habkost" <ehabkost@redhat.com>, kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>, "Marcelo Tosatti" <mtosatti@redhat.com>, "Andrew Baumann" <Andrew.Baumann@microsoft.com>, "Alex Williamson" <alex.williamson@redhat.com>, qemu-arm@nongnu.org, "Joel Stanley" <joel@jms.id.au>, "Aleksandar Markovic" <amarkovic@wavecomp.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net>, "Richard Henderson" <rth@twiddle.net> Subject: [PATCH 1/8] hw/arm/nrf51_soc: Use memory_region_add_subregion() when priority is 0 Date: Sat, 14 Dec 2019 16:56:07 +0100 [thread overview] Message-ID: <20191214155614.19004-2-philmd@redhat.com> (raw) In-Reply-To: <20191214155614.19004-1-philmd@redhat.com> It is pointless to overlap a memory subregion with priority 0. Use the simpler memory_region_add_subregion() function. This patch was produced with the following spatch script: @@ expression region; expression offset; expression subregion; @@ -memory_region_add_subregion_overlap(region, offset, subregion, 0) +memory_region_add_subregion(region, offset, subregion) Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/arm/nrf51_soc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index 74029169d0..ade06b225f 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -94,7 +94,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) return; } mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->uart), 0); - memory_region_add_subregion_overlap(&s->container, NRF51_UART_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_UART_BASE, mr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart), 0, qdev_get_gpio_in(DEVICE(&s->cpu), BASE_TO_IRQ(NRF51_UART_BASE))); @@ -107,7 +107,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) } mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->rng), 0); - memory_region_add_subregion_overlap(&s->container, NRF51_RNG_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_RNG_BASE, mr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->rng), 0, qdev_get_gpio_in(DEVICE(&s->cpu), BASE_TO_IRQ(NRF51_RNG_BASE))); @@ -127,13 +127,13 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) } mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 0); - memory_region_add_subregion_overlap(&s->container, NRF51_NVMC_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_NVMC_BASE, mr); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 1); - memory_region_add_subregion_overlap(&s->container, NRF51_FICR_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_FICR_BASE, mr); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 2); - memory_region_add_subregion_overlap(&s->container, NRF51_UICR_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_UICR_BASE, mr); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->nvm), 3); - memory_region_add_subregion_overlap(&s->container, NRF51_FLASH_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_FLASH_BASE, mr); /* GPIO */ object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err); @@ -143,7 +143,7 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) } mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0); - memory_region_add_subregion_overlap(&s->container, NRF51_GPIO_BASE, mr, 0); + memory_region_add_subregion(&s->container, NRF51_GPIO_BASE, mr); /* Pass all GPIOs to the SOC layer so they are available to the board */ qdev_pass_gpios(DEVICE(&s->gpio), dev_soc, NULL); -- 2.21.0
next prev parent reply other threads:[~2019-12-14 15:56 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-14 15:56 [PATCH 0/8] Simplify memory_region_add_subregion_overlap(..., priority=0) Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé [this message] 2019-12-14 15:56 ` [PATCH 1/8] hw/arm/nrf51_soc: Use memory_region_add_subregion() when priority is 0 Philippe Mathieu-Daudé 2019-12-14 15:56 ` [PATCH 2/8] hw/arm/raspi: " Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé 2019-12-14 15:56 ` [PATCH 3/8] hw/arm/xlnx-versal: " Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé 2019-12-14 15:56 ` [PATCH 4/8] hw/i386/intel_iommu: Use memory_region_add_subregion " Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé 2019-12-14 15:56 ` [PATCH 5/8] hw/mips/boston: Use memory_region_add_subregion() " Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé 2019-12-14 15:56 ` [PATCH 6/8] hw/vfio/pci: " Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé 2019-12-14 15:56 ` [PATCH 7/8] target/i386: " Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé 2019-12-14 15:56 ` [PATCH 8/8] target/i386/cpu: Use 'mr' for MemoryRegion variables Philippe Mathieu-Daudé 2019-12-14 15:56 ` Philippe Mathieu-Daudé 2019-12-14 16:28 ` [PATCH 0/8] Simplify memory_region_add_subregion_overlap(..., priority=0) Peter Maydell 2019-12-14 16:28 ` Peter Maydell 2019-12-14 18:17 ` Philippe Mathieu-Daudé 2019-12-14 18:17 ` Philippe Mathieu-Daudé 2019-12-14 20:01 ` Peter Maydell 2019-12-14 20:01 ` Peter Maydell 2019-12-15 9:54 ` Michael S. Tsirkin 2019-12-15 9:54 ` Michael S. Tsirkin 2019-12-15 9:51 ` Michael S. Tsirkin 2019-12-15 9:51 ` Michael S. Tsirkin 2019-12-15 15:27 ` Peter Maydell 2019-12-15 15:27 ` Peter Maydell 2019-12-16 11:39 ` Michael S. Tsirkin 2019-12-16 11:39 ` Michael S. Tsirkin 2019-12-16 11:46 ` Peter Maydell 2019-12-16 11:46 ` Peter Maydell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191214155614.19004-2-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=Andrew.Baumann@microsoft.com \ --cc=aleksandar.rikalo@rt-rk.com \ --cc=alex.williamson@redhat.com \ --cc=alistair@alistair23.me \ --cc=amarkovic@wavecomp.com \ --cc=aurelien@aurel32.net \ --cc=edgar.iglesias@gmail.com \ --cc=ehabkost@redhat.com \ --cc=joel@jms.id.au \ --cc=kvm@vger.kernel.org \ --cc=marcel.apfelbaum@gmail.com \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=pburton@wavecomp.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.