summary refs log tree commit diff stats
path: root/hw/arm/sysbus-fdt.c
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2018-05-10 18:10:56 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-05-10 18:10:56 +0100
commita3fc8396352e945f9d14cac0237ebf9d91745969 (patch)
tree0c8fae5141eeaa45f1ea0fc1f4f8033c21540623 /hw/arm/sysbus-fdt.c
parent38aefb578dcf918359249ae5b29183255db809c2 (diff)
downloadfocaccia-qemu-a3fc8396352e945f9d14cac0237ebf9d91745969.tar.gz
focaccia-qemu-a3fc8396352e945f9d14cac0237ebf9d91745969.zip
platform-bus-device: use device plug callback instead of machine_done notifier
platform-bus were using machine_done notifier to get and map
(assign irq/mmio resources) dynamically added sysbus devices
after all '-device' options had been processed.
That however creates non obvious dependencies on ordering of
machine_done notifiers and requires carefull line juggling
to keep it working. For example see comment above
create_platform_bus() and 'straitforward' arm_load_kernel()
had to converted to machine_done notifier and that lead to
yet another machine_done notifier to keep it working
arm_register_platform_bus_fdt_creator().

Instead of hiding resource assignment in platform-bus-device
to magically initialize sysbus devices, use device plug
callback and assign resources explicitly at board level
at the moment each -device option is being processed.

That adds a bunch of machine declaration boiler plate to
e500plat board, similar to ARM/x86 but gets rid of hidden
machine_done notifier and would allow to remove the dependent
notifiers in ARM code simplifying it and making code flow
easier to follow.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Message-id: 1525691524-32265-3-git-send-email-imammedo@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/sysbus-fdt.c')
-rw-r--r--hw/arm/sysbus-fdt.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index d68e3dcdbd..80ff70e1ed 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -506,9 +506,6 @@ static void add_all_platform_bus_fdt_nodes(ARMPlatformBusFDTParams *fdt_params)
     dev = qdev_find_recursive(sysbus_get_default(), TYPE_PLATFORM_BUS_DEVICE);
     pbus = PLATFORM_BUS_DEVICE(dev);
 
-    /* We can only create dt nodes for dynamic devices when they're ready */
-    assert(pbus->done_gathering);
-
     PlatformBusFDTData data = {
         .fdt = fdt,
         .irq_start = irq_start,