[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC v2 2/7] hw/arm/dyn_sysbus_devtree: helpers for sys
From: |
Eric Auger |
Subject: |
Re: [Qemu-devel] [RFC v2 2/7] hw/arm/dyn_sysbus_devtree: helpers for sysbus device dynamic dt node generation |
Date: |
Mon, 11 Aug 2014 15:17:48 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 |
On 08/11/2014 03:16 PM, Alexander Graf wrote:
>
> On 08.08.14 17:03, Eric Auger wrote:
>> This module will be used by ARM machine files to generate
>> device tree nodes of dynamically instantiated sysbus devices (ie.
>> those instantiated with -device option).
>>
>> Signed-off-by: Alexander Graf <address@hidden>
>> Signed-off-by: Eric Auger <address@hidden>
>>
>> ---
>>
>> v2:
>> - Code moved in an arch specific file to accomodate architecture
>> dependent specificities.
>> - remove platform_bus_base from PlatformDevtreeData
>>
>> v1: code originally written by Alex Graf in e500.c and reused for ARM
>> [Eric Auger]
>> code originally moved in hw/misc/platform_devices and device itself
>> ---
>> hw/arm/Makefile.objs | 1 +
>> hw/arm/dyn_sysbus_devtree.c | 66
>> +++++++++++++++++++++++++++++++++++++
>> include/hw/arm/dyn_sysbus_devtree.h | 18 ++++++++++
>> 3 files changed, 85 insertions(+)
>> create mode 100644 hw/arm/dyn_sysbus_devtree.c
>> create mode 100644 include/hw/arm/dyn_sysbus_devtree.h
>>
>> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
>> index 6088e53..bc5e014 100644
>> --- a/hw/arm/Makefile.objs
>> +++ b/hw/arm/Makefile.objs
>> @@ -3,6 +3,7 @@ obj-$(CONFIG_DIGIC) += digic_boards.o
>> obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o
>> obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o
>> obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o
>> +obj-y += dyn_sysbus_devtree.o
>> obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
>> obj-$(CONFIG_DIGIC) += digic.o
>> diff --git a/hw/arm/dyn_sysbus_devtree.c b/hw/arm/dyn_sysbus_devtree.c
>> new file mode 100644
>> index 0000000..56af62f
>> --- /dev/null
>> +++ b/hw/arm/dyn_sysbus_devtree.c
>> @@ -0,0 +1,66 @@
>> +#include "hw/arm/dyn_sysbus_devtree.h"
>> +#include "qemu/error-report.h"
>> +#include "sysemu/device_tree.h"
>> +
>> +int sysbus_device_create_devtree(Object *obj, void *opaque)
>> +{
>> + PlatformDevtreeData *data = opaque;
>> + Object *dev;
>> + SysBusDevice *sbdev;
>> + bool matched = false;
>> +
>> + dev = object_dynamic_cast(obj, TYPE_SYS_BUS_DEVICE);
>> + sbdev = (SysBusDevice *)dev;
>> +
>> + if (!sbdev) {
>> + /* Container, traverse it for children */
>> + return object_child_foreach(obj,
>> sysbus_device_create_devtree, data);
>> + }
>> +
>> + if (!matched) {
>> + error_report("Device %s is not supported by this machine yet.",
>> + qdev_fw_name(DEVICE(dev)));
>> + exit(1);
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +void platform_bus_create_devtree(DynSysbusParams *params,
>> + void *fdt, const char *mpic)
>> +{
>> + gchar *node = g_strdup_printf("/address@hidden"PRIx64,
>> + params->platform_bus_base);
>> + const char platcomp[] = "qemu,platform\0simple-bus";
>> + PlatformDevtreeData data;
>> + Object *container;
>> + uint64_t addr = params->platform_bus_base;
>> + uint64_t size = params->platform_bus_size;
>> + int irq_start = params->platform_bus_first_irq;
>> +
>> + /* Create a /platform node that we can put all devices into */
>> +
>> + qemu_fdt_add_subnode(fdt, node);
>> + qemu_fdt_setprop(fdt, node, "compatible", platcomp,
>> sizeof(platcomp));
>> +
>> + /* Our platform bus region is less than 32bit big, so 1 cell is
>> enough for
>> + address and size */
>> + qemu_fdt_setprop_cells(fdt, node, "#size-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_phandle(fdt, node, "interrupt-parent", mpic);
>> +
>> + /* Loop through all devices and create nodes for known ones */
>> + data.fdt = fdt;
>> + data.mpic = mpic;
>> + data.irq_start = irq_start;
>> + data.node = node;
>> +
>> + container = container_get(qdev_get_machine(), "/peripheral");
>> + sysbus_device_create_devtree(container, &data);
>> + container = container_get(qdev_get_machine(), "/peripheral-anon");
>> + sysbus_device_create_devtree(container, &data);
>> +
>> + g_free(node);
>> +}
>> diff --git a/include/hw/arm/dyn_sysbus_devtree.h
>> b/include/hw/arm/dyn_sysbus_devtree.h
>> new file mode 100644
>> index 0000000..808d522
>> --- /dev/null
>> +++ b/include/hw/arm/dyn_sysbus_devtree.h
>> @@ -0,0 +1,18 @@
>> +#ifndef HW_ARM_DYN_SYSBUS_DEVTREE_H
>> +#define HW_ARM_DYN_SYSBUS_DEVTREE_H
>> +
>> +#include "hw/misc/dyn_sysbus_binding.h"
>> +
>> +typedef struct PlatformDevtreeData {
>> + void *fdt;
>> + const char *mpic;
>> + int irq_start;
>> + const char *node;
>> +} PlatformDevtreeData;
>> +
>> +int sysbus_device_create_devtree(Object *obj, void *opaque);
>> +
>> +void platform_bus_create_devtree(DynSysbusParams *params,
>> + void *fdt, const char *mpic);
>
> These functions live in hw/arm and thus should have names that indicate
> they are arm specific.
OK thanks
Eric
>
>
> Alex
>
- [Qemu-devel] [RFC v2 0/7] machvirt dynamic sysbus device instantiation, Eric Auger, 2014/08/08
- [Qemu-devel] [RFC v2 1/7] hw/misc/dyn_sysbus_binding: helpers for sysbus device dynamic binding, Eric Auger, 2014/08/08
- [Qemu-devel] [RFC v2 3/7] PPC: e500: Support dynamically spawned sysbus devices, Eric Auger, 2014/08/08
- [Qemu-devel] [RFC v2 2/7] hw/arm/dyn_sysbus_devtree: helpers for sysbus device dynamic dt node generation, Eric Auger, 2014/08/08
- [Qemu-devel] [RFC v2 4/7] e500: Add support for eTSEC in device tree, Eric Auger, 2014/08/08
- [Qemu-devel] [RFC v2 5/7] hw/arm/boot: load_dtb becomes non static, Eric Auger, 2014/08/08
- [Qemu-devel] [RFC v2 6/7] hw/arm/virt: add new add_fdt_xxx_node functions, Eric Auger, 2014/08/08
- [Qemu-devel] [RFC v2 7/7] hw/arm/virt: Support dynamically spawned sysbus devices, Eric Auger, 2014/08/08