From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0F4AC25B08 for ; Fri, 5 Aug 2022 09:58:15 +0000 (UTC) Received: from localhost ([::1]:59354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJu5u-0002MY-Jk for qemu-devel@archiver.kernel.org; Fri, 05 Aug 2022 05:58:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJtov-0007gh-6v for qemu-devel@nongnu.org; Fri, 05 Aug 2022 05:40:41 -0400 Received: from mail-ua1-x929.google.com ([2607:f8b0:4864:20::929]:45847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJtor-0001eJ-N8 for qemu-devel@nongnu.org; Fri, 05 Aug 2022 05:40:40 -0400 Received: by mail-ua1-x929.google.com with SMTP id f15so823913uao.12 for ; Fri, 05 Aug 2022 02:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=DkCA2spgI+uwLgOuel9849x5d610iHs6nmKGou/9TJE=; b=GZqYXDcFFrVTiqtZDus2hjOA5JLZL8JzQWiP0ZLMFXIKPR2Y7d/r3FjCitQv8oCuf8 PPwbMdH9HQUTOjQIZtelaOBwnWIQWRrq/vNIw0Uosm579D9Woh2cdAdFHrMTd1ZJu+Cm 0dAEH/5QtcfIsQJ2hRbqeuhjBHlI4IORHVf/VL7qPwU8oadmFdLIxLurAKZmXnDS81E+ VpE87N2vEZ4VjR+sKVhztykDIE/DwiUWk99ny8MnRGCXO2gsvxZBEgzqZ95QcvyJUvk1 HP933+FuQUx0QPeY6qACdqUtk9TMltUGdwzJKc5PM7yM2m943qW9CG6QArYvlMWID6Vp xQ/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=DkCA2spgI+uwLgOuel9849x5d610iHs6nmKGou/9TJE=; b=Ny5IrJgL1fYJw0C6WpSnqYKNSG8qr4GO47VFzxycVzUuSk3KMSrkb9+15PKXec6LFf X2Z2vbxjN9mdHuIncRruFXnIf2diJgho8kO5QG2HMgULgbaMxnzOzJjySB7Cgfw5ZvnA eBlVkcdNXEoATZPGUpfRI+kZ0RxTS21axHOJt6o6BKbJoR56a5EdDy48aUWILnk90X5k A+UIUwrA07fubK1pYRc9IpFTel98v6XCAA9yMP2J7AOTFDMveY1SnChNPQwl1u5xtM1C HGFS8wuo5Yk6sCBQnyaKSq+tqL+MPejZJUix3qqBI5xcnTiWj0rK8bkja9lt9sTe46TR UJkw== X-Gm-Message-State: ACgBeo30yyBpFlRHTFoZoYUMW8EoFP6zj82m5EZans15SYUDXqPZAiyZ 1z1Zj/Al5Ks2SK9lanWmM8y6FsxI8js= X-Google-Smtp-Source: AA6agR4X5GJSrAOCucH/TTAo2OF6X83TcDF3xsYfD3Sqv6hkiSZA7aa++RBrTsWvsJD0TrgRTltvBQ== X-Received: by 2002:ab0:3303:0:b0:384:dd5b:ef55 with SMTP id r3-20020ab03303000000b00384dd5bef55mr2787442uao.27.1659692435844; Fri, 05 Aug 2022 02:40:35 -0700 (PDT) Received: from balboa.COMFAST ([191.19.239.67]) by smtp.gmail.com with ESMTPSA id f9-20020a1f1f09000000b00376f4f93745sm2668496vkf.10.2022.08.05.02.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 02:40:35 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: alistair.francis@wdc.com, david@gibson.dropbear.id.au, Daniel Henrique Barboza , "Dr . David Alan Gilbert" Subject: [PATCH for-7.2 v2 20/20] hmp, device_tree.c: add 'info fdt ' support Date: Fri, 5 Aug 2022 06:39:48 -0300 Message-Id: <20220805093948.82561-21-danielhb413@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805093948.82561-1-danielhb413@gmail.com> References: <20220805093948.82561-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::929; envelope-from=danielhb413@gmail.com; helo=mail-ua1-x929.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 'info fdt' is only able to print full nodes so far. It would be good to be able to also print single properties, since ometimes we just want to verify a single value from the FDT. libfdt does not have support to find a property given its full path, but it does have a way to return a fdt_property given a prop name and its subnode. Add a new optional 'propname' parameter to x-query-fdt to specify the property of a given node. If it's present, we'll proceed to find the node as usual but, instead of printing the node, we'll attempt to find the property and print it standalone. After this change, if an user wants to print just the value of 'cpu' inside /cpu/cpu-map(...) from an ARM FDT, we can do it: (qemu) info fdt /cpus/cpu-map/socket0/cluster0/core0 cpu /cpus/cpu-map/socket0/cluster0/core0/cpu = <0x8001> Or the 'ibm,my-dma-window' from the v-scsi device inside the pSeries FDT: (qemu) info fdt /vdevice/v-scsi@71000003 ibm,my-dma-window /vdevice/v-scsi@71000003/ibm,my-dma-window = <0x71000003 0x0 0x0 0x0 0x10000000> Cc: Dr. David Alan Gilbert Signed-off-by: Daniel Henrique Barboza --- hmp-commands-info.hx | 9 +++++---- include/sysemu/device_tree.h | 2 ++ monitor/hmp-cmds.c | 5 ++++- monitor/qmp-cmds.c | 8 +++++--- qapi/machine.json | 4 +++- softmmu/device_tree.c | 29 ++++++++++++++++++++++++----- 6 files changed, 43 insertions(+), 14 deletions(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 743b48865d..17d6ee4d30 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -924,13 +924,14 @@ ERST { .name = "fdt", - .args_type = "nodepath:s", - .params = "nodepath", - .help = "show firmware device tree node given its path", + .args_type = "nodepath:s,propname:s?", + .params = "nodepath [propname]", + .help = "show firmware device tree node or property given its path", .cmd = hmp_info_fdt, }, SRST ``info fdt`` - Show a firmware device tree node given its path. Requires libfdt. + Show a firmware device tree node or property given its path. + Requires libfdt. ERST diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index 057d13e397..551a02dee2 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -140,6 +140,8 @@ int qemu_fdt_add_path(void *fdt, const char *path); void qemu_fdt_dumpdtb(void *fdt, int size); void qemu_fdt_qmp_dumpdtb(const char *filename, Error **errp); HumanReadableText *qemu_fdt_qmp_query_fdt(const char *nodepath, + bool has_propname, + const char *propname, Error **errp); /** diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index accde90380..df8493adc5 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2488,8 +2488,11 @@ void hmp_dumpdtb(Monitor *mon, const QDict *qdict) void hmp_info_fdt(Monitor *mon, const QDict *qdict) { const char *nodepath = qdict_get_str(qdict, "nodepath"); + const char *propname = qdict_get_try_str(qdict, "propname"); Error *err = NULL; - g_autoptr(HumanReadableText) info = qmp_x_query_fdt(nodepath, &err); + g_autoptr(HumanReadableText) info = NULL; + + info = qmp_x_query_fdt(nodepath, propname != NULL, propname, &err); if (hmp_handle_error(mon, err)) { return; diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index db2c6aa7da..ca2a96cdf7 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -604,9 +604,10 @@ void qmp_dumpdtb(const char *filename, Error **errp) return qemu_fdt_qmp_dumpdtb(filename, errp); } -HumanReadableText *qmp_x_query_fdt(const char *nodepath, Error **errp) +HumanReadableText *qmp_x_query_fdt(const char *nodepath, bool has_propname, + const char *propname, Error **errp) { - return qemu_fdt_qmp_query_fdt(nodepath, errp); + return qemu_fdt_qmp_query_fdt(nodepath, has_propname, propname, errp); } #else void qmp_dumpdtb(const char *filename, Error **errp) @@ -614,7 +615,8 @@ void qmp_dumpdtb(const char *filename, Error **errp) error_setg(errp, "dumpdtb requires libfdt"); } -HumanReadableText *qmp_x_query_fdt(const char *nodepath, Error **errp) +HumanReadableText *qmp_x_query_fdt(const char *nodepath, bool has_propname, + const char *propname, Error **errp) { error_setg(errp, "this command requires libfdt"); diff --git a/qapi/machine.json b/qapi/machine.json index 96cff541ca..c15ce60f46 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1688,6 +1688,7 @@ # Query for FDT element (node or property). Requires 'libfdt'. # # @nodepath: the path of the FDT node to be retrieved +# @propname: name of the property inside the node # # Features: # @unstable: This command is meant for debugging. @@ -1697,6 +1698,7 @@ # Since: 7.2 ## { 'command': 'x-query-fdt', - 'data': { 'nodepath': 'str' }, + 'data': { 'nodepath': 'str', + '*propname': 'str' }, 'returns': 'HumanReadableText', 'features': [ 'unstable' ] } diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c index 902a7f680b..be7b7e297e 100644 --- a/softmmu/device_tree.c +++ b/softmmu/device_tree.c @@ -785,23 +785,42 @@ static void fdt_format_node(GString *buf, int node, int depth, g_string_append_printf(buf, "%*s}\n", padding, ""); } -HumanReadableText *qemu_fdt_qmp_query_fdt(const char *nodepath, Error **errp) +HumanReadableText *qemu_fdt_qmp_query_fdt(const char *nodepath, + bool has_propname, + const char *propname, + Error **errp) { g_autoptr(GString) buf = g_string_new(""); - int node; + const struct fdt_property *prop = NULL; + void *fdt = current_machine->fdt; + int node, prop_size; - if (!current_machine->fdt) { + if (!fdt) { error_setg(errp, "Unable to find the machine FDT"); return NULL; } - node = fdt_path_offset(current_machine->fdt, nodepath); + node = fdt_path_offset(fdt, nodepath); if (node < 0) { error_setg(errp, "node '%s' not found in FDT", nodepath); return NULL; } - fdt_format_node(buf, node, 0, nodepath); + if (!has_propname) { + fdt_format_node(buf, node, 0, nodepath); + } else { + g_autofree char *proppath = g_strdup_printf("%s/%s", nodepath, + propname); + + prop = fdt_get_property(fdt, node, propname, &prop_size); + if (!prop) { + error_setg(errp, "property '%s' not found in node '%s' in FDT", + propname, nodepath); + return NULL; + } + + fdt_format_property(buf, proppath, prop->data, prop_size, 0); + } return human_readable_text_from_str(buf); } -- 2.36.1