From patchwork Sun Nov 30 18:19:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 41722 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AC7B524001 for ; Sun, 30 Nov 2014 18:20:09 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id n15sf5694496lbi.8 for ; Sun, 30 Nov 2014 10:20:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Fyk0wMZOlc449/NRSNplZfc7kS3K3/mqcPLcJGnV4dI=; b=Qq/VTu17wLmoO2u/cfGf2+Jo4FN9kIS5a8IdbkxldJTLd7dfMA7SbVA3uJk1XUlgjg QOSIXu/6Lf8u7evjPtEQq5lbfyDjZAx8oK0w8UNHfiC2Xl76UMWe/xKLtpqkN78ysykE xcnMetXOy+UwbOI2KgE+uBePzyonjcbGhYwpX/3nnrgKedSrRWGW7r39jqZ3k42F6w5Y GnvIrdQtbHdWQ5Zk8nU4cwDI7ZJ6i5Z+Dlk8uZXOMvVltfvTg8pqjteC78icL/VEqFJN qJpiDtvoEdumIzbyizMaTAIF9gKj36eE2cQ50AodJ2eFmVymNO14lnJ0dTB9eOdJROdB RY5w== X-Gm-Message-State: ALoCoQno0EYdDGWI+QjqE9CKJkSgjZ3F9EodjZqlt5W3BNgY+p5FhQ+s+SEHeMUSyHvy7Z08Oqbj X-Received: by 10.152.5.2 with SMTP id o2mr11146881lao.1.1417371608676; Sun, 30 Nov 2014 10:20:08 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.169 with SMTP id r9ls856311laj.57.gmail; Sun, 30 Nov 2014 10:20:08 -0800 (PST) X-Received: by 10.152.36.165 with SMTP id r5mr52445165laj.91.1417371608432; Sun, 30 Nov 2014 10:20:08 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id nb4si15653830lbb.35.2014.11.30.10.20.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 10:20:08 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id f15so8341311lbj.13 for ; Sun, 30 Nov 2014 10:20:08 -0800 (PST) X-Received: by 10.153.7.170 with SMTP id dd10mr52626181lad.44.1417371608278; Sun, 30 Nov 2014 10:20:08 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp170841lbc; Sun, 30 Nov 2014 10:20:07 -0800 (PST) X-Received: by 10.180.91.36 with SMTP id cb4mr67800669wib.30.1417371607371; Sun, 30 Nov 2014 10:20:07 -0800 (PST) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com. [74.125.82.51]) by mx.google.com with ESMTPS id fe6si26796573wjc.5.2014.11.30.10.20.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 10:20:07 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.51 as permitted sender) client-ip=74.125.82.51; Received: by mail-wg0-f51.google.com with SMTP id k14so12352764wgh.10 for ; Sun, 30 Nov 2014 10:20:07 -0800 (PST) X-Received: by 10.194.19.38 with SMTP id b6mr29325025wje.44.1417371607110; Sun, 30 Nov 2014 10:20:07 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id ec2sm25092772wib.23.2014.11.30.10.20.06 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 10:20:06 -0800 (PST) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, agraf@suse.de, pbonzini@redhat.com, kim.phillips@freescale.com, a.rigo@virtualopensystems.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, zhaoshenglong@huawei.com, ard.biesheuvel@linaro.org Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, alex.williamson@redhat.com, peter.maydell@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com Subject: [PATCH v5 5/6] hw/arm/sysbus-fdt: helpers for platform bus nodes addition Date: Sun, 30 Nov 2014 18:19:29 +0000 Message-Id: <1417371570-11789-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1417371570-11789-1-git-send-email-eric.auger@linaro.org> References: <1417371570-11789-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This new C module will be used by ARM machine files to generate platform bus node and their dynamic sysbus device tree nodes. Dynamic sysbus device node addition is done in a machine init done notifier. arm_register_platform_bus_fdt_creator does the registration of this latter and is supposed to be called by ARM machine files that support platform bus and their dynamic sysbus. Addition of dynamic sysbus nodes is done only if the user did not provide any dtb. Signed-off-by: Alexander Graf Signed-off-by: Eric Auger --- v4 -> v5: - change indentation in add_fdt_node_functions. Also becomes a static const. - ARMPlatformBusFdtParams.system_params becomes a pointer to a const ARMPlatformBusSystemParams - removes platform-bus.h second inclusion v3 -> v4: - dyn_sysbus_devtree.c renamed into sysbus-fdt.c - use new PlatformBusDevice object - the dtb upgrade is done through modify_dtb. Before the fdt was recreated from scratch. When the user provided a dtb this latter was overwritten which was not correct. - an array contains the association between device type names and their node creation function - I must aknowledge I did not find any cleaner way to implement a FDT_BUILDER interface, as suggested by Paolo. The class method would need to be initialized somewhere and since it cannot happen in the device itself - according to Alex & Peter comments -, I don't see when I shall associate the device type and its interface implementation. 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] --- hw/arm/Makefile.objs | 1 + hw/arm/sysbus-fdt.c | 180 ++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/sysbus-fdt.h | 50 ++++++++++++ 3 files changed, 231 insertions(+) create mode 100644 hw/arm/sysbus-fdt.c create mode 100644 include/hw/arm/sysbus-fdt.h diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 6088e53..0cc63e1 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 += sysbus-fdt.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/sysbus-fdt.c b/hw/arm/sysbus-fdt.c new file mode 100644 index 0000000..7537267 --- /dev/null +++ b/hw/arm/sysbus-fdt.c @@ -0,0 +1,180 @@ +/* + * ARM Platform Bus device tree generation helpers + * + * Copyright (c) 2014 Linaro Limited + * + * Authors: + * Alex Graf + * Eric Auger + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + * + */ + +#include "hw/arm/sysbus-fdt.h" +#include "qemu/error-report.h" +#include "sysemu/device_tree.h" +#include "hw/platform-bus.h" +#include "sysemu/sysemu.h" + +/* + * internal struct that contains the information to create dynamic + * sysbus device node + */ +typedef struct PlatformBusFdtData { + void *fdt; /* device tree handle */ + int irq_start; /* index of the first IRQ usable by platform bus devices */ + const char *pbus_node_name; /* name of the platform bus node */ + PlatformBusDevice *pbus; +} PlatformBusFdtData; + +/* + * struct used when calling the machine init done notifier + * that constructs the fdt nodes of platform bus devices + */ +typedef struct PlatformBusFdtNotifierParams { + ARMPlatformBusFdtParams *fdt_params; + Notifier notifier; +} PlatformBusFdtNotifierParams; + +/* struct that associates a device type name and a node creation function */ +typedef struct NodeCreationPair { + const char *typename; + int (*add_fdt_node_fn)(SysBusDevice *sbdev, void *opaque); +} NodeCreationPair; + +/* list of supported dynamic sysbus devices */ +static const NodeCreationPair add_fdt_node_functions[] = { +{"", NULL}, /*last element*/ +}; + +/** + * add_fdt_node - add the device tree node of a dynamic sysbus device + * + * @sbdev: handle to the sysbus device + * @opaque: handle to the PlatformBusFdtData + * + * Checks the sysbus type belongs to the list of device types that + * are dynamically instantiable and in the positive call the node + * creation function. + */ +static int add_fdt_node(SysBusDevice *sbdev, void *opaque) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(add_fdt_node_functions); i++) { + if (!strcmp(object_get_typename(OBJECT(sbdev)), + add_fdt_node_functions[i].typename)) { + add_fdt_node_functions[i].add_fdt_node_fn(sbdev, opaque); + return 0; + } + } + error_report("Device %s can not be dynamically instantiated", + qdev_fw_name(DEVICE(sbdev))); + return 1; +} + +/** + * add_all_platform_bus_fdt_nodes - create all the platform bus nodes + * + * builds the parent platform bus node and all the nodes of dynamic + * sysbus devices attached * to it. It is a modify_dtb() function, ie. + * called * by arm_load_dtb() + */ +static void add_all_platform_bus_fdt_nodes(const struct arm_boot_info *info, + void *fdt) +{ + const char platcomp[] = "qemu,platform\0simple-bus"; + const ARMPlatformBusSystemParams *system_params; + ARMPlatformBusFdtParams *fdt_params = info->modify_dtb_opaque; + PlatformBusDevice *pbus; + DeviceState *dev; + gchar *node; + uint64_t addr, size; + int irq_start; + + if (!fdt_params) { + return; + } + + system_params = fdt_params->system_params; + node = g_strdup_printf("/platform@%"PRIx64, + system_params->platform_bus_base); + addr = system_params->platform_bus_base; + size = system_params->platform_bus_size; + irq_start = system_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", fdt_params->intc); + + 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 */ + if (pbus->done_gathering) { + PlatformBusFdtData data = { + .fdt = fdt, + .irq_start = irq_start, + .pbus_node_name = node, + .pbus = pbus, + }; + + /* Loop through all dynamic sysbus devices and create their node */ + foreach_dynamic_sysbus_device(add_fdt_node, &data); + } + + g_free(node); +} + +static void upgrade_dtb(ARMPlatformBusFdtParams *params) +{ + struct arm_boot_info *binfo = params->binfo; + + /* + * In case the user provided a dtb, we assume he already integrated the + * dynamic sysbus nodes. This corresponds to a use case where the dynamic + * sysbus nodes are complex and their generation is not yet supported. In + * case the use can take in charge the guest dt while qemu takes in charge + * the qom stuff. + */ + if (!binfo->dtb_filename) { + binfo->modify_dtb_opaque = params; + binfo->modify_dtb = add_all_platform_bus_fdt_nodes; + arm_load_dtb(binfo); + } +} + +static void platform_bus_fdt_notify(Notifier *notifier, void *data) +{ + PlatformBusFdtNotifierParams *p = + container_of(notifier, PlatformBusFdtNotifierParams, notifier); + upgrade_dtb(p->fdt_params); +} + +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); +} diff --git a/include/hw/arm/sysbus-fdt.h b/include/hw/arm/sysbus-fdt.h new file mode 100644 index 0000000..d4bec85 --- /dev/null +++ b/include/hw/arm/sysbus-fdt.h @@ -0,0 +1,50 @@ +/* + * Dynamic sysbus device tree node generation API + * + * Copyright Linaro Limited, 2014 + * + * Authors: + * Alex Graf + * Eric Auger + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ + +#ifndef HW_ARM_SYSBUS_FDT_H +#define HW_ARM_SYSBUS_FDT_H + +#include "hw/arm/arm.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 + * notifier that creates the device tree nodes of the platform bus and + * associated dynamic sysbus devices + */ +void arm_register_platform_bus_fdt_creator(ARMPlatformBusFdtParams *fdt_params); + +#endif