a3fc839635
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>
54 lines
1.4 KiB
C
54 lines
1.4 KiB
C
#ifndef PPCE500_H
|
|
#define PPCE500_H
|
|
|
|
#include "hw/boards.h"
|
|
#include "hw/platform-bus.h"
|
|
|
|
typedef struct PPCE500MachineState {
|
|
/*< private >*/
|
|
MachineState parent_obj;
|
|
|
|
/* points to instance of TYPE_PLATFORM_BUS_DEVICE if
|
|
* board supports dynamic sysbus devices
|
|
*/
|
|
PlatformBusDevice *pbus_dev;
|
|
} PPCE500MachineState;
|
|
|
|
typedef struct PPCE500MachineClass {
|
|
/*< private >*/
|
|
MachineClass parent_class;
|
|
|
|
/* required -- must at least add toplevel board compatible */
|
|
void (*fixup_devtree)(void *fdt);
|
|
|
|
int pci_first_slot;
|
|
int pci_nr_slots;
|
|
|
|
int mpic_version;
|
|
bool has_mpc8xxx_gpio;
|
|
bool has_platform_bus;
|
|
hwaddr platform_bus_base;
|
|
hwaddr platform_bus_size;
|
|
int platform_bus_first_irq;
|
|
int platform_bus_num_irqs;
|
|
hwaddr ccsrbar_base;
|
|
hwaddr pci_pio_base;
|
|
hwaddr pci_mmio_base;
|
|
hwaddr pci_mmio_bus_base;
|
|
hwaddr spin_base;
|
|
} PPCE500MachineClass;
|
|
|
|
void ppce500_init(MachineState *machine);
|
|
|
|
hwaddr booke206_page_size_to_tlb(uint64_t size);
|
|
|
|
#define TYPE_PPCE500_MACHINE "ppce500-base-machine"
|
|
#define PPCE500_MACHINE(obj) \
|
|
OBJECT_CHECK(PPCE500MachineState, (obj), TYPE_PPCE500_MACHINE)
|
|
#define PPCE500_MACHINE_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(PPCE500MachineClass, obj, TYPE_PPCE500_MACHINE)
|
|
#define PPCE500_MACHINE_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(PPCE500MachineClass, klass, TYPE_PPCE500_MACHINE)
|
|
|
|
#endif
|