From patchwork Mon Feb 1 13:51:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 576528 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A6560140C3A for ; Tue, 2 Feb 2016 00:55:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=Cl/XDfD8; dkim-atps=neutral Received: from localhost ([::1]:52565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQExL-00044Z-Kl for incoming@patchwork.ozlabs.org; Mon, 01 Feb 2016 08:55:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQEu2-0006KL-Bl for qemu-devel@nongnu.org; Mon, 01 Feb 2016 08:52:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQEty-0003Se-94 for qemu-devel@nongnu.org; Mon, 01 Feb 2016 08:52:26 -0500 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:33499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQEtx-0003SL-UR for qemu-devel@nongnu.org; Mon, 01 Feb 2016 08:52:22 -0500 Received: by mail-wm0-x22b.google.com with SMTP id l66so71280069wml.0 for ; Mon, 01 Feb 2016 05:52:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XcDh3pGLgOXcdLT7gGg9rHtww+ZqF6PesCBzXvXBAFk=; b=Cl/XDfD8Pgq23tNXW5O4cLAM6Qkx0GbbuPgllPfZx2ZCyEWpTR8Rbm9kgUOkIBSn0P LfMguK41ug1p2lROZw90sZ5n66jc1sgW1NtqF124sOQ2u8Tn5NEwmEToS7JDIbcI7aXv IOIDK5YIjb58hVtnof6qJLlOPLsiKaggWqayg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XcDh3pGLgOXcdLT7gGg9rHtww+ZqF6PesCBzXvXBAFk=; b=f1Veb092eUsVDCMB0Ww5EvfkO8dl2lNqKNDiPdfMLnZllbtXJ5VwTdhr5X5kfJOOpo lhaYyLWybXj7207Wc+k3hiGGe2/hXY5QWtg8SYOubYpFsiewS7907bYHJCeuFxpCQT3C 6U0DURwUSx2owCj0J9+dawQzwt6wE7+BK9TMa1C7PqKdv8yABbIaJpD3UmC6m0EsdGjA LP/+DFdHliL1Udmc7DBsMlSCYLV1R8YfUWG5FkDWgKD8OLjPmi2Sjc1SA558TCgsZ0zt Gsz7dtwq5Pbjp4PeQNd13vz4ppJdRHoW2qKVQSafEVXT/asr74y+A0jCkJ39rV08l+Tw hoOw== X-Gm-Message-State: AG10YOSOZmt1jPKfi8dbpaeCj6dh1EXgmmxfUP9EJDydivju96Fe8pVPjSy7RtB5UeL54S42 X-Received: by 10.28.229.201 with SMTP id c192mr12185124wmh.103.1454334741235; Mon, 01 Feb 2016 05:52:21 -0800 (PST) Received: from new-host-13.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id lw7sm7925488wjb.19.2016.02.01.05.52.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Feb 2016 05:52:19 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, alex.williamson@redhat.com, david@gibson.dropbear.id.au Date: Mon, 1 Feb 2016 13:51:50 +0000 Message-Id: <1454334712-12360-7-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454334712-12360-1-git-send-email-eric.auger@linaro.org> References: <1454334712-12360-1-git-send-email-eric.auger@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22b Cc: thomas.lendacky@amd.com, thuth@redhat.com, b.reynal@virtualopensystems.com, patches@linaro.org, crosthwaitepeter@gmail.com, suravee.suthikulpanit@amd.com, pbonzini@redhat.com, alex.bennee@linaro.org, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH v6 6/8] hw/arm/sysbus-fdt: helpers for clock node generation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some passthrough'ed devices depend on clock nodes. Those need to be generated in the guest device tree. This patch introduces some helpers to build a clock node from information retrieved in the host device tree. - copy_properties_from_host copies properties from a host device tree node to a guest device tree node - fdt_build_clock_node builds a guest clock node and checks the host fellow clock is a fixed one. fdt_build_clock_node will become static as soon as it gets used. A dummy pre-declaration is needed for compilation of this patch. Signed-off-by: Eric Auger Reviewed-by: Peter Maydell --- v5 -> v6: - replace self-asserts - add Peter's R-b v4 -> v5: - renamed inherit_properties v1 -> v2: - inherit properties now outputs an error message in case qemu_fdt_getprop fails for an existing optional property - no hardcoded fixed buffer length - fdt_build_clock_node becomes void and auto-asserts on error - use boolean values when defining the clock properties RFC -> v1: - use the new proto of qemu_fdt_getprop - remove newline in error_report - fix some style issues Conflicts: hw/arm/sysbus-fdt.c --- hw/arm/sysbus-fdt.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 68a3de5..8575cfe 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -22,6 +22,7 @@ */ #include "qemu/osdep.h" +#include #include "hw/arm/sysbus-fdt.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" @@ -57,6 +58,125 @@ typedef struct NodeCreationPair { int (*add_fdt_node_fn)(SysBusDevice *sbdev, void *opaque); } NodeCreationPair; +/* helpers */ + +typedef struct HostProperty { + const char *name; + bool optional; +} HostProperty; + +/** + * copy_properties_from_host + * + * copies properties listed in an array from host device tree to + * guest device tree. If a non optional property is not found, the + * function asserts. An optional property is ignored if not found + * in the host device tree. + * @props: array of HostProperty to copy + * @nb_props: number of properties in the array + * @host_dt: host device tree blob + * @guest_dt: guest device tree blob + * @node_path: host dt node path where the property is supposed to be + found + * @nodename: guest node name the properties should be added to + */ +static void copy_properties_from_host(HostProperty *props, int nb_props, + void *host_fdt, void *guest_fdt, + char *node_path, char *nodename) +{ + int i, prop_len; + const void *r; + Error *err = NULL; + + for (i = 0; i < nb_props; i++) { + r = qemu_fdt_getprop(host_fdt, node_path, + props[i].name, + &prop_len, + props[i].optional ? &err : &error_fatal); + if (r) { + qemu_fdt_setprop(guest_fdt, nodename, + props[i].name, r, prop_len); + } else { + if (prop_len != -FDT_ERR_NOTFOUND) { + /* optional property not returned although property exists */ + error_report_err(err); + } else { + error_free(err); + } + } + } +} + +/* clock properties whose values are copied/pasted from host */ +static HostProperty clock_copied_properties[] = { + {"compatible", false}, + {"#clock-cells", false}, + {"clock-frequency", true}, + {"clock-output-names", true}, +}; + +/** + * fdt_build_clock_node + * + * Build a guest clock node, used as a dependency from a passthrough'ed + * device. Most information are retrieved from the host clock node. + * Also check the host clock is a fixed one. + * + * @host_fdt: host device tree blob from which info are retrieved + * @guest_fdt: guest device tree blob where the clock node is added + * @host_phandle: phandle of the clock in host device tree + * @guest_phandle: phandle to assign to the guest node + */ +void fdt_build_clock_node(void *host_fdt, void *guest_fdt, + uint32_t host_phandle, + uint32_t guest_phandle); +void fdt_build_clock_node(void *host_fdt, void *guest_fdt, + uint32_t host_phandle, + uint32_t guest_phandle) +{ + char *node_path = NULL; + char *nodename; + const void *r; + int ret, node_offset, prop_len, path_len = 16; + + node_offset = fdt_node_offset_by_phandle(host_fdt, host_phandle); + if (node_offset <= 0) { + error_setg(&error_fatal, + "not able to locate clock handle %d in host device tree", + host_phandle); + } + node_path = g_malloc(path_len); + while ((ret = fdt_get_path(host_fdt, node_offset, node_path, path_len)) + == -FDT_ERR_NOSPACE) { + path_len += 16; + node_path = g_realloc(node_path, path_len); + } + if (ret < 0) { + error_setg(&error_fatal, + "not able to retrieve node path for clock handle %d", + host_phandle); + } + + r = qemu_fdt_getprop(host_fdt, node_path, "compatible", &prop_len, + &error_fatal); + if (strcmp(r, "fixed-clock")) { + error_setg(&error_fatal, + "clock handle %d is not a fixed clock", host_phandle); + } + + nodename = strrchr(node_path, '/'); + qemu_fdt_add_subnode(guest_fdt, nodename); + + copy_properties_from_host(clock_copied_properties, + ARRAY_SIZE(clock_copied_properties), + host_fdt, guest_fdt, + node_path, nodename); + + qemu_fdt_setprop_cell(guest_fdt, nodename, "phandle", guest_phandle); + + g_free(node_path); +} + /* Device Specific Code */ /**