From patchwork Thu Dec 17 12:29:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 58585 Delivered-To: patches@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp332317lbb; Thu, 17 Dec 2015 04:29:28 -0800 (PST) X-Received: by 10.194.90.50 with SMTP id bt18mr56797238wjb.118.1450355368096; Thu, 17 Dec 2015 04:29:28 -0800 (PST) Return-Path: Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com. [2a00:1450:400c:c09::22a]) by mx.google.com with ESMTPS id ci8si14553464wjb.114.2015.12.17.04.29.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Dec 2015 04:29:28 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22a as permitted sender) client-ip=2a00:1450:400c:c09::22a; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22a as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-wm0-x22a.google.com with SMTP id p187so21011494wmp.0 for ; Thu, 17 Dec 2015 04:29:28 -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=vrtF2W3QZ2yvOVCcuVDW+pFnjprd1j0WUqLMbQ/QYlE=; b=ggMHSAfibYwn5aRReVsSLc+uCbFuJhhSdOJyFwXBKBpVA0NMaXJoplQLthGnF6GdvW XJT+2IRazbq7ueENi8OEz4Fu7eqy78zFVFmWfobpWNB/vQ2hLezyR94ZintFTEJn4EXi YDp9+iRGSEIX6SZpEGZhJliJ0pLLhmYneBALY= 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=vrtF2W3QZ2yvOVCcuVDW+pFnjprd1j0WUqLMbQ/QYlE=; b=kvFjTmC0PehOM7tpeyoIIV9WtYLPifaaplyPrCdVF069K1wXprGt0CARdZ09s7i5ZP ULFPckFoPJXdy4L4C3B9Ft99oHGCCWdMTNRngA3OP3wR1FO8QlE06T6rQvuREMM/Cvgc c95O3VouefhaI6ol7qM2+yR9Xkh+hxO4vvhRrEXVtDMZuQPCZ/Jd6npaypbAjev54sPg Np+Cz6PN1b2jjCDato4xcPQTO6QI9X4GqYdF/vR+q52YoqFbnB+G9lY7adkcTgnSqqHE yqxFiSwbvF4waL0APJrGF4VI7Uy8nwhkT0OWOIGc1gwULHOLNgIcvfu4fS1BzwYkD+KE AnjA== X-Gm-Message-State: ALoCoQmU1HM/IfwNeIPPkERaRM4V3yUHP+qFnjnA+rXXVyjL03cmjp1vcr1hq79aDzScusnE8RCjRRomJGNRLt5U9KD7XHfjwA== X-Received: by 10.28.3.133 with SMTP id 127mr3996584wmd.101.1450355367890; Thu, 17 Dec 2015 04:29:27 -0800 (PST) Return-Path: Received: from new-host-17.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id bh6sm10313963wjb.0.2015.12.17.04.29.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Dec 2015 04:29:26 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, peter.maydell@linaro.org, david@gibson.dropbear.id.au, alex.williamson@redhat.com Cc: alex.bennee@linaro.org, thuth@redhat.com, crosthwaitepeter@gmail.com, patches@linaro.org, christoffer.dall@linaro.org, pbonzini@redhat.com, b.reynal@virtualopensystems.com, suravee.suthikulpanit@amd.com, thomas.lendacky@amd.com Subject: [PATCH 2/6] device_tree: introduce load_device_tree_from_sysfs Date: Thu, 17 Dec 2015 12:29:23 +0000 Message-Id: <1450355367-14818-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450355367-14818-1-git-send-email-eric.auger@linaro.org> References: <1450355367-14818-1-git-send-email-eric.auger@linaro.org> This function returns the host device tree blob from sysfs (/sys/firmware/devicetree/base). It uses a recursive function inspired from dtc read_fstree. Signed-off-by: Eric Auger --- RFC -> v1: - remove runtime dependency on dtc binary and introduce read_fstree --- device_tree.c | 102 +++++++++++++++++++++++++++++++++++++++++++ include/sysemu/device_tree.h | 1 + 2 files changed, 103 insertions(+) -- 1.9.1 diff --git a/device_tree.c b/device_tree.c index a9f5f8e..e556a99 100644 --- a/device_tree.c +++ b/device_tree.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "qemu-common.h" #include "qemu/error-report.h" @@ -117,6 +118,107 @@ fail: return NULL; } +/** + * read_fstree: this function is inspired from dtc read_fstree + * @fdt: preallocated fdt blob buffer, to be populated + * @dirname: directory to scan under /sys/firmware/devicetree/base + * the search is recursive and the tree is search down to the + * leafs (property files). + * + * the function self-asserts in case of error + */ +static void read_fstree(void *fdt, const char *dirname) +{ + DIR *d; + struct dirent *de; + struct stat st; + const char *root_dir = "/sys/firmware/devicetree/base"; + char *parent_node; + + if (strstr(dirname, root_dir) != dirname) { + error_report("%s: %s must be searched within %s", + __func__, dirname, root_dir); + exit(1); + } + parent_node = (char *)&dirname[29]; + + d = opendir(dirname); + if (!d) { + error_report("%s cannot open %s", __func__, dirname); + exit(1); + } + + while ((de = readdir(d)) != NULL) { + char *tmpnam; + + if (!g_strcmp0(de->d_name, ".") + || !g_strcmp0(de->d_name, "..")) { + continue; + } + + tmpnam = g_strjoin("/", dirname, de->d_name, NULL); + + if (lstat(tmpnam, &st) < 0) { + error_report("%s cannot lstat %s", __func__, tmpnam); + exit(1); + } + + if (S_ISREG(st.st_mode)) { + int ret, size = st.st_size; + void *val = g_malloc0(size); + FILE *pfile; + + pfile = fopen(tmpnam, "r"); + if (!pfile) { + error_report("%s cannot open %s", __func__, tmpnam); + exit(1); + } + ret = fread(val, 1, size, pfile); + if (ferror(pfile) || ret < size) { + error_report("%s fail reading %s", __func__, tmpnam); + exit(1); + } + fclose(pfile); + + if (strlen(parent_node) > 0) { + qemu_fdt_setprop(fdt, parent_node, + de->d_name, val, size); + } else { + qemu_fdt_setprop(fdt, "/", de->d_name, val, size); + } + g_free(val); + } else if (S_ISDIR(st.st_mode)) { + char *node_name; + + node_name = g_strdup_printf("%s/%s", + parent_node, de->d_name); + qemu_fdt_add_subnode(fdt, node_name); + g_free(node_name); + read_fstree(fdt, tmpnam); + } + + g_free(tmpnam); + } + + closedir(d); +} + +/* load_device_tree_from_sysfs: extract the dt blob from host sysfs */ +void *load_device_tree_from_sysfs(void) +{ + void *host_fdt; + int host_fdt_size; + + host_fdt = create_device_tree(&host_fdt_size); + read_fstree(host_fdt, "/sys/firmware/devicetree/base"); + if (fdt_check_header(host_fdt)) { + error_report("%s host device tree extracted into memory is invalid", + __func__); + g_free(host_fdt); + } + return host_fdt; +} + static int findnode_nofail(void *fdt, const char *node_path) { int offset; diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index 359e143..307e53d 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -16,6 +16,7 @@ void *create_device_tree(int *sizep); void *load_device_tree(const char *filename_path, int *sizep); +void *load_device_tree_from_sysfs(void); int qemu_fdt_setprop(void *fdt, const char *node_path, const char *property, const void *val, int size);