From patchwork Thu Feb 18 17:45:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 62223 Delivered-To: patches@linaro.org Received: by 10.112.43.199 with SMTP id y7csp721260lbl; Thu, 18 Feb 2016 09:46:01 -0800 (PST) X-Received: by 10.194.63.144 with SMTP id g16mr10499792wjs.149.1455817561574; Thu, 18 Feb 2016 09:46:01 -0800 (PST) Return-Path: Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com. [2a00:1450:400c:c09::234]) by mx.google.com with ESMTPS id y5si11891670wjx.10.2016.02.18.09.46.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Feb 2016 09:46:01 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::234 as permitted sender) client-ip=2a00:1450:400c:c09::234; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::234 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-wm0-x234.google.com with SMTP id g62so36763452wme.0 for ; Thu, 18 Feb 2016 09:46:01 -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=8b8I/Uc8leh21pgcMBNPFBSiQ6xNDzqEnIrUpNXAYFU=; b=bJFKuc3Suy70ha1SOUeHICDe6YvxBZowz7ovN2X4zda8n0mK021ZWzCUI6G43zLJ28 YazRJH1Z8ZaEIDbj0CzHjpb+2Q2XXj/IwrdENPA1zU9yTmWixic7ZvO2h48qyY4VlpuU +D3ed7XvW321FXi9V6NVzVTKim1nor+IuXJzI= 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=8b8I/Uc8leh21pgcMBNPFBSiQ6xNDzqEnIrUpNXAYFU=; b=fLocdHmE96yyboEC6v/Rw/TGJzOuP/OHCe6+rugajJIiU/zS8DYi9BA8148Eu76Ysx HmKuSMWDUGOmlfGZzsAaL44vXt6ck4GDu2Ux9NgC40HpSu9PrQi6yEL8bIAvsmj27l7f dv8G0UNL0F9sBSGtj3fi/HNOkPJ35DxgxNXJ06ISe5L1kRTVNTSysTGWZbvd6D2+gApS XWi/coYfGzOnH6UA2kmQ3BWl1+RgJcGYpQ3Grgo5Rik1fW6mx3BODTi01H3oI9wUHJas Qm786IsNqcNSv5wT3I9kcAaxJAzF7b+Tkfu9BtvFu0vWt2wlzWIhqkH0FnWzyziCR+UN bUyg== X-Gm-Message-State: AG10YOQHp5XFlSxZHKbHI6oCimk8s6lgWuU5W0g2C6LrmZ0LY4Zkxj+qfr9SJ5M23C+7lSvP0I4= X-Received: by 10.194.95.40 with SMTP id dh8mr9980251wjb.146.1455817561339; Thu, 18 Feb 2016 09:46:01 -0800 (PST) Return-Path: Received: from midway01-04-00.lavalab ([81.128.185.50]) by smtp.gmail.com with ESMTPSA id ct2sm7592997wjb.46.2016.02.18.09.45.59 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Feb 2016 09:45:59 -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 Cc: christoffer.dall@linaro.org, suravee.suthikulpanit@amd.com, alex.bennee@linaro.org, thuth@redhat.com, crosthwaitepeter@gmail.com, patches@linaro.org, pbonzini@redhat.com, b.reynal@virtualopensystems.com, thomas.lendacky@amd.com Subject: [PATCH v7 3/8] device_tree: introduce qemu_fdt_node_path Date: Thu, 18 Feb 2016 17:45:41 +0000 Message-Id: <1455817546-6564-4-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1455817546-6564-1-git-send-email-eric.auger@linaro.org> References: <1455817546-6564-1-git-send-email-eric.auger@linaro.org> This new helper routine returns a NULL terminated array of node paths matching a node name and a compat string. Signed-off-by: Eric Auger Reviewed-by: Peter Maydell --- v6 -> v7: - add Peter's R-b v5 -> v6: - in case of error, free the resources and return NULL - update the doc comment v4 -> v5: - support the case where several nodes exist, ie. return an array of node paths. Also add Error ** parameter v1 -> v2: - move doc comment in header file - do not use a fixed size buffer - break on errors in while loop - use strcmp instead of strncmp RFC -> v1: - improve error handling according to Alex' comments --- device_tree.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ include/sysemu/device_tree.h | 18 ++++++++++++++++ 2 files changed, 69 insertions(+) -- 1.8.3.2 diff --git a/device_tree.c b/device_tree.c index 9e77c69..2587257 100644 --- a/device_tree.c +++ b/device_tree.c @@ -226,6 +226,57 @@ static int findnode_nofail(void *fdt, const char *node_path) return offset; } +char **qemu_fdt_node_path(void *fdt, const char *name, char *compat, + Error **errp) +{ + int offset, len, ret; + const char *iter_name; + unsigned int path_len = 16, n = 0; + GSList *path_list = NULL, *iter; + char **path_array; + + offset = fdt_node_offset_by_compatible(fdt, -1, compat); + + while (offset >= 0) { + iter_name = fdt_get_name(fdt, offset, &len); + if (!iter_name) { + offset = len; + break; + } + if (!strcmp(iter_name, name)) { + char *path; + + path = g_malloc(path_len); + while ((ret = fdt_get_path(fdt, offset, path, path_len)) + == -FDT_ERR_NOSPACE) { + path_len += 16; + path = g_realloc(path, path_len); + } + path_list = g_slist_prepend(path_list, path); + n++; + } + offset = fdt_node_offset_by_compatible(fdt, offset, compat); + } + + if (offset < 0 && offset != -FDT_ERR_NOTFOUND) { + error_setg(errp, "%s: abort parsing dt for %s/%s: %s", + __func__, name, compat, fdt_strerror(offset)); + g_slist_free_full(path_list, g_free); + return NULL; + } + + path_array = g_new(char *, n + 1); + path_array[n--] = NULL; + + for (iter = path_list; iter; iter = iter->next) { + path_array[n--] = iter->data; + } + + g_slist_free(path_list); + + return path_array; +} + int qemu_fdt_setprop(void *fdt, const char *node_path, const char *property, const void *val, int size) { diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index 62093ba..552df21 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -25,6 +25,24 @@ void *load_device_tree(const char *filename_path, int *sizep); void *load_device_tree_from_sysfs(void); #endif +/** + * qemu_fdt_node_path: return the paths of nodes matching a given + * name and compat string + * @fdt: pointer to the dt blob + * @name: node name + * @compat: compatibility string + * @errp: handle to an error object + * + * returns a newly allocated NULL-terminated array of node paths. + * Use g_strfreev() to free it. If one or more nodes were found, the + * array contains the path of each node and the last element equals to + * NULL. If there is no error but no matching node was found, the + * returned array contains a single element equal to NULL. If an error + * was encountered when parsing the blob, the function returns NULL + */ +char **qemu_fdt_node_path(void *fdt, const char *name, char *compat, + Error **errp); + int qemu_fdt_setprop(void *fdt, const char *node_path, const char *property, const void *val, int size); int qemu_fdt_setprop_cell(void *fdt, const char *node_path,