[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 2/2] hw/rtc/m48t59: Simplify m48t59_init() passing MemoryR
From: |
David Gibson |
Subject: |
Re: [PATCH v2 2/2] hw/rtc/m48t59: Simplify m48t59_init() passing MemoryRegion argument |
Date: |
Fri, 16 Oct 2020 11:44:57 +1100 |
On Thu, Oct 15, 2020 at 09:46:47PM +0200, Philippe Mathieu-Daudé wrote:
> Pass a MemoryRegion* to m48t59_init(), directly call
> memory_region_add_subregion() instead of sysbus_mmio_map().
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
ppc parts
Acked-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> include/hw/rtc/m48t59.h | 2 +-
> hw/ppc/ppc405_boards.c | 2 +-
> hw/rtc/m48t59.c | 10 +++-------
> hw/sparc/sun4m.c | 3 ++-
> hw/sparc64/sun4u.c | 7 ++-----
> 5 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/include/hw/rtc/m48t59.h b/include/hw/rtc/m48t59.h
> index d99dda2b7de..3c337e8171c 100644
> --- a/include/hw/rtc/m48t59.h
> +++ b/include/hw/rtc/m48t59.h
> @@ -49,7 +49,7 @@ struct NvramClass {
>
> Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,
> int base_year, int type);
> -Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
> +Nvram *m48t59_init(MemoryRegion *mr, hwaddr mem_base, qemu_irq IRQ,
> uint16_t size, int base_year, int model);
>
> #endif /* HW_M48T59_H */
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 93ffee801a3..6ab1b860545 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -227,7 +227,7 @@ static void ref405ep_init(MachineState *machine)
> /* Register FPGA */
> ref405ep_fpga_init(sysmem, 0xF0300000);
> /* Register NVRAM */
> - m48t59_init(NULL, 0xF0000000, 8192, 1968, 8);
> + m48t59_init(get_system_memory(), 0xF0000000, NULL, 8192, 1968, 8);
> /* Load kernel */
> linux_boot = (kernel_filename != NULL);
> if (linux_boot) {
> diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c
> index 8b02c2ec558..7ec4b241218 100644
> --- a/hw/rtc/m48t59.c
> +++ b/hw/rtc/m48t59.c
> @@ -565,9 +565,8 @@ const MemoryRegionOps m48t59_io_ops = {
> };
>
> /* Initialisation routine */
> -Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
> - uint16_t size, int base_year,
> - int model)
> +Nvram *m48t59_init(MemoryRegion *mr, hwaddr mem_base, qemu_irq IRQ,
> + uint16_t size, int base_year, int model)
> {
> DeviceState *dev;
> SysBusDevice *s;
> @@ -584,10 +583,7 @@ Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,
> s = SYS_BUS_DEVICE(dev);
> sysbus_realize_and_unref(s, &error_fatal);
> sysbus_connect_irq(s, 0, IRQ);
> - if (mem_base != 0) {
> - sysbus_mmio_map(s, 0, mem_base);
> - }
> -
> + memory_region_add_subregion(mr, mem_base, sysbus_mmio_get_region(s,
> 0));
> return NVRAM(s);
> }
>
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 20c1fa41192..aebe9e0df3d 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -966,7 +966,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
> create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000);
> }
>
> - nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0x2000, 1968, 8);
> + nvram = m48t59_init(get_system_memory(), hwdef->nvram_base,
> slavio_irq[0],
> + 0x2000, 1968, 8);
>
> slavio_timer_init_all(hwdef->counter_base, slavio_irq[19],
> slavio_cpu_irq, smp_cpus);
>
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index 6854522bbfa..4c975c25274 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -561,7 +561,6 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
> SabreState *sabre;
> PCIBus *pci_bus, *pci_busA, *pci_busB;
> PCIDevice *ebus, *pci_dev;
> - SysBusDevice *s;
> DeviceState *iommu, *dev;
> FWCfgState *fw_cfg;
> NICInfo *nd;
> @@ -671,10 +670,8 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
> pci_ide_create_devs(pci_dev);
>
> /* Map NVRAM into I/O (ebus) space */
> - nvram = m48t59_init(NULL, 0, NVRAM_SIZE, 1968, 59);
> - s = SYS_BUS_DEVICE(nvram);
> - memory_region_add_subregion(pci_address_space_io(ebus), 0x2000,
> - sysbus_mmio_get_region(s, 0));
> + nvram = m48t59_init(pci_address_space_io(ebus), 0x2000, NULL,
> + NVRAM_SIZE, 1968, 59);
>
> initrd_size = 0;
> initrd_addr = 0;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature