ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm/boot: split load_dtb() from arm_load_kernel() 

load_dtb() depends on arm_load_kernel() to figure out place
in RAM where it should be loaded, but it's not required for
arm_load_kernel() to work. Sometimes it's neccesary for
devices added with -device/device_add to be enumerated in
DTB as well, which's lead to [1] and surrounding commits to
add 2 more machine_done notifiers with non obvious ordering
to make dynamic sysbus devices initialization happen in
the right order.

However instead of moving whole arm_load_kernel() in to
machine_done, it's sufficient to move only load_dtb() into
virt_machine_done() notifier and remove ArmLoadKernelNotifier/
/PlatformBusFDTNotifierParams notifiers, which saves us ~90LOC
and simplifies code flow quite a bit.
Later would allow to consolidate DTB generation within one
function for 'mach-virt' board and make it reentrant so it
could generate updated DTB in device hotplug secenarios.

While at it rename load_dtb() to arm_load_dtb() since it's
public now.

Add additional field skip_dtb_autoload to struct arm_boot_info
to allow manual DTB load later in mach-virt and to avoid touching
all other boards to explicitly call arm_load_dtb().

 1) (ac9d32e hw/arm/boot: arm_load_kernel implemented as a machine init done notifier)

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-id: 1525691524-32265-4-git-send-email-imammedo@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Igor Mammedov 2018-05-10 18:10:56 +01:00 committed by Peter Maydell
parent a3fc839635
commit 3b77f6c353
5 changed files with 94 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
hw/arm/boot.c
View File

@ -36,8 +36,8 @@
#define ARM64_TEXT_OFFSET_OFFSET 8 #define ARM64_TEXT_OFFSET_OFFSET 8
#define ARM64_MAGIC_OFFSET 56 #define ARM64_MAGIC_OFFSET 56
static AddressSpace *arm_boot_address_space(ARMCPU *cpu, AddressSpace *arm_boot_address_space(ARMCPU *cpu,
const struct arm_boot_info *info) const struct arm_boot_info *info)
{ {
/* Return the address space to use for bootloader reads and writes. /* Return the address space to use for bootloader reads and writes.
* We prefer the secure address space if the CPU has it and we're * We prefer the secure address space if the CPU has it and we're
@ -486,29 +486,8 @@ static void fdt_add_psci_node(void *fdt)
qemu_fdt_setprop_cell(fdt, "/psci", "migrate", migrate_fn); qemu_fdt_setprop_cell(fdt, "/psci", "migrate", migrate_fn);
} }
/** int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
* load_dtb() - load a device tree binary image into memory hwaddr addr_limit, AddressSpace *as)
* @addr: the address to load the image at
* @binfo: struct describing the boot environment
* @addr_limit: upper limit of the available memory area at @addr
* @as: address space to load image to
*
* Load a device tree supplied by the machine or by the user with the
* '-dtb' command line option, and put it at offset @addr in target
* memory.
*
* If @addr_limit contains a meaningful value (i.e., it is strictly greater
* than @addr), the device tree is only loaded if its size does not exceed
* the limit.
*
* Returns: the size of the device tree image on success,
* 0 if the image size exceeds the limit,
* -1 on errors.
*
* Note: Must not be called unless have_dtb(binfo) is true.
*/
static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
hwaddr addr_limit, AddressSpace *as)
{ {
void *fdt = NULL; void *fdt = NULL;
int size, rc; int size, rc;
@ -935,7 +914,7 @@ static uint64_t load_aarch64_image(const char *filename, hwaddr mem_base,
return size; return size;
} }
static void arm_load_kernel_notify(Notifier *notifier, void *data) void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)
{ {
CPUState *cs; CPUState *cs;
int kernel_size; int kernel_size;
@ -945,11 +924,6 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
int elf_machine; int elf_machine;
hwaddr entry; hwaddr entry;
static const ARMInsnFixup *primary_loader; static const ARMInsnFixup *primary_loader;
ArmLoadKernelNotifier *n = DO_UPCAST(ArmLoadKernelNotifier,
notifier, notifier);
ARMCPU *cpu = n->cpu;
struct arm_boot_info *info =
container_of(n, struct arm_boot_info, load_kernel_notifier);
AddressSpace *as = arm_boot_address_space(cpu, info); AddressSpace *as = arm_boot_address_space(cpu, info);
/* The board code is not supposed to set secure_board_setup unless /* The board code is not supposed to set secure_board_setup unless
@ -959,6 +933,7 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
assert(!(info->secure_board_setup && kvm_enabled())); assert(!(info->secure_board_setup && kvm_enabled()));
info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb"); info->dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");
info->dtb_limit = 0;
/* Load the kernel. */ /* Load the kernel. */
if (!info->kernel_filename || info->firmware_loaded) { if (!info->kernel_filename || info->firmware_loaded) {
@ -968,9 +943,7 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
* the kernel is supposed to be loaded by the bootloader), copy the * the kernel is supposed to be loaded by the bootloader), copy the
* DTB to the base of RAM for the bootloader to pick up. * DTB to the base of RAM for the bootloader to pick up.
*/ */
if (load_dtb(info->loader_start, info, 0, as) < 0) { info->dtb_start = info->loader_start;
exit(1);
}
} }
if (info->kernel_filename) { if (info->kernel_filename) {
@ -1050,15 +1023,14 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
*/ */
if (elf_low_addr > info->loader_start if (elf_low_addr > info->loader_start
|| elf_high_addr < info->loader_start) { || elf_high_addr < info->loader_start) {
/* Pass elf_low_addr as address limit to load_dtb if it may be /* Set elf_low_addr as address limit for arm_load_dtb if it may be
* pointing into RAM, otherwise pass '0' (no limit) * pointing into RAM, otherwise pass '0' (no limit)
*/ */
if (elf_low_addr < info->loader_start) { if (elf_low_addr < info->loader_start) {
elf_low_addr = 0; elf_low_addr = 0;
} }
if (load_dtb(info->loader_start, info, elf_low_addr, as) < 0) { info->dtb_start = info->loader_start;
exit(1); info->dtb_limit = elf_low_addr;
}
} }
} }
entry = elf_entry; entry = elf_entry;
@ -1116,7 +1088,6 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
*/ */
if (have_dtb(info)) { if (have_dtb(info)) {
hwaddr align; hwaddr align;
hwaddr dtb_start;
if (elf_machine == EM_AARCH64) { if (elf_machine == EM_AARCH64) {
/* /*
@ -1136,11 +1107,9 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
} }
/* Place the DTB after the initrd in memory with alignment. */ /* Place the DTB after the initrd in memory with alignment. */
dtb_start = QEMU_ALIGN_UP(info->initrd_start + initrd_size, align); info->dtb_start = QEMU_ALIGN_UP(info->initrd_start + initrd_size,
if (load_dtb(dtb_start, info, 0, as) < 0) { align);
exit(1); fixupcontext[FIXUP_ARGPTR] = info->dtb_start;
}
fixupcontext[FIXUP_ARGPTR] = dtb_start;
} else { } else {
fixupcontext[FIXUP_ARGPTR] = info->loader_start + KERNEL_ARGS_ADDR; fixupcontext[FIXUP_ARGPTR] = info->loader_start + KERNEL_ARGS_ADDR;
if (info->ram_size >= (1ULL << 32)) { if (info->ram_size >= (1ULL << 32)) {
@ -1173,15 +1142,6 @@ static void arm_load_kernel_notify(Notifier *notifier, void *data)
for (cs = first_cpu; cs; cs = CPU_NEXT(cs)) { for (cs = first_cpu; cs; cs = CPU_NEXT(cs)) {
ARM_CPU(cs)->env.boot_info = info; ARM_CPU(cs)->env.boot_info = info;
} }
}
void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)
{
CPUState *cs;
info->load_kernel_notifier.cpu = cpu;
info->load_kernel_notifier.notifier.notify = arm_load_kernel_notify;
qemu_add_machine_init_done_notifier(&info->load_kernel_notifier.notifier);
/* CPU objects (unlike devices) are not automatically reset on system /* CPU objects (unlike devices) are not automatically reset on system
* reset, so we must always register a handler to do so. If we're * reset, so we must always register a handler to do so. If we're
@ -1191,6 +1151,12 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)
for (cs = first_cpu; cs; cs = CPU_NEXT(cs)) { for (cs = first_cpu; cs; cs = CPU_NEXT(cs)) {
qemu_register_reset(do_cpu_reset, ARM_CPU(cs)); qemu_register_reset(do_cpu_reset, ARM_CPU(cs));
} }
if (!info->skip_dtb_autoload && have_dtb(info)) {
if (arm_load_dtb(info->dtb_start, info, info->dtb_limit, as) < 0) {
exit(1);
}
}
} }
static const TypeInfo arm_linux_boot_if_info = { static const TypeInfo arm_linux_boot_if_info = {

61
hw/arm/sysbus-fdt.c
View File

@ -49,15 +49,6 @@ typedef struct PlatformBusFDTData {
PlatformBusDevice *pbus; PlatformBusDevice *pbus;
} PlatformBusFDTData; } PlatformBusFDTData;
/*
* struct used when calling the machine init done notifier
* that constructs the fdt nodes of platform bus devices
*/
typedef struct PlatformBusFDTNotifierParams {
Notifier notifier;
ARMPlatformBusFDTParams *fdt_params;
} PlatformBusFDTNotifierParams;
/* struct that associates a device type name and a node creation function */ /* struct that associates a device type name and a node creation function */
typedef struct NodeCreationPair { typedef struct NodeCreationPair {
const char *typename; const char *typename;
@ -453,42 +444,17 @@ static void add_fdt_node(SysBusDevice *sbdev, void *opaque)
exit(1); exit(1);
} }
/** void platform_bus_add_all_fdt_nodes(void *fdt, const char *intc, hwaddr addr,
* add_all_platform_bus_fdt_nodes - create all the platform bus nodes hwaddr bus_size, int irq_start)
*
* builds the parent platform bus node and all the nodes of dynamic
* sysbus devices attached to it.
*/
static void add_all_platform_bus_fdt_nodes(ARMPlatformBusFDTParams *fdt_params)
{ {
const char platcomp[] = "qemu,platform\0simple-bus"; const char platcomp[] = "qemu,platform\0simple-bus";
PlatformBusDevice *pbus; PlatformBusDevice *pbus;
DeviceState *dev; DeviceState *dev;
gchar *node; gchar *node;
uint64_t addr, size;
int irq_start, dtb_size;
struct arm_boot_info *info = fdt_params->binfo;
const ARMPlatformBusSystemParams *params = fdt_params->system_params;
const char *intc = fdt_params->intc;
void *fdt = info->get_dtb(info, &dtb_size);
/*
* If the user provided a dtb, we assume the dynamic sysbus nodes
* already are integrated there. This corresponds to a use case where
* the dynamic sysbus nodes are complex and their generation is not yet
* supported. In that case the user can take charge of the guest dt
* while qemu takes charge of the qom stuff.
*/
if (info->dtb_filename) {
return;
}
assert(fdt); assert(fdt);
node = g_strdup_printf("/platform@%"PRIx64, params->platform_bus_base); node = g_strdup_printf("/platform@%"PRIx64, addr);
addr = params->platform_bus_base;
size = params->platform_bus_size;
irq_start = params->platform_bus_first_irq;
/* Create a /platform node that we can put all devices into */ /* Create a /platform node that we can put all devices into */
qemu_fdt_add_subnode(fdt, node); qemu_fdt_add_subnode(fdt, node);
@ -499,7 +465,7 @@ static void add_all_platform_bus_fdt_nodes(ARMPlatformBusFDTParams *fdt_params)
*/ */
qemu_fdt_setprop_cells(fdt, node, "#size-cells", 1); qemu_fdt_setprop_cells(fdt, node, "#size-cells", 1);
qemu_fdt_setprop_cells(fdt, node, "#address-cells", 1); qemu_fdt_setprop_cells(fdt, node, "#address-cells", 1);
qemu_fdt_setprop_cells(fdt, node, "ranges", 0, addr >> 32, addr, size); qemu_fdt_setprop_cells(fdt, node, "ranges", 0, addr >> 32, addr, bus_size);
qemu_fdt_setprop_phandle(fdt, node, "interrupt-parent", intc); qemu_fdt_setprop_phandle(fdt, node, "interrupt-parent", intc);
@ -518,22 +484,3 @@ static void add_all_platform_bus_fdt_nodes(ARMPlatformBusFDTParams *fdt_params)
g_free(node); g_free(node);
} }
static void platform_bus_fdt_notify(Notifier *notifier, void *data)
{
PlatformBusFDTNotifierParams *p = DO_UPCAST(PlatformBusFDTNotifierParams,
notifier, notifier);
add_all_platform_bus_fdt_nodes(p->fdt_params);
g_free(p->fdt_params);
g_free(p);
}
void arm_register_platform_bus_fdt_creator(ARMPlatformBusFDTParams *fdt_params)
{
PlatformBusFDTNotifierParams *p = g_new(PlatformBusFDTNotifierParams, 1);
p->fdt_params = fdt_params;
p->notifier.notify = platform_bus_fdt_notify;
qemu_add_machine_init_done_notifier(&p->notifier);
}

64
hw/arm/virt.c
View File

@ -94,8 +94,6 @@
#define PLATFORM_BUS_NUM_IRQS 64 #define PLATFORM_BUS_NUM_IRQS 64
static ARMPlatformBusSystemParams platform_bus_params;
/* RAM limit in GB. Since VIRT_MEM starts at the 1GB mark, this means /* RAM limit in GB. Since VIRT_MEM starts at the 1GB mark, this means
* RAM can go up to the 256GB mark, leaving 256GB of the physical * RAM can go up to the 256GB mark, leaving 256GB of the physical
* address space unallocated and free for future use between 256G and 512G. * address space unallocated and free for future use between 256G and 512G.
@ -1126,40 +1124,23 @@ static void create_platform_bus(VirtMachineState *vms, qemu_irq *pic)
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
int i; int i;
ARMPlatformBusFDTParams *fdt_params = g_new(ARMPlatformBusFDTParams, 1);
MemoryRegion *sysmem = get_system_memory(); MemoryRegion *sysmem = get_system_memory();
platform_bus_params.platform_bus_base = vms->memmap[VIRT_PLATFORM_BUS].base;
platform_bus_params.platform_bus_size = vms->memmap[VIRT_PLATFORM_BUS].size;
platform_bus_params.platform_bus_first_irq = vms->irqmap[VIRT_PLATFORM_BUS];
platform_bus_params.platform_bus_num_irqs = PLATFORM_BUS_NUM_IRQS;
fdt_params->system_params = &platform_bus_params;
fdt_params->binfo = &vms->bootinfo;
fdt_params->intc = "/intc";
/*
* register a machine init done notifier that creates the device tree
* nodes of the platform bus and its children dynamic sysbus devices
*/
arm_register_platform_bus_fdt_creator(fdt_params);
dev = qdev_create(NULL, TYPE_PLATFORM_BUS_DEVICE); dev = qdev_create(NULL, TYPE_PLATFORM_BUS_DEVICE);
dev->id = TYPE_PLATFORM_BUS_DEVICE; dev->id = TYPE_PLATFORM_BUS_DEVICE;
qdev_prop_set_uint32(dev, "num_irqs", qdev_prop_set_uint32(dev, "num_irqs", PLATFORM_BUS_NUM_IRQS);
platform_bus_params.platform_bus_num_irqs); qdev_prop_set_uint32(dev, "mmio_size", vms->memmap[VIRT_PLATFORM_BUS].size);
qdev_prop_set_uint32(dev, "mmio_size",
platform_bus_params.platform_bus_size);
qdev_init_nofail(dev); qdev_init_nofail(dev);
vms->platform_bus_dev = dev; vms->platform_bus_dev = dev;
s = SYS_BUS_DEVICE(dev);
for (i = 0; i < platform_bus_params.platform_bus_num_irqs; i++) { s = SYS_BUS_DEVICE(dev);
int irqn = platform_bus_params.platform_bus_first_irq + i; for (i = 0; i < PLATFORM_BUS_NUM_IRQS; i++) {
int irqn = vms->irqmap[VIRT_PLATFORM_BUS] + i;
sysbus_connect_irq(s, i, pic[irqn]); sysbus_connect_irq(s, i, pic[irqn]);
} }
memory_region_add_subregion(sysmem, memory_region_add_subregion(sysmem,
platform_bus_params.platform_bus_base, vms->memmap[VIRT_PLATFORM_BUS].base,
sysbus_mmio_get_region(s, 0)); sysbus_mmio_get_region(s, 0));
} }
@ -1230,6 +1211,26 @@ void virt_machine_done(Notifier *notifier, void *data)
{ {
VirtMachineState *vms = container_of(notifier, VirtMachineState, VirtMachineState *vms = container_of(notifier, VirtMachineState,
machine_done); machine_done);
ARMCPU *cpu = ARM_CPU(first_cpu);
struct arm_boot_info *info = &vms->bootinfo;
AddressSpace *as = arm_boot_address_space(cpu, info);
/*
* If the user provided a dtb, we assume the dynamic sysbus nodes
* already are integrated there. This corresponds to a use case where
* the dynamic sysbus nodes are complex and their generation is not yet
* supported. In that case the user can take charge of the guest dt
* while qemu takes charge of the qom stuff.
*/
if (info->dtb_filename == NULL) {
platform_bus_add_all_fdt_nodes(vms->fdt, "/intc",
vms->memmap[VIRT_PLATFORM_BUS].base,
vms->memmap[VIRT_PLATFORM_BUS].size,
vms->irqmap[VIRT_PLATFORM_BUS]);
}
if (arm_load_dtb(info->dtb_start, info, info->dtb_limit, as) < 0) {
exit(1);
}
virt_acpi_setup(vms); virt_acpi_setup(vms);
virt_build_smbios(vms); virt_build_smbios(vms);
@ -1457,8 +1458,7 @@ static void machvirt_init(MachineState *machine)
vms->fw_cfg = create_fw_cfg(vms, &address_space_memory); vms->fw_cfg = create_fw_cfg(vms, &address_space_memory);
rom_set_fw(vms->fw_cfg); rom_set_fw(vms->fw_cfg);
vms->machine_done.notify = virt_machine_done; create_platform_bus(vms, pic);
qemu_add_machine_init_done_notifier(&vms->machine_done);
vms->bootinfo.ram_size = machine->ram_size; vms->bootinfo.ram_size = machine->ram_size;
vms->bootinfo.kernel_filename = machine->kernel_filename; vms->bootinfo.kernel_filename = machine->kernel_filename;
@ -1468,16 +1468,12 @@ static void machvirt_init(MachineState *machine)
vms->bootinfo.board_id = -1; vms->bootinfo.board_id = -1;
vms->bootinfo.loader_start = vms->memmap[VIRT_MEM].base; vms->bootinfo.loader_start = vms->memmap[VIRT_MEM].base;
vms->bootinfo.get_dtb = machvirt_dtb; vms->bootinfo.get_dtb = machvirt_dtb;
vms->bootinfo.skip_dtb_autoload = true;
vms->bootinfo.firmware_loaded = firmware_loaded; vms->bootinfo.firmware_loaded = firmware_loaded;
arm_load_kernel(ARM_CPU(first_cpu), &vms->bootinfo); arm_load_kernel(ARM_CPU(first_cpu), &vms->bootinfo);
/* vms->machine_done.notify = virt_machine_done;
* arm_load_kernel machine init done notifier registration must qemu_add_machine_init_done_notifier(&vms->machine_done);
* happen before the platform_bus_create call. In this latter,
* another notifier is registered which adds platform bus nodes.
* Notifiers are executed in registration reverse order.
*/
create_platform_bus(vms, pic);
} }
static bool virt_get_secure(Object *obj, Error **errp) static bool virt_get_secure(Object *obj, Error **errp)

45
include/hw/arm/arm.h
View File

@ -39,15 +39,6 @@ DeviceState *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
*/ */
void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size); void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size);
/*
* struct used as a parameter of the arm_load_kernel machine init
* done notifier
*/
typedef struct {
Notifier notifier; /* actual notifier */
ARMCPU *cpu; /* handle to the first cpu object */
} ArmLoadKernelNotifier;
/* arm_boot.c */ /* arm_boot.c */
struct arm_boot_info { struct arm_boot_info {
uint64_t ram_size; uint64_t ram_size;
@ -56,6 +47,13 @@ struct arm_boot_info {
const char *initrd_filename; const char *initrd_filename;
const char *dtb_filename; const char *dtb_filename;
hwaddr loader_start; hwaddr loader_start;
hwaddr dtb_start;
hwaddr dtb_limit;
/* If set to True, arm_load_kernel() will not load DTB.
* It allows board to load DTB manually later.
* (default: False)
*/
bool skip_dtb_autoload;
/* multicore boards that use the default secondary core boot functions /* multicore boards that use the default secondary core boot functions
* need to put the address of the secondary boot code, the boot reg, * need to put the address of the secondary boot code, the boot reg,
* and the GIC address in the next 3 values, respectively. boards that * and the GIC address in the next 3 values, respectively. boards that
@ -94,8 +92,6 @@ struct arm_boot_info {
* the user it should implement this hook. * the user it should implement this hook.
*/ */
void (*modify_dtb)(const struct arm_boot_info *info, void *fdt); void (*modify_dtb)(const struct arm_boot_info *info, void *fdt);
/* machine init done notifier executing arm_load_dtb */
ArmLoadKernelNotifier load_kernel_notifier;
/* Used internally by arm_boot.c */ /* Used internally by arm_boot.c */
int is_linux; int is_linux;
hwaddr initrd_start; hwaddr initrd_start;
@ -143,6 +139,33 @@ struct arm_boot_info {
*/ */
void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info); void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info);
AddressSpace *arm_boot_address_space(ARMCPU *cpu,
const struct arm_boot_info *info);
/**
* arm_load_dtb() - load a device tree binary image into memory
* @addr: the address to load the image at
* @binfo: struct describing the boot environment
* @addr_limit: upper limit of the available memory area at @addr
* @as: address space to load image to
*
* Load a device tree supplied by the machine or by the user with the
* '-dtb' command line option, and put it at offset @addr in target
* memory.
*
* If @addr_limit contains a meaningful value (i.e., it is strictly greater
* than @addr), the device tree is only loaded if its size does not exceed
* the limit.
*
* Returns: the size of the device tree image on success,
* 0 if the image size exceeds the limit,
* -1 on errors.
*
* Note: Must not be called unless have_dtb(binfo) is true.
*/
int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
hwaddr addr_limit, AddressSpace *as);
/* Write a secure board setup routine with a dummy handler for SMCs */ /* Write a secure board setup routine with a dummy handler for SMCs */
void arm_write_secure_board_setup_dummy_smc(ARMCPU *cpu, void arm_write_secure_board_setup_dummy_smc(ARMCPU *cpu,
const struct arm_boot_info *info, const struct arm_boot_info *info,

37
include/hw/arm/sysbus-fdt.h
View File

@ -24,37 +24,14 @@
#ifndef HW_ARM_SYSBUS_FDT_H #ifndef HW_ARM_SYSBUS_FDT_H
#define HW_ARM_SYSBUS_FDT_H #define HW_ARM_SYSBUS_FDT_H
#include "hw/arm/arm.h" #include "exec/hwaddr.h"
#include "qemu-common.h"
#include "hw/sysbus.h"
/*
* struct that contains dimensioning parameters of the platform bus
*/
typedef struct {
hwaddr platform_bus_base; /* start address of the bus */
hwaddr platform_bus_size; /* size of the bus */
int platform_bus_first_irq; /* first hwirq assigned to the bus */
int platform_bus_num_irqs; /* number of hwirq assigned to the bus */
} ARMPlatformBusSystemParams;
/*
* struct that contains all relevant info to build the fdt nodes of
* platform bus and attached dynamic sysbus devices
* in the future might be augmented with additional info
* such as PHY, CLK handles ...
*/
typedef struct {
const ARMPlatformBusSystemParams *system_params;
struct arm_boot_info *binfo;
const char *intc; /* parent interrupt controller name */
} ARMPlatformBusFDTParams;
/** /**
* arm_register_platform_bus_fdt_creator - register a machine init done * platform_bus_add_all_fdt_nodes - create all the platform bus nodes
* notifier that creates the device tree nodes of the platform bus and *
* associated dynamic sysbus devices * builds the parent platform bus node and all the nodes of dynamic
* sysbus devices attached to it.
*/ */
void arm_register_platform_bus_fdt_creator(ARMPlatformBusFDTParams *fdt_params); void platform_bus_add_all_fdt_nodes(void *fdt, const char *intc, hwaddr addr,
hwaddr bus_size, int irq_start);
#endif #endif