hw: Remove sysbus_address_space()
Subsystems (3)
v2 cover hw: Remove sysbus_address_space()
(all series reviewed)
Since v1:
- Rebased
Pass address space as link property for devices where it seems to matter, otherwise just use get_system_memory().
Philippe Mathieu-Daudé (6):
hw/arm: Inline sysbus_create_simple(PL110 / PL111) hw/display/pl110: Pass frame buffer memory region as link property hw/arm/exynos4210: Inline sysbus_create_varargs(EXYNOS4210_FIMD) hw/display/exynos4210_fimd: Pass frame buffer memory region as link hw/i386/kvmvapic: Inline sysbus_address_space() hw/sysbus: Remove now unused sysbus_address_space()
include/hw/sysbus.h | 1 - hw/arm/exynos4210.c | 14 +++++++++----- hw/arm/integratorcp.c | 7 ++++++- hw/arm/realview.c | 7 ++++++- hw/arm/versatilepb.c | 8 +++++++- hw/arm/vexpress.c | 15 +++++++++++++-- hw/core/sysbus.c | 5 ----- hw/display/exynos4210_fimd.c | 19 ++++++++++++++++--- hw/display/pl110.c | 20 ++++++++++++++++---- hw/i386/kvmvapic.c | 11 +++++------ 10 files changed, 78 insertions(+), 29 deletions(-)
Signature · 1 line
2.41.0
PATCH v2 1/6 hw/arm: Inline sysbus_create_simple(PL110 / PL111)
We want to set another qdev property (a link) for the pl110 and pl111 devices, we can not use sysbus_create_simple() which only passes sysbus base address and IRQs as arguments. Inline it so we can set the link property in the next commit.
--- hw/arm/integratorcp.c | 5 ++++- hw/arm/realview.c | 5 ++++- hw/arm/versatilepb.c | 6 +++++- hw/arm/vexpress.c | 10 ++++++++-- 4 files changed, 21 insertions(+), 5 deletions(-)
hw/arm/integratorcp.c +4 -1
@@ -670,7 +670,10 @@ static void integratorcp_init(MachineState *machine)smc91c111_init (0xc8000000 , pic[27 ]); } -sysbus_create_simple ("pl110" ,0xc0000000 , pic[22 ]); + dev =qdev_new ("pl110" ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xc0000000 ); +sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[22 ]); integrator_binfo.ram_size = ram_size;arm_load_kernel (cpu, machine, &integrator_binfo);
hw/arm/realview.c +4 -1
@@ -238,7 +238,10 @@ static void realview_init(MachineState *machine,sysbus_create_simple ("pl061" ,0x10014000 , pic[7 ]); gpio2 =sysbus_create_simple ("pl061" ,0x10015000 , pic[8 ]); -sysbus_create_simple ("pl111" ,0x10020000 , pic[23 ]); + dev =qdev_new ("pl111" ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x10020000 ); +sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[23 ]); dev =sysbus_create_varargs ("pl181" ,0x10005000 , pic[17 ], pic[18 ],NULL );/* Wire up MMC card detect and read-only signals. These have
hw/arm/versatilepb.c +5 -1
@@ -299,7 +299,11 @@ static void versatile_init(MachineState *machine, int board_id)/* The versatile/PB actually has a modified Color LCD controller that includes hardware cursor support from the PL111. */ - dev =sysbus_create_simple ("pl110_versatile" ,0x10120000 , pic[16 ]); + dev =qdev_new ("pl110_versatile" ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x10120000 ); +sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[16 ]); +/* Wire up the mux control signals from the SYS_CLCD register */ qdev_connect_gpio_out (sysctl,0 ,qdev_get_gpio_in (dev,0 ));
hw/arm/vexpress.c +8 -2
@@ -276,6 +276,7 @@ static void a9_daughterboard_init(VexpressMachineState *vms, {MachineState *machine =MACHINE (vms);MemoryRegion *sysmem =get_system_memory (); +DeviceState *dev;if (ram_size >0x40000000 ) {/* 1GB is the maximum the address space permits */
@@ -297,7 +298,9 @@ static void a9_daughterboard_init(VexpressMachineState *vms,/* Daughterboard peripherals : 0x10020000 .. 0x20000000 */ /* 0x10020000 PL111 CLCD (daughterboard) */ -sysbus_create_simple ("pl111" ,0x10020000 , pic[44 ]); + dev =qdev_new ("pl111" ); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x10020000 ); +sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[44 ]);/* 0x10060000 AXI RAM */ /* 0x100e0000 PL341 Dynamic Memory Controller */
@@ -650,7 +653,10 @@ static void vexpress_common_init(MachineState *machine)/* VE_COMPACTFLASH: not modelled */ -sysbus_create_simple ("pl111" , map[VE_CLCD ], pic[14 ]); + dev =qdev_new ("pl111" ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , map[VE_CLCD ]); +sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[14 ]); dinfo =drive_get (IF_PFLASH ,0 ,0 ); pflash0 = ve_pflash_cfi01_register(map[VE_NORFLASH0], "vexpress.flash0",
Signature · 1 line
2.41.0
PATCH v2 2/6 hw/display/pl110: Pass frame buffer memory region as link property
In reply to Philippe Mathieu-DaudéAdd the PL110::'framebuffer-memory' property. Have the different ARM boards set it. We don't need to call sysbus_address_space() anymore.
--- hw/arm/integratorcp.c | 2 ++ hw/arm/realview.c | 2 ++ hw/arm/versatilepb.c | 2 ++ hw/arm/vexpress.c | 5 +++++ hw/display/pl110.c | 20 ++++++++++++++++---- 5 files changed, 27 insertions(+), 4 deletions(-)
hw/arm/integratorcp.c +2 -0
@@ -671,6 +671,8 @@ static void integratorcp_init(MachineState *machine) } dev =qdev_new ("pl110" ); +object_property_set_link (OBJECT (dev),"framebuffer-memory" , +OBJECT (address_space_mem), &error_fatal);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0xc0000000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[22 ]);
hw/arm/realview.c +2 -0
@@ -239,6 +239,8 @@ static void realview_init(MachineState *machine, gpio2 =sysbus_create_simple ("pl061" ,0x10015000 , pic[8 ]); dev =qdev_new ("pl111" ); +object_property_set_link (OBJECT (dev),"framebuffer-memory" , +OBJECT (sysmem), &error_fatal);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x10020000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[23 ]);
hw/arm/versatilepb.c +2 -0
@@ -300,6 +300,8 @@ static void versatile_init(MachineState *machine, int board_id)/* The versatile/PB actually has a modified Color LCD controller that includes hardware cursor support from the PL111. */ dev =qdev_new ("pl110_versatile" ); +object_property_set_link (OBJECT (dev),"framebuffer-memory" , +OBJECT (sysmem), &error_fatal);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x10120000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[16 ]);
hw/arm/vexpress.c +5 -0
@@ -299,6 +299,9 @@ static void a9_daughterboard_init(VexpressMachineState *vms,/* 0x10020000 PL111 CLCD (daughterboard) */ dev =qdev_new ("pl111" ); +object_property_set_link (OBJECT (dev),"framebuffer-memory" , +OBJECT (sysmem), &error_fatal); +sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,0x10020000 );sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[44 ]);
@@ -654,6 +657,8 @@ static void vexpress_common_init(MachineState *machine)/* VE_COMPACTFLASH: not modelled */ dev =qdev_new ("pl111" ); +object_property_set_link (OBJECT (dev),"framebuffer-memory" , +OBJECT (sysmem), &error_fatal);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , map[VE_CLCD ]);sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , pic[14 ]);
hw/display/pl110.c +16 -4
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" #include "framebuffer.h"
@@ -17,6 +18,7 @@#include "qemu/timer.h" #include "qemu/log.h" #include "qemu/module.h" +#include "qapi/error.h" #include "qom/object.h" #define PL110_CR_EN 0x001
@@ -74,6 +76,7 @@ struct PL110State {uint32_t palette[256 ];uint32_t raw_palette[128 ];qemu_irq irq; +MemoryRegion *fbmem; };static int vmstate_pl110_post_load (void *opaque,int version_id);
@@ -210,7 +213,6 @@ static int pl110_enabled(PL110State *s)static void pl110_update_display (void *opaque) {PL110State *s = (PL110State *)opaque; -SysBusDevice *sbd;DisplaySurface *surface =qemu_console_surface (s->con);drawfn fn;int src_width;
@@ -222,8 +224,6 @@ static void pl110_update_display(void *opaque)return ; } - sbd =SYS_BUS_DEVICE (s); -if (s->cr &PL110_CR_BGR ) bpp_offset =0 ;else
@@ -290,7 +290,7 @@ static void pl110_update_display(void *opaque) first =0 ;if (s->invalidate) {framebuffer_update_memory_section (&s->fbsection, -sysbus_address_space (sbd), + s->fbmem, s->upbase, s->rows, src_width); }
@@ -535,11 +535,22 @@ static const GraphicHwOps pl110_gfx_ops = { .gfx_update = pl110_update_display, }; +static Property pl110_properties[] = { +DEFINE_PROP_LINK ("framebuffer-memory" , PL110State, fbmem, + TYPE_MEMORY_REGION, MemoryRegion *), +DEFINE_PROP_END_OF_LIST (), +}; +static void pl110_realize (DeviceState *dev,Error **errp) {PL110State *s =PL110 (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +if (!s->fbmem) { +error_setg (errp,"'framebuffer-memory' property was not set" ); +return ; + } +memory_region_init_io (&s->iomem,OBJECT (s), &pl110_ops, s,"pl110" ,0x1000 );sysbus_init_mmio (sbd, &s->iomem);sysbus_init_irq (sbd, &s->irq);
@@ -577,6 +588,7 @@ static void pl110_class_init(ObjectClass *klass, void *data)set_bit (DEVICE_CATEGORY_DISPLAY , dc->categories); dc->vmsd = &vmstate_pl110; dc->realize = pl110_realize; +device_class_set_props (dc, pl110_properties); }static const TypeInfo pl110_info = {
Signature · 1 line
2.41.0
PATCH v2 3/6 hw/arm/exynos4210: Inline sysbus_create_varargs(EXYNOS4210_FIMD)
In reply to Philippe Mathieu-DaudéWe want to set another qdev property (a link) for the FIMD device, we can not use sysbus_create_varargs() which only passes sysbus base address and IRQs as arguments. Inline it so we can set the link property in the next commit.
--- hw/arm/exynos4210.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
hw/arm/exynos4210.c +7 -5
@@ -769,11 +769,13 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp) }/*** Display controller (FIMD) ***/ -sysbus_create_varargs ("exynos4210.fimd" ,EXYNOS4210_FIMD0_BASE_ADDR , - s->irq_table[exynos4210_get_irq (11 ,0 )], - s->irq_table[exynos4210_get_irq (11 ,1 )], - s->irq_table[exynos4210_get_irq (11 ,2 )], -NULL ); + dev =qdev_new ("exynos4210.fimd" ); + busdev =SYS_BUS_DEVICE (dev); +sysbus_realize_and_unref (busdev, &error_fatal); +sysbus_mmio_map (busdev,0 ,EXYNOS4210_FIMD0_BASE_ADDR ); +for (n =0 ; n <3 ; n++) { +sysbus_connect_irq (busdev, n, s->irq_table[exynos4210_get_irq (11 , n)]); + }sysbus_create_simple (TYPE_EXYNOS4210_EHCI ,EXYNOS4210_EHCI_BASE_ADDR , s->irq_table[exynos4210_get_irq (28 ,3 )]);
Signature · 1 line
2.41.0
PATCH v2 4/6 hw/display/exynos4210_fimd: Pass frame buffer memory region as link
In reply to Philippe Mathieu-DaudéAdd the Exynos4210fimdState::'framebuffer-memory' property. Have the board set it. We don't need to call sysbus_address_space() anymore.
--- hw/arm/exynos4210.c | 2 ++ hw/display/exynos4210_fimd.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-)
hw/arm/exynos4210.c +2 -0
@@ -770,6 +770,8 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)/*** Display controller (FIMD) ***/ dev =qdev_new ("exynos4210.fimd" ); +object_property_set_link (OBJECT (dev),"framebuffer-memory" , +OBJECT (system_mem), &error_fatal); busdev =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (busdev, &error_fatal);sysbus_mmio_map (busdev,0 ,EXYNOS4210_FIMD0_BASE_ADDR );
hw/display/exynos4210_fimd.c +16 -3
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h"
@@ -32,6 +33,7 @@#include "qemu/bswap.h" #include "qemu/module.h" #include "qemu/log.h" +#include "qapi/error.h" #include "qom/object.h" /* Debug messages configuration */
@@ -302,6 +304,7 @@ struct Exynos4210fimdState {MemoryRegion iomem;QemuConsole *console;qemu_irq irq[3 ]; +MemoryRegion *fbmem;uint32_t vidcon[4 ];/* Video main control registers 0-3 */ uint32_t vidtcon[4 ];/* Video time control registers 0-3 */
@@ -1119,7 +1122,6 @@ static void exynos4210_fimd_invalidate(void *opaque)* VIDOSDA, VIDOSDB, VIDWADDx and SHADOWCON registers */ static void fimd_update_memory_section (Exynos4210fimdState *s,unsigned win) { -SysBusDevice *sbd =SYS_BUS_DEVICE (s);Exynos4210fimdWindow *w = &s->window[win];hwaddr fb_start_addr, fb_mapped_len;
@@ -1147,8 +1149,7 @@ static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned win)memory_region_unref (w->mem_section.mr); } - w->mem_section =memory_region_find (sysbus_address_space (sbd), - fb_start_addr, w->fb_len); + w->mem_section =memory_region_find (s->fbmem, fb_start_addr, w->fb_len);assert (w->mem_section.mr);assert (w->mem_section.offset_within_address_space == fb_start_addr); DPRINT_TRACE("Window %u framebuffer changed: address=0x%08x, len=0x%x\n",
@@ -1924,6 +1925,12 @@ static const GraphicHwOps exynos4210_fimd_ops = { .gfx_update = exynos4210_fimd_update, }; +static Property exynos4210_fimd_properties[] = { +DEFINE_PROP_LINK ("framebuffer-memory" , Exynos4210fimdState, fbmem, + TYPE_MEMORY_REGION, MemoryRegion *), +DEFINE_PROP_END_OF_LIST (), +}; +static void exynos4210_fimd_init (Object *obj) {Exynos4210fimdState *s =EXYNOS4210_FIMD (obj);
@@ -1944,6 +1951,11 @@ static void exynos4210_fimd_realize(DeviceState *dev, Error **errp) {Exynos4210fimdState *s =EXYNOS4210_FIMD (dev); +if (!s->fbmem) { +error_setg (errp,"'framebuffer-memory' property was not set" ); +return ; + } + s->console =graphic_console_init (dev,0 , &exynos4210_fimd_ops, s); }
@@ -1954,6 +1966,7 @@ static void exynos4210_fimd_class_init(ObjectClass *klass, void *data) dc->vmsd = &exynos4210_fimd_vmstate; dc->reset = exynos4210_fimd_reset; dc->realize = exynos4210_fimd_realize; +device_class_set_props (dc, exynos4210_fimd_properties); }static const TypeInfo exynos4210_fimd_info = {
Signature · 1 line
2.41.0
PATCH v2 5/6 hw/i386/kvmvapic: Inline sysbus_address_space()
In reply to Philippe Mathieu-Daudésysbus_address_space(...) is a simple wrapper to get_system_memory(). Use it in place, since KVM VAPIC doesn't distinct address spaces.
Rename the 'as' variable as 'mr' since it is a MemoryRegion type, not an AddressSpace one.
--- hw/i386/kvmvapic.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
hw/i386/kvmvapic.c +5 -6
@@ -58,6 +58,7 @@ typedef struct GuestROMState {struct VAPICROMState {SysBusDevice busdev; +MemoryRegion io;MemoryRegion rom;uint32_t state;
@@ -581,19 +582,17 @@ static int vapic_map_rom_writable(VAPICROMState *s) {hwaddr rom_paddr = s->rom_state_paddr &ROM_BLOCK_MASK ;MemoryRegionSection section; -MemoryRegion *as; +MemoryRegion *mr =get_system_memory ();size_t rom_size;uint8_t *ram; - as =sysbus_address_space (&s->busdev); -if (s->rom_mapped_writable) { -memory_region_del_subregion (as, &s->rom); +memory_region_del_subregion (mr, &s->rom);object_unparent (OBJECT (&s->rom)); }/* grab RAM memory region (region @rom_paddr may still be pc.rom) */ - section =memory_region_find (as,0 ,1 ); + section =memory_region_find (mr,0 ,1 );/* read ROM size from RAM region */ if (rom_paddr +2 >=memory_region_size (section.mr)) {
@@ -614,7 +613,7 @@ static int vapic_map_rom_writable(VAPICROMState *s)memory_region_init_alias (&s->rom,OBJECT (s),"kvmvapic-rom" , section.mr, rom_paddr, rom_size); -memory_region_add_subregion_overlap (as, rom_paddr, &s->rom,1000 ); +memory_region_add_subregion_overlap (mr, rom_paddr, &s->rom,1000 ); s->rom_mapped_writable = true;memory_region_unref (section.mr);
Signature · 1 line
2.41.0
PATCH v2 6/6 hw/sysbus: Remove now unused sysbus_address_space()
In reply to Philippe Mathieu-Daudésysbus_address_space() is not more used, remove it.
--- include/hw/sysbus.h | 1 - hw/core/sysbus.c | 5 ----- 2 files changed, 6 deletions(-)
include/hw/sysbus.h +0 -1
@@ -83,7 +83,6 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr);void sysbus_mmio_map_overlap (SysBusDevice *dev,int n,hwaddr addr,int priority);void sysbus_mmio_unmap (SysBusDevice *dev,int n); -MemoryRegion *sysbus_address_space (SysBusDevice *dev);bool sysbus_realize (SysBusDevice *dev,Error **errp);bool sysbus_realize_and_unref (SysBusDevice *dev,Error **errp);
hw/core/sysbus.c +0 -5
@@ -298,11 +298,6 @@ static char *sysbus_get_fw_dev_path(DeviceState *dev)return g_strdup (qdev_fw_name (dev)); } -MemoryRegion *sysbus_address_space (SysBusDevice *dev) -{ -return get_system_memory (); -} -static void sysbus_device_class_init (ObjectClass *klass,void *data) {DeviceClass *k =DEVICE_CLASS (klass);
Signature · 1 line
2.41.0
Quoted 7 lines · Philippe Mathieu-Daudé
Philippe Mathieu-Daudé (6):
hw/arm: Inlinesysbus_create_simple(PL110 / PL111)hw/display/pl110: Pass frame buffer memory region as link property hw/arm/exynos4210: Inlinesysbus_create_varargs(EXYNOS4210_FIMD)hw/display/exynos4210_fimd: Pass frame buffer memory region as link hw/i386/kvmvapic: Inlinesysbus_address_space()hw/sysbus: Remove now unusedsysbus_address_space()
Series queued.