From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGGM-0001RS-RH for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:55:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRGGH-00075D-Hs for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:54:54 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:56320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRGGH-00074t-9p for qemu-devel@nongnu.org; Tue, 09 Sep 2014 03:54:49 -0400 Received: by mail-wi0-f171.google.com with SMTP id hi2so3926963wib.4 for ; Tue, 09 Sep 2014 00:54:48 -0700 (PDT) From: Eric Auger Date: Tue, 9 Sep 2014 08:54:29 +0100 Message-Id: <1410249273-6063-3-git-send-email-eric.auger@linaro.org> In-Reply-To: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> References: <1410249273-6063-1-git-send-email-eric.auger@linaro.org> Subject: [Qemu-devel] [PATCH v3 2/6] hw/arm/dyn_sysbus_devtree: helpers for sysbus device dynamic dt node generation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: patches@linaro.org, eric.auger@linaro.org, will.deacon@arm.com, stuart.yoder@freescale.com, Bharat.Bhushan@freescale.com, alex.williamson@redhat.com, a.motakis@virtualopensystems.com, kvmarm@lists.cs.columbia.edu 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 Signed-off-by: Eric Auger --- v2 -> v3: - add arm_ prefix - arm_sysbus_device_create_devtree becomes static v1 -> 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 | 16 +++++++++ 3 files changed, 83 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..6375024 --- /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" + +static int arm_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, + arm_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 arm_platform_bus_create_devtree(DynSysbusParams *params, + void *fdt, const char *intc) +{ + gchar *node = g_strdup_printf("/platform@%"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", intc); + + /* Loop through all devices and create nodes for known ones */ + data.fdt = fdt; + data.intc = intc; + data.irq_start = irq_start; + data.node = node; + + container = container_get(qdev_get_machine(), "/peripheral"); + arm_sysbus_device_create_devtree(container, &data); + container = container_get(qdev_get_machine(), "/peripheral-anon"); + arm_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..b072365 --- /dev/null +++ b/include/hw/arm/dyn_sysbus_devtree.h @@ -0,0 +1,16 @@ +#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 *intc; + int irq_start; + const char *node; +} PlatformDevtreeData; + +void arm_platform_bus_create_devtree(DynSysbusParams *params, + void *fdt, const char *intc); + +#endif -- 1.8.3.2