From patchwork Fri Oct 31 13:53:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 39898 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C19112405B for ; Fri, 31 Oct 2014 13:54:01 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf745442eek.3 for ; Fri, 31 Oct 2014 06:54:00 -0700 (PDT) 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=e6VRppvWCf+ULFGDFrvVLNd+jW3kp62csedWx8wFoNw=; b=fO/YKHM2bmLsoIWGlhKW9atgEW8Uzzi4Lan+ScY6vzKSXPY1SvxvkQouMfvk4Uz+r0 f8IjMmLVrOgqHFUKG7palrDmC2z0Q4XCjG37CRl8QDcX0aCxb70ORWfb8y2PBZ+uqJ4p htGshwoMSr6Vccv0gqYvWuPG/T1O7vlkCFOg+ZwAEFnuqSyOyGELXsE7wYoC5hQHP5Jn ANyZmAbYWvuhBByDSYl0sANZ6adymQnv3w/0QBAwmaDE0gI9S/Kvz/CYq3j0O92UBV0t fjIg2F/f+H46kvZZ5mQeY+MGuXY+PqiJC0N3qChBHg5n0TL6ENSKjVLRYMuzhpt3Rx+b fVgQ== X-Gm-Message-State: ALoCoQk/R7OaXNvbisNORe1mB5BTYhapREMZB8YYkAV0aYYp+rlVYc2tWayZQP4rSHVWx6CBVuVd X-Received: by 10.112.247.74 with SMTP id yc10mr3940626lbc.8.1414763640630; Fri, 31 Oct 2014 06:54:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.199.38 with SMTP id jh6ls472326lac.9.gmail; Fri, 31 Oct 2014 06:54:00 -0700 (PDT) X-Received: by 10.112.166.1 with SMTP id zc1mr26238888lbb.90.1414763640516; Fri, 31 Oct 2014 06:54:00 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id ll8si16862081lac.9.2014.10.31.06.54.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 06:54:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id 10so6190849lbg.1 for ; Fri, 31 Oct 2014 06:54:00 -0700 (PDT) X-Received: by 10.112.14.69 with SMTP id n5mr26373321lbc.34.1414763640361; Fri, 31 Oct 2014 06:54:00 -0700 (PDT) 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.84.229 with SMTP id c5csp205555lbz; Fri, 31 Oct 2014 06:53:59 -0700 (PDT) X-Received: by 10.194.92.42 with SMTP id cj10mr18683615wjb.6.1414763639279; Fri, 31 Oct 2014 06:53:59 -0700 (PDT) Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com. [74.125.82.53]) by mx.google.com with ESMTPS id gn9si14682819wib.62.2014.10.31.06.53.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 06:53:59 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.53 as permitted sender) client-ip=74.125.82.53; Received: by mail-wg0-f53.google.com with SMTP id b13so6456326wgh.26 for ; Fri, 31 Oct 2014 06:53:59 -0700 (PDT) X-Received: by 10.194.221.105 with SMTP id qd9mr28193653wjc.51.1414763639052; Fri, 31 Oct 2014 06:53:59 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id w13sm12167570wjq.29.2014.10.31.06.53.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 06:53:58 -0700 (PDT) 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 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 v4 5/6] hw/arm/sysbus-fdt: helpers for platform bus nodes addition Date: Fri, 31 Oct 2014 13:53:31 +0000 Message-Id: <1414763612-4939-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1414763612-4939-1-git-send-email-eric.auger@linaro.org> References: <1414763612-4939-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.170 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 --- 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 | 181 ++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/sysbus-fdt.h | 50 ++++++++++++ 3 files changed, 232 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..d5476f1 --- /dev/null +++ b/hw/arm/sysbus-fdt.c @@ -0,0 +1,181 @@ +/* + * 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" +#include "hw/platform-bus.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 */ +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"; + 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..b9602f1 --- /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 { + 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