From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664218145; cv=none; d=zohomail.com; s=zohoarc; b=DtN+BDXR6T3naszjinpZjqoq4ywzSAIvTNRe5DcWk34zuIWWfX2iYMyoYHCBmyNhbanppeZRSaZa7oPRTf3PalzbSQXVKolfGH2Q2jAKAVy8nKZIRnbdXX5LLynYsKL5yEQ6Glv7LJ9GvlkfKKj83jyb2LkNkeL1CtxXgCQAgpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664218145; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9/rxGSHTzhkZV5IqQNzmsiPqBfv0Nw/sHT/u2uhyLNs=; b=HO3cKgXcNSQisVNabsvrtUklDULfY8PB8CDRWiNy3i/Ld6efjN/ShLR/3VpixYhz7HtY0BpeUfbcCOJBH1Bkx9kkmqGTsMKrBrvD7lUVchE/RanQRRDP2YmJ1r/UiI2EdEjIRQ7U39Zz55DAVnwNcbf1w+mugw6PNXXBjjoczTk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166421814528552.795896676676875; Mon, 26 Sep 2022 11:49:05 -0700 (PDT) Received: from localhost ([::1]:54306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octA6-0004mB-VW for importer@patchew.org; Mon, 26 Sep 2022 14:49:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4S-00088y-Oz for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:09 -0400 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]:33533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4Q-00025N-Pt for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:08 -0400 Received: by mail-oi1-x236.google.com with SMTP id j188so9206626oih.0 for ; Mon, 26 Sep 2022 10:39:06 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:04 -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:subject:date; bh=9/rxGSHTzhkZV5IqQNzmsiPqBfv0Nw/sHT/u2uhyLNs=; b=cZSgZi4xqNHmGf8WzeX3Nc/8EVcQ9eqF145oTeQaQttMmqmB7Fzvq1ML030xQoLNgp QfwANPUd2HNzCyfi+TrdCuJ6Uu85TsY2zUT4LKhtE/X0cFuFIAr0gZ5TTGw4I1a0kCx8 ylzwrluGnJ+sIqs4AkzHsW7CYF7Fh5UvL2me/Q9rSW2UoqBCb4SnaFzup2genemLPXa+ 8MPIMu+8FizNSGSO7vjeRy0KNX1DDdzJD4rtGyfQvhki4N7MofxOpCWvGksij/LEN5j3 TIgWxX42dbKtGZlTg/2sdtFM6BvUuKWaBrdmN7IH2EtgLeMeJsTK+zZkkcgyxrS2to9I /p/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 :subject:date; bh=9/rxGSHTzhkZV5IqQNzmsiPqBfv0Nw/sHT/u2uhyLNs=; b=tIY/MfUn19cXnxQj+VqofwG3PXLokgEob9oGFS3xHvjE95NDVLELqc5rThsHaTuFfR rzEM9Yn14zBbOKPdUwLkcW2a2v43GwwHdkIXo3+OoZGWMS84h/CT17LX6JDp3BGfDXX/ r/1+En8BNwN5NSb9ibSArZ2wL4LFyYlhOyRLhXdAnciQxpyM+/vBqNV/Hd6C4s/71otb n1Ccl2xCsvMKfYsVm9yaJUs8ILMw9NZujrDLU5cYWg/Bz5CzGEDrI0ibPJV/pOt7fyCW bCjTUnTgIY5qCWgtGynURkGdF2Cg6PYe/61LZ58etR50IInm40IL1r/UG2zGIL684oIH ap3A== X-Gm-Message-State: ACrzQf2k3VHfg7jLU4F2TZSxGlflKGuLqbkXVlU2Y+KjWEAq/Pq+heQ8 X3Z89WFH8uMJlEBl9SbkM1BZL2nYKwQ= X-Google-Smtp-Source: AMsMyM5CPdvUbIVP/ihSoZE/XiacRl5np+96WU1uqZBTZqud/RFoO/2pOXrtcCx6N72Rb8aKueTEHA== X-Received: by 2002:a05:6808:20a4:b0:34f:de9c:a774 with SMTP id s36-20020a05680820a400b0034fde9ca774mr15077533oiw.213.1664213944521; Mon, 26 Sep 2022 10:39:04 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , "Dr . David Alan Gilbert" , Markus Armbruster , Alistair Francis , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 01/16] qmp/hmp, device_tree.c: introduce dumpdtb Date: Mon, 26 Sep 2022 14:38:40 -0300 Message-Id: <20220926173855.1159396-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::236; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x236.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664218145832100001 To save the FDT blob we have the '-machine dumpdtb=3D' property. With this property set, the machine saves the FDT in and exit. The created file can then be converted to plain text dts format using 'dtc'. There's nothing particularly sophisticated into saving the FDT that can't be done with the machine at any state, as long as the machine has a valid FDT to be saved. The 'dumpdtb' command receives a 'filename' parameter and, if the FDT is available via current_machine->fdt, save it in dtb format to 'filename'. In short, this is a '-machine dumpdtb' that can be fired on demand via QMP/HMP. This command will always be executed in-band (i.e. holding BQL), avoiding potential race conditions with machines that might change the FDT during runtime (e.g. PowerPC 'pseries' machine). Cc: Dr. David Alan Gilbert Cc: Markus Armbruster Cc: Alistair Francis Cc: David Gibson Acked-by: Dr. David Alan Gilbert Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Signed-off-by: Daniel Henrique Barboza --- hmp-commands.hx | 15 +++++++++++++++ include/sysemu/device_tree.h | 1 + monitor/misc.c | 1 + qapi/machine.json | 18 ++++++++++++++++++ softmmu/device_tree.c | 37 ++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 8ab8000acd..12b6d4e2dc 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1800,3 +1800,18 @@ ERST .sub_table =3D hmp_info_cmds, .flags =3D "p", }, + +#if defined(CONFIG_FDT) + { + .name =3D "dumpdtb", + .args_type =3D "filename:F", + .params =3D "filename", + .help =3D "dump the FDT in dtb format to 'filename'", + .cmd =3D hmp_dumpdtb, + }, + +SRST +``dumpdtb`` *filename* + Dump the FDT in dtb format to *filename*. +ERST +#endif diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index ef060a9759..e7c5441f56 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -136,6 +136,7 @@ int qemu_fdt_add_path(void *fdt, const char *path); } while (0) =20 void qemu_fdt_dumpdtb(void *fdt, int size); +void hmp_dumpdtb(Monitor *mon, const QDict *qdict); =20 /** * qemu_fdt_setprop_sized_cells_from_array: diff --git a/monitor/misc.c b/monitor/misc.c index 6436a8786b..205487e2b9 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -49,6 +49,7 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "sysemu/tpm.h" +#include "sysemu/device_tree.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h" diff --git a/qapi/machine.json b/qapi/machine.json index abb2f48808..b9228a5e46 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1664,3 +1664,21 @@ '*size': 'size', '*max-size': 'size', '*slots': 'uint64' } } + +## +# @dumpdtb: +# +# Save the FDT in dtb format. +# +# @filename: name of the dtb file to be created +# +# Since: 7.2 +# +# Example: +# {"execute": "dumpdtb"} +# "arguments": { "filename": "fdt.dtb" } } +# +## +{ 'command': 'dumpdtb', + 'data': { 'filename': 'str' }, + 'if': 'CONFIG_FDT' } diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c index 6ca3fad285..ce74f3d48d 100644 --- a/softmmu/device_tree.c +++ b/softmmu/device_tree.c @@ -26,6 +26,9 @@ #include "hw/loader.h" #include "hw/boards.h" #include "qemu/config-file.h" +#include "qapi/qapi-commands-machine.h" +#include "qapi/qmp/qdict.h" +#include "monitor/hmp.h" =20 #include =20 @@ -643,3 +646,37 @@ out: g_free(propcells); return ret; } + +void qmp_dumpdtb(const char *filename, Error **errp) +{ + g_autoptr(GError) err =3D NULL; + uint32_t size; + + if (!current_machine->fdt) { + error_setg(errp, "This machine doesn't have a FDT"); + return; + } + + size =3D fdt_totalsize(current_machine->fdt); + + g_assert(size > 0); + + if (!g_file_set_contents(filename, current_machine->fdt, size, &err)) { + error_setg(errp, "Error saving FDT to file %s: %s", + filename, err->message); + } +} + +void hmp_dumpdtb(Monitor *mon, const QDict *qdict) +{ + const char *filename =3D qdict_get_str(qdict, "filename"); + Error *local_err =3D NULL; + + qmp_dumpdtb(filename, &local_err); + + if (hmp_handle_error(mon, local_err)) { + return; + } + + info_report("dtb dumped to %s", filename); +} --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664218586; cv=none; d=zohomail.com; s=zohoarc; b=nR5KA/U1U75Ut1nnIY4ZwA7FlsWoJ5N9EmSycsCz0o08Gd8idAb1SxNwtOj7Q7MgmgnWaRIN3x2SsuVlqnj0iFgb983x9hZ9sxIa0P7zxI6gDqXNU1vhMmsj4UHAxEhWK2ciMINNOCzlbcvKWTyVxZa8I/r6iBe3Rs2Od4CaEfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664218586; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pXVh0YO1NoWUJnhZsEYuTK+C1YYZnhqFkmKC8PgYkM8=; b=QNsqKJdLq/WuLY+6HbMUHwyF6Vn6aiegjE3TXxhMG7byqvNPVEENqCPxL0WhGfeum87poVQLRKUgGj8NBrL7Gr7mqIfwDWeyONotGzHPu3GdcFZxv9KX/JqAes+Rf8A8SbQDFFodblmVzgAtW0d9V6OLYHcPK/WgztuWlHdjI3w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664218586397485.56047972278805; Mon, 26 Sep 2022 11:56:26 -0700 (PDT) Received: from localhost ([::1]:38906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octHF-0001Or-7r for importer@patchew.org; Mon, 26 Sep 2022 14:56:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4T-00089K-Mz for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:11 -0400 Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]:35429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4S-00025e-60 for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:09 -0400 Received: by mail-oi1-x233.google.com with SMTP id v130so9148107oie.2 for ; Mon, 26 Sep 2022 10:39:07 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:06 -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:subject:date; bh=pXVh0YO1NoWUJnhZsEYuTK+C1YYZnhqFkmKC8PgYkM8=; b=n0cwJsLOEUr68EUVvDh154wOt/n68+AniNDuHDACUze8zD4vnVxYMGYUrm2ZvYr4tE iNTn2/btGdHrDuPmEA2LlGj1K25cqsnzbKHPIj0hSmlk8s1v3gMTOWiZFHJTLgr5vFf7 B4Ms97wJrqPQRQse+/cmR23cJg97couBlBLH0+Z8cbzSZP+rTa/p4sspyMZEucuqA2NZ 0+Kdz5GZQ2IZeAS17SXTvuSkzJqBS1tQk1IhJYJcu6iUUoPaioEYHhZWCtpnaJHLsYLF CXM9N1Jl9ln/Iu8NQIpJnwdzBGS2L/Ai7UZaoUKEi9qcDPRUf3/goi8jhLx+O1fNGddA 2f8w== 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 :subject:date; bh=pXVh0YO1NoWUJnhZsEYuTK+C1YYZnhqFkmKC8PgYkM8=; b=746oJihevRVCnwSV0pI5VwCZDafkYY19zcsChUGaBDE0tCTW5NMtEbL9xmSyxGoMLS 2zg4bPepO3WEPVVGTBVDI2p9yGLlXMzK5GE6AB2fT/YeMCYdvFvybj1z/TqWdYSonCPD mpI196Ksa9mZjyZMUh702yHZDliBcQBkNxlhxAoDg/e5W7Aass02PryTX/vUchZl5ui8 XeKCnVxPxK5AOk7xj7xkgrHuQkgmNCUqHWOB0zyTuliJF/lwoVRyO5qZn+IxsB5pj3jv o3fEPH9soWAWgr30QY6IU7bvOmvUxUUrOTVLs0N5OSWsz9RYgkF3/DJg499rQRd0fcYy tLog== X-Gm-Message-State: ACrzQf3TzPZRg8qWW91/O0CKLiWF72RmlZdKo8+RwEOmrVkpdthizC0n ykXWd6HapxJ9w1noBy0GAtcbbWjcTMs= X-Google-Smtp-Source: AMsMyM726l1FlSjgIEH5sHhGktc/nSFakzJ/Qg6uiV+RjoJMcxV/YxBLrSoMg58QHHFBYNKch4naHw== X-Received: by 2002:a05:6808:22aa:b0:34b:ae3a:1e57 with SMTP id bo42-20020a05680822aa00b0034bae3a1e57mr10461522oib.150.1664213946464; Mon, 26 Sep 2022 10:39:06 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 02/16] hw/core: free ms->fdt in machine_finalize() Date: Mon, 26 Sep 2022 14:38:41 -0300 Message-Id: <20220926173855.1159396-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::233; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x233.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664218587546100001 ms->fdt must also be freed in machine_finalize() similar to what is already done with other MachineState objects. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza --- hw/core/machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index aa520e74a8..aa8c1c5c36 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1114,6 +1114,7 @@ static void machine_finalize(Object *obj) g_free(ms->device_memory); g_free(ms->nvdimms_state); g_free(ms->numa_state); + g_free(ms->fdt); } =20 bool machine_usb(MachineState *machine) --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664217739; cv=none; d=zohomail.com; s=zohoarc; b=m79GVGP/pnJ9Q90uZh/2GsHd2H+463FUOUAcf5NdxuukUe1Ih780yZFyh7sPRx0e5hBLEaNnpSK3PTq9LJaZAeJqLP4yHfG3vQ4fFnutAHMNbqlQx8NFzWL2IuH5pSzY8C1byiTW3H8R6PuiNNz/sBeAnbK6Qlcm0rLIAJXGtFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664217739; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V15rvRZKZ2cJu12JzYc4O3nQDWFfSAbiLD5gXBTKdAA=; b=VnWInMriU/tofUNIeFWtxSPb7lxqBwJuDx1JhJuvBio3q7GoTkiq9RWyIrX2XydIUmZp5ObFT6JJwCEzzQ79zK3Ghl3zRY9zgs8VHun18q5u6o5Vw6Fb6XGGea5HFZhsW8nQ4PEtLoVG1P13SbHp9slDzSWSNh7bZ7jABJTcmX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664217739558981.8902521173019; Mon, 26 Sep 2022 11:42:19 -0700 (PDT) Received: from localhost ([::1]:38938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oct3Y-00070c-4d for importer@patchew.org; Mon, 26 Sep 2022 14:42:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4W-0008Ag-8q; Mon, 26 Sep 2022 13:39:13 -0400 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]:40693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4U-000265-Ms; Mon, 26 Sep 2022 13:39:12 -0400 Received: by mail-oi1-x22e.google.com with SMTP id n124so9114340oih.7; Mon, 26 Sep 2022 10:39:09 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:08 -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:subject:date; bh=V15rvRZKZ2cJu12JzYc4O3nQDWFfSAbiLD5gXBTKdAA=; b=iwljlsh3W/Iwiu1jFMT1r8M2psmL1jtQKPjbI5JrdSfkKn3h28GSYC3MZejkh6gH9L H1baLT/Diy0J11XEsW2Se9cYP8b0OTNDj52RLJzn0TIx/XKEUS/s6q/2iW95KBrt4lJR kv8SjYycpAr5+rzBf6MQOKFxwLoQh1Jr0ASDSMNA/kwoLyCPWaXiuvUBSpPaQajh3X7h c9PNEVqdqsox7F96OVTtoFdhYKeLKVeQhd08fZfVGMAdA04qcpyrOC3QASy4IdaoEw/l EX1QBJHinjtbTuyZdG5wVaQjw+jfpvt919jg7DGZ+xKyE0wyveJ8yxKnsREN/68QeJcT WXmw== 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 :subject:date; bh=V15rvRZKZ2cJu12JzYc4O3nQDWFfSAbiLD5gXBTKdAA=; b=umULU00I950shcXye/I9NgjuZRIH0JdwTY7nIutLmXuLp2NC5tFCMiecc3iddIP6hG WfrosxOctqRDWgJUXIv2VkOPvPEsXthwblmuSXUJDTu1D2WpnYSP8JJGIhTCybeeMhQJ USsIdGHOAkM6Z8HHKeEsO0pNARSHEzzQK8xGEcLG2QNwRxJDtjWRrvDh2YNwMd0ehXTs tZwlzKDRFZY2W2VaT6TrawgG/sJsWtgl5C67VVgoN8B2YVLUNz2ve/0Z8AKHn8D34mW6 rl9XZfgox+evyD1QRlWCX2Msyhu+3LWgDD+szslJzZdct2a/rhmJ2Ja8SbB3MAHSk8Ws a22g== X-Gm-Message-State: ACrzQf1xB2CcNlMP8zIEEFJP73QW/ZsGC6Fo3W3Ms4fbDPE6i9iQxwBv J0gmBODND1jTVOWUEys8pYHxqd0w87M= X-Google-Smtp-Source: AMsMyM7rWbRbeyhw5lv3Pqf6uUnFShQ6IkJPwDKOxfw0eAcICWlU2IN0DKZ+bK7SYVh2DW7FzeGa6A== X-Received: by 2002:a54:4e92:0:b0:350:fc35:2fd7 with SMTP id c18-20020a544e92000000b00350fc352fd7mr10298972oiy.59.1664213948635; Mon, 26 Sep 2022 10:39:08 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Peter Maydell , qemu-arm@nongnu.org Subject: [PATCH v8 03/16] hw/arm: do not free machine->fdt in arm_load_dtb() Date: Mon, 26 Sep 2022 14:38:42 -0300 Message-Id: <20220926173855.1159396-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664217740060100001 Content-Type: text/plain; charset="utf-8" At this moment, arm_load_dtb() can free machine->fdt when binfo->dtb_filename is NULL. If there's no 'dtb_filename', 'fdt' will be retrieved by binfo->get_dtb(). If get_dtb() returns machine->fdt, as is the case of machvirt_dtb() from hw/arm/virt.c, fdt now has a pointer to machine->fdt. And, in that case, the existing g_free(fdt) at the end of arm_load_dtb() will make machine->fdt point to an invalid memory region. This is not an issue right now because there's no code that access machine->fdt after arm_load_dtb(), but we're going to add a QMP/HMP FDT command that will rely on machine->fdt being valid. Instead of freeing 'fdt' at the end of arm_load_dtb(), assign it to machine->fdt. This will allow the FDT of ARM machines that relies on arm_load_dtb() to be accessed later on. Since all ARM machines allocates the FDT only once, we don't need to worry about leaking the existing FDT during a machine reset (which is something that other machines have to look after, e.g. the ppc64 pSeries machine). Cc: Peter Maydell Cc: qemu-arm@nongnu.org Signed-off-by: Daniel Henrique Barboza --- hw/arm/boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index ada2717f76..60bbfba37f 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -684,7 +684,8 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_inf= o *binfo, */ rom_add_blob_fixed_as("dtb", fdt, size, addr, as); =20 - g_free(fdt); + /* Set ms->fdt for 'dumpdtb' QMP/HMP command */ + ms->fdt =3D fdt; =20 return size; =20 --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664218069; cv=none; d=zohomail.com; s=zohoarc; b=bu8q1KR9DcSnvZhItC3R2xfsC9Fv5cV6SmpzMV6xdblIixdhNMotpJRNpPMmeUiHWXHTKIQoNcf/cHBbJmzMdVGFSEtpfZOekOdbMjS0QRfhYHvqI2+9SXLXYxaQETs1x+Yu84PnecEo/3AQgiA13i7swTtrx/Fqagky4sD0/OQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664218069; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vHdfvsXs7srv9brU6TUmccxbRW5ad8ZONz/r55nW2zs=; b=YlfAvHmZvYCh3m9CfKxRX7nYtmzZoc3mmtra71VngzAg28we7yAcs/7NDFBq+vc7K0t8l9u3SNk4FiHo4Ini0mY0AP6ajvyq34nk6jnhuV3UzTVz6NGGhlNoxT2I8Qc3xtjJ6wHq196bGTxzYo1Pnbguk3s58gjZHjBmWsaPxtc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664218069680509.09152253384457; Mon, 26 Sep 2022 11:47:49 -0700 (PDT) Received: from localhost ([::1]:41892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oct8r-0003Jv-Ss for importer@patchew.org; Mon, 26 Sep 2022 14:47:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4X-0008At-7N for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:13 -0400 Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]:40698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4V-00026L-NM for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:12 -0400 Received: by mail-oi1-x233.google.com with SMTP id n124so9114431oih.7 for ; Mon, 26 Sep 2022 10:39:11 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:09 -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:subject:date; bh=vHdfvsXs7srv9brU6TUmccxbRW5ad8ZONz/r55nW2zs=; b=cCDDp8zkDYzRynqPvw1FyTXX1kPcdZB2C+bYoKzWfusnctHBkjx40yIIfhuM1N7sej 4za2kg1C0ujajDyh/5XZkXtzqO2rIfx6LUhy8FYQJeDfEqr8HjCjXc4xgAHm9oZPnRkK OGmZaCR+OtIKm8FUYX/IzUy5xZCxVFWpSLMMb23nz5mT0B3W9kqJ2ORK9LQiOw2GscQn O/2/LRnu555DbdQPbkQUds/mZ0ikT4p5tlutl7WH47lbVk4LfvjIG8rdfvJBwpP2rP+S ydIRErWCtqqIpJYdgT1mxF+9zgMlsvOv3M1Q6B86RHePrWR0DQbUYYilyTYzmqZ3+470 5xTw== 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 :subject:date; bh=vHdfvsXs7srv9brU6TUmccxbRW5ad8ZONz/r55nW2zs=; b=P9xxTyGRH1LvBk3qirJLYUy07+n+gWx2byUyRkh7V4zd+ib1HI+crUlKjEJhY8Zrzi tM0YT2ywgIyE75ZpSnGB9z5Teqx4y5qPkmbECf2ADJfQm3LLbWQOW8TTMNurlcwEc04p hbf9NmYxce9ozlirOkJw6IFrO/lGF+T+EajmiqgUTTihgRV2pLs5XtiNn8+0azB9ama8 579hwPmH5saikC09Kj5ODe9Ws9sEBSIAFQ1SZcvsTz4EMTvqQiccUQRLdKplX5iQhhGX k7yM6nrchueI6UF0ifMhf1cjc+2hNkc6U2LD3GdzuAijq83xeGojNfPjmm+9WNNkgC9C 04Aw== X-Gm-Message-State: ACrzQf082pRuNqd9z2Wid0kVd5RueRcA+kPiSh63tgSLOOmP4RINeRDm yAT2RuByVJonn/U2fLiVofJ7dUtseO4= X-Google-Smtp-Source: AMsMyM6029gcTA9hPYOrjsXTReJn6Ez0ARyg1F9EwysaI3u6AOpT/PlptXgFNOTB4qi/dTDlC0fMoQ== X-Received: by 2002:a05:6808:f88:b0:350:36e8:f29a with SMTP id o8-20020a0568080f8800b0035036e8f29amr15457476oiw.195.1664213950223; Mon, 26 Sep 2022 10:39:10 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza Subject: [PATCH v8 04/16] hw/mips: set machine->fdt in boston_mach_init() Date: Mon, 26 Sep 2022 14:38:43 -0300 Message-Id: <20220926173855.1159396-5-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::233; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x233.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664218071472100001 Content-Type: text/plain; charset="utf-8" This will enable support for the 'dumpdtb' QMP/HMP command for the boston machine. 'dtb_load_data' can't be autofreed anymore, otherwise we'll free the fdt that is now being referenced by machine->fdt. Signed-off-by: Daniel Henrique Barboza --- hw/mips/boston.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/mips/boston.c b/hw/mips/boston.c index d2ab9da1a0..65d38cbd71 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -793,7 +793,7 @@ static void boston_mach_init(MachineState *machine) if (kernel_size > 0) { int dt_size; g_autofree const void *dtb_file_data =3D NULL; - g_autofree const void *dtb_load_data =3D NULL; + const void *dtb_load_data =3D NULL; hwaddr dtb_paddr =3D QEMU_ALIGN_UP(kernel_high, 64 * KiB); hwaddr dtb_vaddr =3D cpu_mips_phys_to_kseg0(NULL, dtb_paddr); =20 @@ -810,6 +810,9 @@ static void boston_mach_init(MachineState *machine) /* Calculate real fdt size after filter */ dt_size =3D fdt_totalsize(dtb_load_data); rom_add_blob_fixed("dtb", dtb_load_data, dt_size, dtb_paddr); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D (void *)dtb_load_data; } else { /* Try to load file as FIT */ fit_err =3D load_fit(&boston_fit_loader, machine->kernel_filen= ame, s); --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664216588; cv=none; d=zohomail.com; s=zohoarc; b=nYwFL/2E85tRpMvAWwy15zX/uKwghGzFoCJi4Gvda9S0i9eyURnITcAXCnCHlYmYsxIYXHy1auHdG6+IRLE9oeorAmTiVXKJ5u01BdnsHD2Jg7oeVsjp8slMcL/Kmm9HOsAyS9BGhAYWNfR2JBLLJI3RvSpr+OVbxhi91uZwNXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664216588; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UgreoWc098GvxeIjx53eCAF9CT2DztfGmXSr51V9AOM=; b=THv3qeD7e2OpfXe+36qNn5dWRCcFoiIq6P9iXIaA73iVsMOEyXWlDWK/MfW6uwMUrnAs2ww9LF28DV9VLVKTHoBjrGta9q2iiK1Q9yPj87BtQ0+yGcjxSmDuCV3UW1jJ1xORy6ZfiwsDn6G+0ww6/g/zUmru6M+PFhFJS63S4W0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664216588072438.53536931888857; Mon, 26 Sep 2022 11:23:08 -0700 (PDT) Received: from localhost ([::1]:33250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocsl0-0002Cm-NX for importer@patchew.org; Mon, 26 Sep 2022 14:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4a-0008BQ-F6 for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:18 -0400 Received: from mail-oa1-x33.google.com ([2001:4860:4864:20::33]:45790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4Y-00026c-8D for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:16 -0400 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-127dca21a7dso10147343fac.12 for ; Mon, 26 Sep 2022 10:39:13 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:11 -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:subject:date; bh=UgreoWc098GvxeIjx53eCAF9CT2DztfGmXSr51V9AOM=; b=V/Nei7Um6GZPLMXrc2K6h7dbcziVo8K4rM2OS74+WLMnQCcsFod/m9aKD24vHQ6oCE BT6OpaqvS22RAF5ETs0w4hS8WvhNy3BuZxEY+n4QN7HpHDRNPJHMWcvRJoCmzf9LwtVg 41PPPHJoghpbnkJL1QMQkMWdJhhF1ikVUMflNoVULNn3Z7aMxafjhJycX7wXRebTQ7TN FfueVEHlS79yw/MyhUYxHSPDSCWPQzr6GiyFu6wGWqA5XuOGaiVL9mHtMyS5fFQkZxAX ZqxEbLrG/hVV0jnMZvY9QzZc77PWYhlLoPhtV1GI05D0VvvttjU2PNT5Aaahs9EG3xj0 0O6Q== 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 :subject:date; bh=UgreoWc098GvxeIjx53eCAF9CT2DztfGmXSr51V9AOM=; b=rwEmhdekEGNhHAcDjUdL0yrT7zdEZnCD0u/ZHeaTl+dAT8ajm9RTw4Xz15XIqe79Se FmNmVH8s1B/z3sAiQ1o8k4Zh9p768MeLNWJKseYVhQA1Wn1Gu4aE5Rs3+yMTU4NXeoM7 XwcEbO8z3j00Q0nJ+kUAdQUaj2ucI4pS2mnio6ffLmRfM/HqebQyefDV4VFg1eYhaMsx uVeb3zfwa7bIcpro7SQeAhLmKDRWWFww6DIBcLGkqmVuN/B4yM3+tciEAnVrh/txxjFJ p6nztY65enNUDCA1vGLatJZ5CKN4h7h7Tsof6DLFqKp+G7Lk5bqXCVYBFf1evZncwS3u dUKg== X-Gm-Message-State: ACrzQf32bqm3i1B6yBbdkzTyaIMFatsSKCdip/Sg9SkM2Kpuvyvm5Ya9 Zbv4D7HImbQAlhvQhxfM1XiyR1gsNrI= X-Google-Smtp-Source: AMsMyM4phianjCg8RV7b/8P2SNc1uj+ol+CwPQjFQkZApIiY2EEvKYX64SOcCw99hYShRj8YHVUWfA== X-Received: by 2002:a05:6870:f70c:b0:12b:b4fa:f509 with SMTP id ej12-20020a056870f70c00b0012bb4faf509mr13435283oab.11.1664213952202; Mon, 26 Sep 2022 10:39:12 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , "Edgar E . Iglesias" Subject: [PATCH v8 05/16] hw/microblaze: set machine->fdt in microblaze_load_dtb() Date: Mon, 26 Sep 2022 14:38:44 -0300 Message-Id: <20220926173855.1159396-6-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::33; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x33.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664216589203100001 Content-Type: text/plain; charset="utf-8" This will enable support for 'dumpdtb' QMP/HMP command for all microblaze machines that uses microblaze_load_dtb(). Cc: Edgar E. Iglesias Signed-off-by: Daniel Henrique Barboza --- hw/microblaze/boot.c | 8 +++++++- hw/microblaze/meson.build | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 25ad54754e..bec0538ce6 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -40,6 +40,8 @@ =20 #include "boot.h" =20 +#include + static struct { void (*machine_cpu_reset)(MicroBlazeCPU *); @@ -73,6 +75,7 @@ static int microblaze_load_dtb(hwaddr addr, const char *kernel_cmdline, const char *dtb_filename) { + MachineState *machine =3D MACHINE(qdev_get_machine()); int fdt_size; void *fdt =3D NULL; int r; @@ -105,7 +108,10 @@ static int microblaze_load_dtb(hwaddr addr, } =20 cpu_physical_memory_write(addr, fdt, fdt_size); - g_free(fdt); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D fdt; + return fdt_size; } =20 diff --git a/hw/microblaze/meson.build b/hw/microblaze/meson.build index bb9e4eb8f4..a38a397872 100644 --- a/hw/microblaze/meson.build +++ b/hw/microblaze/meson.build @@ -1,5 +1,5 @@ microblaze_ss =3D ss.source_set() -microblaze_ss.add(files('boot.c')) +microblaze_ss.add(files('boot.c'), fdt) microblaze_ss.add(when: 'CONFIG_PETALOGIX_S3ADSP1800', if_true: files('pet= alogix_s3adsp1800_mmu.c')) microblaze_ss.add(when: 'CONFIG_PETALOGIX_ML605', if_true: files('petalogi= x_ml605_mmu.c')) microblaze_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: files('xlnx-zyn= qmp-pmu.c')) --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664218481; cv=none; d=zohomail.com; s=zohoarc; b=NlKKwqftnxxi0pQSfN3nm/LIUTSbMxtxV6OEOs5+TabHFm+92R30wyBlz425OGCtJEQjdTekAs6O6RPPiQfD0feQN/rP+h72nfrJ/aNVdD+RESG6KlP2IBM69P4rpaJLjtDK9LI/OWVBbyYVudmzmJnzfT4BdR7fFautyEslF/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664218481; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K9uaPJUsmwLieYaVUDJt066hUKn1XieJwGJCGkDP1Bg=; b=dqJM8xYVlr+oooni2xR/+vE9/J6YUlMqI3v/SGNlAlnRLO7d1/QBnqW7i8g6lWu3HpG4ptj+0pWl1/o5jKRl1DttHty6yrgLO+RTPOzT9/bdx+2raR8+UQNe4sSXZwVvBO6pxjCudaDzY3FZ2DhneMJhUlizL5jOvOx2vQebAl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664218481203747.2168940035914; Mon, 26 Sep 2022 11:54:41 -0700 (PDT) Received: from localhost ([::1]:56340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octFX-0008QS-QG for importer@patchew.org; Mon, 26 Sep 2022 14:54:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4b-0008Bp-P2 for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:19 -0400 Received: from mail-ot1-x336.google.com ([2607:f8b0:4864:20::336]:41607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4a-00026u-2F for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:17 -0400 Received: by mail-ot1-x336.google.com with SMTP id e24-20020a05683013d800b0065be336b8feso4903845otq.8 for ; Mon, 26 Sep 2022 10:39:15 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:14 -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:subject:date; bh=K9uaPJUsmwLieYaVUDJt066hUKn1XieJwGJCGkDP1Bg=; b=cwjOLVljwPWnw6d1AEWl33lqbugoGPl1HWQ7WgLVLruWrJzLBXL2f3r2c42lKpWcUe SHJ0hNsc8kQ+tIBl++k2RixQXuEVO+hWua90k2UGrkhjA1dl/3EWo7WjLYGxRJptHynu 6EQSbeotFEB3L/Y47kJeDtxUJX596sBQoQbnHVpr4hbgoJxhZD83wjx2xzd5+8L8CchT xTgu1+/76JqTBHN+SvxJkzhVMQ2siGA6d7MxJ0T1ocwAbBrbmPhFlcRnnKB7UznPcCn/ lVFdds+hGaSfT4jJQc7ypd2pvAZEE+uqkllw0YEjnueR2cVr4Xi97D9J1rl8Bn8FawMM ZHwQ== 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 :subject:date; bh=K9uaPJUsmwLieYaVUDJt066hUKn1XieJwGJCGkDP1Bg=; b=B7gj0FmFo8eh9AMh3Z/8WRfVoUq22yHmqiwBpMLmOumEx34UqeDig3jcmoJIrrPb6N YDQfKp6Iq/khMS02FzUU7lMtq9DG4T0t+/9ENAkBp6+KtdhaJYvlZvOEpZ/GU2Y0x4WN YeDA0tu06iXMBNEDVcGD5YkG+1WtD09MvFSnF3qOQCXTJQX5g6V/yWVk2c7Dzov88QCF vju0+sBEV8XJV+2LL5JjPgcMiC4xRtKQ3HSyt/CbU42hFTjr9dXplHMl5v5F9FNLrWwk kVrcai7qZCs9w1ynrO+d4PGe9ruZUfJbgfJZArPLzUbAUUwDpYe5ZArP65OyqUlftroW oFZg== X-Gm-Message-State: ACrzQf2jNzfPgAXbm5Lf3JUPhdFhANSid3ld9tmxSaoKInDpUaWp6yqt MGUd+9eEBe93zShjJEbmyd4QHRb3Szk= X-Google-Smtp-Source: AMsMyM5Ska+D0PYoUE4s4kU+bkfNJsybzEcoZtzrDy1g2PIkOgAZFoH/53eSmK3NvkYzD5+5THLfmQ== X-Received: by 2002:a9d:7d16:0:b0:656:578:24ae with SMTP id v22-20020a9d7d16000000b00656057824aemr10431181otn.152.1664213954444; Mon, 26 Sep 2022 10:39:14 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Chris Wulff , Marek Vasut , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 06/16] hw/nios2: set machine->fdt in nios2_load_dtb() Date: Mon, 26 Sep 2022 14:38:45 -0300 Message-Id: <20220926173855.1159396-7-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::336; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x336.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664218482942100001 This will enable support for 'dumpdtb' QMP/HMP command for all nios2 machines that uses nios2_load_dtb(). Cc: Chris Wulff Cc: Marek Vasut Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza --- hw/nios2/boot.c | 8 +++++++- hw/nios2/meson.build | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 21cbffff47..b30a7b1efb 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -43,6 +43,8 @@ =20 #include "boot.h" =20 +#include + #define NIOS2_MAGIC 0x534f494e =20 static struct nios2_boot_info { @@ -81,6 +83,7 @@ static uint64_t translate_kernel_address(void *opaque, ui= nt64_t addr) static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsiz= e, const char *kernel_cmdline, const char *dtb_file= name) { + MachineState *machine =3D MACHINE(qdev_get_machine()); int fdt_size; void *fdt =3D NULL; int r; @@ -113,7 +116,10 @@ static int nios2_load_dtb(struct nios2_boot_info bi, c= onst uint32_t ramsize, } =20 cpu_physical_memory_write(bi.fdt, fdt, fdt_size); - g_free(fdt); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D fdt; + return fdt_size; } =20 diff --git a/hw/nios2/meson.build b/hw/nios2/meson.build index 6c58e8082b..22277bd6c5 100644 --- a/hw/nios2/meson.build +++ b/hw/nios2/meson.build @@ -1,5 +1,5 @@ nios2_ss =3D ss.source_set() -nios2_ss.add(files('boot.c')) +nios2_ss.add(files('boot.c'), fdt) nios2_ss.add(when: 'CONFIG_NIOS2_10M50', if_true: files('10m50_devboard.c'= )) nios2_ss.add(when: 'CONFIG_NIOS2_GENERIC_NOMMU', if_true: files('generic_n= ommu.c')) =20 --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664214395; cv=none; d=zohomail.com; s=zohoarc; b=QUavRcnwLWtUHwsZ2K6Mn2jthYbuRrXs73OapuTFKrPskrRI1ch1xyc6efT9YJPhAe9DGPQFV0QGHMqkiv5eWPqjKy/Tpq1fms0GeVQnrqZxwrfGWss2a2SV8yn9viVBxVSxxptlx2hhZ6EEd0aouuj//fkafwBBfJQS6ksrP30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664214395; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hufvA+hg/dHvYm0AiWZqdjdha3LWa/99db4PrkuRJeA=; b=Ds8tqlk9LfJu+g/9xldrcn/qQBpTgf2+50X036yBRb5TdROsXfbAPtsspq2D7ROz8KM/ktEHPrRwUcyq0t/UZqu56wt1NA01erjVnsao7IfBqYfVselm4XgKsK0gdmDwzum7wcuTiJeYQE7kwjAejSqfdwTOqVHH/G46uVXtrc0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664214395719658.0124743063775; Mon, 26 Sep 2022 10:46:35 -0700 (PDT) Received: from localhost ([::1]:55240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocsBd-0004PP-Fe for importer@patchew.org; Mon, 26 Sep 2022 13:46:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4d-0008C4-5q for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:19 -0400 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]:33533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4b-00025N-72 for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:18 -0400 Received: by mail-oi1-x236.google.com with SMTP id j188so9207250oih.0 for ; Mon, 26 Sep 2022 10:39:16 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:15 -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:subject:date; bh=hufvA+hg/dHvYm0AiWZqdjdha3LWa/99db4PrkuRJeA=; b=jq+VJBP0ppOvLOQ0rjlxRIu+DpHhQH2pGES4esr3FYJmAcqPhJcfRMCi59/YiTmcQk iYdjpTQK2HpdTuvLqrF/rkTfGCcAj8fSwU1mgyJ2vKdqs40TbB5f9rwuJGSBRBlghyT4 emxmYAhp7yqajyQ+RjkCMh+kaqtZADSqBK1O7JQB6n7yKRaHjbAoGI29UD6QiNw1vhwF dqeGQ9LhfUfL3DPd+CIF0rI27fVx2B2kuLXl8bn+0grxAjPtfM42qAziNDbFUBdV+Jgb Y7rcnCl6Z40bUtfuxy8dSolkOtADnM7fLAHvWNq7U7Cg5jQjPxNOXFqDsGNpJlMXhczb wRMA== 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 :subject:date; bh=hufvA+hg/dHvYm0AiWZqdjdha3LWa/99db4PrkuRJeA=; b=dtk57HVMmj1/8DsOZc6TKgmJodM3I1G2QVQ6ZBpzBcRl9XbmkuYqvvM9hAWVr7kjJO I+GsUAMkbATY0YPu2y2JseJDoWtSMFtPHNUaPUahzIK9fdGb4WzI60j4SOk6mk988K4s rnhZZ1IYrTGv2Fx453gQ1S2+nJEkfOQwsVpqAKxi56vADyTaoRuMTBzEuHkUMlic0SKh tkw9dUgW0LFwfb3xdQfIbyZ5RaXjUBCoPOE9uxARHOP4xAmM4bRaBCSHZO+tzqsC4KLd cToGs/ob84jqPyFK/VoCr427ejFDUjeVMSuyhpPzxUEpgORQj+OBixsAInYCrxHCgsZd lyyg== X-Gm-Message-State: ACrzQf2dK6iLD6u016sAixOTo5ZZjTRC/a5PeOmurp9Ktde9/zdKSy5L FG/FkduzhWxdQA/2uIEeB+hOhzVI/3U= X-Google-Smtp-Source: AMsMyM6/LIi5bTxeVrMm3R6X3rPjt3C0G7SBk0SPvKMe97bH15BeVz4DOXQSNRyk/AyLnZVZAu427Q== X-Received: by 2002:aca:120a:0:b0:34f:ffd3:4dd9 with SMTP id 10-20020aca120a000000b0034fffd34dd9mr16152835ois.271.1664213956265; Mon, 26 Sep 2022 10:39:16 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v8 07/16] hw/ppc: set machine->fdt in ppce500_load_device_tree() Date: Mon, 26 Sep 2022 14:38:46 -0300 Message-Id: <20220926173855.1159396-8-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::236; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x236.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664214396116100001 This will enable support for 'dumpdtb' QMP/HMP command for the e500 machine. Cc: C=C3=A9dric Le Goater Signed-off-by: Daniel Henrique Barboza --- hw/ppc/e500.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 32495d0123..ea5f947824 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -47,6 +47,8 @@ #include "hw/i2c/i2c.h" #include "hw/irq.h" =20 +#include + #define EPAPR_MAGIC (0x45504150) #define DTC_LOAD_PAD 0x1800000 #define DTC_PAD_MASK 0xFFFFF @@ -600,7 +602,16 @@ done: cpu_physical_memory_write(addr, fdt, fdt_size); } ret =3D fdt_size; - g_free(fdt); + + /* + * Update the machine->fdt pointer to enable support for the + * 'dumpdtb' QMP/HMP command. + * + * The FDT is re-created during reset, so free machine->fdt + * to avoid leaking the old FDT. + */ + g_free(machine->fdt); + machine->fdt =3D fdt; =20 out: g_free(pci_map); --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664216870; cv=none; d=zohomail.com; s=zohoarc; b=Sa1fIvf2bF0WaB3jLSL68yDkmLSQ/l4jioRml6Fd61GaCyqJoBcQjxlcbN6xsfoHFH49Zb6dYGNGrgwyxn0hD7YfAFjl5r+9xa1NFBNuQmu10HzPVPrxdFfxJVol5DYk0Ucz9KomOqWGf13q5Vhej0uBIIXHl8nrrludynmI6w8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664216870; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PQwNaAWzRAki7GfolZmwjwDqddgZMgGlGNagZSKFwBQ=; b=JQRlecaTJME8e4Ybe+9bE98MVQBqD2Ktf6PZzfoh014VZx8pGwx8QRAlnDJkfFVyABVkEXnp65vh+9E8NNu7bTMZQY8KVCwbrgsZES/ROPJk6NAl8KRyySI2kshHzeBnPAdL1p3yF4A5sVMerwDH+wFWivLAq2jAlY+3zsHP2n4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664216870025139.30041746987433; Mon, 26 Sep 2022 11:27:50 -0700 (PDT) Received: from localhost ([::1]:35236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocspY-0006oV-Px for importer@patchew.org; Mon, 26 Sep 2022 14:27:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4f-0008D1-Kx for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:30 -0400 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]:35829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4d-00027V-Vq for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:21 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-130af056397so10189211fac.2 for ; Mon, 26 Sep 2022 10:39:19 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:17 -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:subject:date; bh=PQwNaAWzRAki7GfolZmwjwDqddgZMgGlGNagZSKFwBQ=; b=E5L65JdL+i1LM1HvvXd46zY30Oot+WAfHOa4qgOXZbHalqovhhuBeyeAB7OnEH1Co9 YruJ0g+X2HvJ3nEW7du7rihc/dUmTfxfehbxXG35zZiZnF036wkzyurnCA4FldgqRqJI dfraewAjyS2oMWMtcesOOjlc8cDamSqoWuxAtAvrtve1PFkqiVQYVsRHdG5heidT/VJ4 Cd1L5peu9o5ANQkDXY6z92NWgVaZ3xFmlpnX3mrDwBBwm5WLWAjP7BiS95IS8bNUG0gj RR1sFMmqaww24H53BINW/PEdbdnQsZ44UBsmtlXw3n6ZRSbem9tZZdtgwUhiND0xBRT4 J/Iw== 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 :subject:date; bh=PQwNaAWzRAki7GfolZmwjwDqddgZMgGlGNagZSKFwBQ=; b=TDOYRa1sEPp9MFIENaNhp8nsmbZlLoOBHAKf9KXZ7lMlWKNSLxhDUbt8E/pKl7svNl 7WUmNTQYWbLI/U7HqhpoKdEGNvbWoPeuZIRyZvZDKQDCUPkHgq+igFEIQCYOLI6JhFi3 sjElmxhKRT+4AD8dSORV3ekd6F+UtwGUVoybBnfGyTSAjrJ5uS73vdV2T1Uo/EBp4mQe QgxtzCY7ANGGn3VMCe8n1KN1FS2TihwgVNfqNAhuZ2N6sqrveygocniPlkGD6m0AlTQ2 WVYh3UzjlzdrBPWG1s+W8pkpNtFqqKqDhrtsxl/hcpJfNlxaXhyndVDVGLrnUzoHBMFL UooA== X-Gm-Message-State: ACrzQf1Mof7gZe4wBqtqL1HZS3ldH76LI8cgDyWk0tAvPhnEuA9JDk1A Opo0erev8RlIzJerOAxuUG/3d4JCmI4= X-Google-Smtp-Source: AMsMyM7NhsRBSpQDTw1cJdsr3WizN9zcQlsEw0UOhqncaeTRqQ1lCj5kpLx1smJtaSBMPN0HEbqXAw== X-Received: by 2002:a05:6870:3392:b0:128:828:5ec4 with SMTP id w18-20020a056870339200b0012808285ec4mr19145243oae.99.1664213958317; Mon, 26 Sep 2022 10:39:18 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , BALATON Zoltan Subject: [PATCH v8 08/16] hw/ppc: set machine->fdt in bamboo_load_device_tree() Date: Mon, 26 Sep 2022 14:38:47 -0300 Message-Id: <20220926173855.1159396-9-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::36; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x36.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664216871973100003 This will enable support for 'dumpdtb' QMP/HMP command for the bamboo machine. Setting machine->fdt requires a MachineState pointer to be used inside bamboo_load_device_tree(). Let's change the function to receive this pointer from the caller. 'ramsize' and 'kernel_cmdline' can be retrieved directly from the 'machine' pointer. Cc: C=C3=A9dric Le Goater Reviewed-by: BALATON Zoltan Signed-off-by: Daniel Henrique Barboza --- hw/ppc/ppc440_bamboo.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index ea945a1c99..9cc58fccf9 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -34,6 +34,8 @@ #include "hw/qdev-properties.h" #include "qapi/error.h" =20 +#include + #define BINARY_DEVICE_TREE_FILE "bamboo.dtb" =20 /* from u-boot */ @@ -56,14 +58,13 @@ static const ram_addr_t ppc440ep_sdram_bank_sizes[] =3D= { =20 static hwaddr entry; =20 -static int bamboo_load_device_tree(hwaddr addr, - uint32_t ramsize, - hwaddr initrd_base, - hwaddr initrd_size, - const char *kernel_cmdline) +static int bamboo_load_device_tree(MachineState *machine, + hwaddr addr, + hwaddr initrd_base, + hwaddr initrd_size) { int ret =3D -1; - uint32_t mem_reg_property[] =3D { 0, 0, cpu_to_be32(ramsize) }; + uint32_t mem_reg_property[] =3D { 0, 0, cpu_to_be32(machine->ram_size)= }; char *filename; int fdt_size; void *fdt; @@ -98,7 +99,7 @@ static int bamboo_load_device_tree(hwaddr addr, fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n"); } ret =3D qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", - kernel_cmdline); + machine->kernel_cmdline); if (ret < 0) { fprintf(stderr, "couldn't set /chosen/bootargs\n"); } @@ -119,7 +120,10 @@ static int bamboo_load_device_tree(hwaddr addr, tb_freq); =20 rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr); - g_free(fdt); + + /* Set ms->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D fdt; + return 0; } =20 @@ -163,7 +167,6 @@ static void main_cpu_reset(void *opaque) static void bamboo_init(MachineState *machine) { const char *kernel_filename =3D machine->kernel_filename; - const char *kernel_cmdline =3D machine->kernel_cmdline; const char *initrd_filename =3D machine->initrd_filename; unsigned int pci_irq_nrs[4] =3D { 28, 27, 26, 25 }; MemoryRegion *address_space_mem =3D get_system_memory(); @@ -289,8 +292,8 @@ static void bamboo_init(MachineState *machine) =20 /* If we're loading a kernel directly, we must load the device tree to= o. */ if (kernel_filename) { - if (bamboo_load_device_tree(FDT_ADDR, machine->ram_size, RAMDISK_A= DDR, - initrd_size, kernel_cmdline) < 0) { + if (bamboo_load_device_tree(machine, FDT_ADDR, + RAMDISK_ADDR, initrd_size) < 0) { error_report("couldn't load device tree"); exit(1); } --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664218791; cv=none; d=zohomail.com; s=zohoarc; b=im/sVdLNs9/3/eUwbySCeIN6M+W2tM9iXnx7zCIX9vXydHL3H00+f01IUy3Jx+OaFyBmudxc8FxFmtu3PyCbCM6XHYAA42QGaj5MA0HD4PBr+XRERyhEe+g4wneEvq+MceHZlQBK7NIdBvbmflCQF7VrQUuY4VTKANP4lA6IQ1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664218791; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yf6ffLPC8i9eGCLE6mj5B79jg8nmXu5Z8K8DzV7zV2I=; b=cUzdJI6xzekY80V+M/AJheMsZNXotY7Xm1U7y/NvMsyJlpnEQ9s+QeBrW1W4LjOJMZbkTR0yZSJ2kkiDEGqtd+QAaQuSdVNFVuDW1QXkzXFgQmaL3hwsDoTutLqOqgExaerxqGMJNnEq6u1Fd0/O0KjrJGo3G+6A/PezSnO2n50= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664218791142213.35948759729308; Mon, 26 Sep 2022 11:59:51 -0700 (PDT) Received: from localhost ([::1]:38472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octKW-0005yG-R3 for importer@patchew.org; Mon, 26 Sep 2022 14:59:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4j-0008DC-6k for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:30 -0400 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]:33680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4h-00027p-Kp for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:24 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-1274ec87ad5so10247841fac.0 for ; Mon, 26 Sep 2022 10:39:21 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:20 -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:subject:date; bh=yf6ffLPC8i9eGCLE6mj5B79jg8nmXu5Z8K8DzV7zV2I=; b=O5puEa5Mcf2Kl8IpuaRjpKdHlUVhVu0YrsA627Eyd8mn1of7+qfJMlxPnAftcHbNli e/uaqj9p9cDqPhHWtT0lX/91QjybFrOUb5mxnCcLU0muF3iYImEXhtnnpjCJq1NW1uZj KaAm35e8KYY29VDpdANuC1ohvSyWecIwTLns6otn8R1HhfMhZZeFQzDKIqyje4y07rWY jrd9bJudnZLi/eoWYxSektITIoZstbsVRGrgi5I433hsxRTMO/28XPZFYomvrN48reQV Hhzk5hQklQ06TB5oBOUog1h13aMG5+knat8E9R6orOuffuuPVMAQeUzo9pv9kH+S/elb SKYw== 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 :subject:date; bh=yf6ffLPC8i9eGCLE6mj5B79jg8nmXu5Z8K8DzV7zV2I=; b=GTr53IvC7pglP5LaoFLspONgYy2cVZaDqz9YvntbviRtu7cc/9joLsNBVnp6zHCcAI jZ2BgCwr31B3uKyd1EQaZDPbsB+mxWpABrQMlfiHpU16z2XemMBV3HSRlnu63ODjx1Vm ZfJWKhdB5sNL1bHww3bljDEbjp4EdRFjaj0DigTNCXV88L+9K39qh1z/FncV7uZNJFq+ Awu76fWaMEE85EeDYj46oj0OpkPltcfjDuuyPGwoNq+a9/3kqg2hyIw+BcUgLLVt+RDF MqRmkCt4oy4koqnAYLOa8xonL3p0d8SEqJWYWITJJewAsgHysc/wRgujxsrZDwcvqned J4/A== X-Gm-Message-State: ACrzQf2pYj89vsOXfjvB2V6ZDHaQLJHVbAjvr8iMRHKdyKkAmIeIU/bH jW/HGg99UKfDl0U1lPyfs/FDIpXFHgo= X-Google-Smtp-Source: AMsMyM7TM0CbWAeIcLM2yle8TJx6AL3FiGOTzoK7xt8VhKSXlBjGh921/rZXH0gxc4DNP1i8F1SBSQ== X-Received: by 2002:a05:6870:2382:b0:12d:4848:fbcc with SMTP id e2-20020a056870238200b0012d4848fbccmr12908415oap.111.1664213960449; Mon, 26 Sep 2022 10:39:20 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 09/16] hw/ppc: set machine->fdt in sam460ex_load_device_tree() Date: Mon, 26 Sep 2022 14:38:48 -0300 Message-Id: <20220926173855.1159396-10-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::36; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x36.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664218793341100001 This will enable support for 'dumpdtb' QMP/HMP command for the sam460ex machine. Setting machine->fdt requires a MachineState pointer to be used inside sam460ex_load_device_tree(). Let's change the function to receive this pointer from the caller. 'ramsize' and 'kernel_cmdline' can be retrieved directly from the 'machine' pointer. Reviewed-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza --- hw/ppc/sam460ex.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 850bb3b817..5d09d3c6ab 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -131,13 +131,12 @@ static int sam460ex_load_uboot(void) return 0; } =20 -static int sam460ex_load_device_tree(hwaddr addr, - uint32_t ramsize, +static int sam460ex_load_device_tree(MachineState *machine, + hwaddr addr, hwaddr initrd_base, - hwaddr initrd_size, - const char *kernel_cmdline) + hwaddr initrd_size) { - uint32_t mem_reg_property[] =3D { 0, 0, cpu_to_be32(ramsize) }; + uint32_t mem_reg_property[] =3D { 0, 0, cpu_to_be32(machine->ram_size)= }; char *filename; int fdt_size; void *fdt; @@ -171,7 +170,8 @@ static int sam460ex_load_device_tree(hwaddr addr, qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", (initrd_base + initrd_size)); =20 - qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline); + qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", + machine->kernel_cmdline); =20 /* Copy data from the host device tree into the guest. Since the guest= can * directly access the timebase without host involvement, we must expo= se @@ -208,7 +208,9 @@ static int sam460ex_load_device_tree(hwaddr addr, EBC_FREQ); =20 rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr); - g_free(fdt); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D fdt; =20 return fdt_size; } @@ -496,9 +498,8 @@ static void sam460ex_init(MachineState *machine) if (machine->kernel_filename) { int dt_size; =20 - dt_size =3D sam460ex_load_device_tree(FDT_ADDR, machine->ram_size, - RAMDISK_ADDR, initrd_size, - machine->kernel_cmdline); + dt_size =3D sam460ex_load_device_tree(machine, FDT_ADDR, + RAMDISK_ADDR, initrd_size); =20 boot_info->dt_base =3D FDT_ADDR; boot_info->dt_size =3D dt_size; --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664218992; cv=none; d=zohomail.com; s=zohoarc; b=ETaRU25RrnN+pzMEcl0Jun9vKFQWj2iWzIIrxu9Ytzzhyxl1PLWUq4Bo9zrovQVQHKeNAFZLoRjLaQsgPhA1lVgYceDE8RvpiM4B98hIW2apV5o2KLPSJ83iUlX2qgQJxE7al5eEkgaWZYdtgjUIpUn5eLhiGTMFG6v41IkmVRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664218992; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w8c//muqcTEKcBCgpj24TLMklLW+HqPlgSGVutxb0Hk=; b=mkiKDlOyBi5R9eLb22UzB2MJ3iErCNS/OW/T/x9pu6l+N3KqM/BtJmT95vTgs3lZEYeRKAZEgLDadOEkpqOKpEkX1PhqfAb/wT2MJt1nybOxTArs/jCm7HqUqaaRKlR3wwlaTXuE+OMCLtqQxHeNfrKmlYFF1z6g1QUguqxmELY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664218992256930.4225092027533; Mon, 26 Sep 2022 12:03:12 -0700 (PDT) Received: from localhost ([::1]:55712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octNn-0001BB-0X for importer@patchew.org; Mon, 26 Sep 2022 15:03:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4k-0008DD-8z for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:30 -0400 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]:43886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4i-000282-9x for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:25 -0400 Received: by mail-oi1-x232.google.com with SMTP id t62so9091599oie.10 for ; Mon, 26 Sep 2022 10:39:23 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:21 -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:subject:date; bh=w8c//muqcTEKcBCgpj24TLMklLW+HqPlgSGVutxb0Hk=; b=MvbVeqjratIsIgxocqq2IW3jUtw5bnHi6Q2W6l31wmFMqA38PPDbSLwIIzR3f9XogA wpJkcLcsLl71OGaF4/4lNmKWtMrGW0SDkuYONBmQUbFD0l/2t5R0oV3IZdcJWw8dPG0b 9ytk3nd1DJlwfmtm7Itb4aRKc90IchU+asvr9xtYkJLTbCYvd5miKKL8sAmTm1Dv2x/8 vdagwyAYAHPxSZG+ElUihJjSjx88SW4dYtsn66GuhdYaR2jeUh+hsoCXMQzWjK6mJsdM tYsgtSSbRtaJUG8Di0C66rqaBsfHXkksbT6cySjyA9PDeIk/lg8Ks0AcALfX1+e6iIWH A98g== 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 :subject:date; bh=w8c//muqcTEKcBCgpj24TLMklLW+HqPlgSGVutxb0Hk=; b=QOanAiOEtwQrw+zAiPXSDtzRF4X36YAR/1VZiEu8IRPrhmDHvLtj+5hpD50n96ipSL +FKpMdAZeTfAv3LW8eqJM8yGiKdFjkDjmeupp2m33viNXxRyBh84CAySuAEcz3ZH0H8k qz1Fdv87YIDGwZ9nUAwSH+H523nlvxKuE3xuMaVnYz5i0yqGdpu8bzmKpP4DnAg8Wp3/ ew14upaXwz7zmSAwYy0w4QeEAQ2KazfsWPq5XH9lMQ78xFuYOJV+iMeG65RT8usT0Dgf mmyz0slaO78WpZZte2TVJYnyPZ/7l1pDueq18F29eIzpkzPih+5T64d9oBAPswQFaGdH DGUA== X-Gm-Message-State: ACrzQf3+rtdJQi7a8TOtuILtfKARUHwuf9y2cBQ2MO6LXhEJ/tXljIf8 extcMgWz2IkGwjCsrbLLc8G/c5GT/ho= X-Google-Smtp-Source: AMsMyM55ADsJYevpmzn49jKt1GA47XSWmevtV4zXspmN8Ra2C4GBxgS59Dq4UQfCMaA6c/4kmlYWyA== X-Received: by 2002:a05:6808:17a6:b0:350:92a3:1547 with SMTP id bg38-20020a05680817a600b0035092a31547mr10915637oib.177.1664213962305; Mon, 26 Sep 2022 10:39:22 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 10/16] hw/ppc: set machine->fdt in xilinx_load_device_tree() Date: Mon, 26 Sep 2022 14:38:49 -0300 Message-Id: <20220926173855.1159396-11-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::232; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x232.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664218992949100001 This will enable support for 'dumpdtb' QMP/HMP command for the virtex_ml507 machine. Setting machine->fdt requires a MachineState pointer to be used inside xilinx_load_device_tree(). Let's change the function to receive this pointer from the caller. kernel_cmdline' can be retrieved directly from the 'machine' pointer. 'ramsize' wasn't being used so can be removed. Cc: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza --- hw/ppc/virtex_ml507.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 493ea0c19f..13cace229b 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -45,6 +45,8 @@ #include "hw/qdev-properties.h" #include "ppc405.h" =20 +#include + #define EPAPR_MAGIC (0x45504150) #define FLASH_SIZE (16 * MiB) =20 @@ -144,11 +146,10 @@ static void main_cpu_reset(void *opaque) } =20 #define BINARY_DEVICE_TREE_FILE "virtex-ml507.dtb" -static int xilinx_load_device_tree(hwaddr addr, - uint32_t ramsize, - hwaddr initrd_base, - hwaddr initrd_size, - const char *kernel_cmdline) +static int xilinx_load_device_tree(MachineState *machine, + hwaddr addr, + hwaddr initrd_base, + hwaddr initrd_size) { char *path; int fdt_size; @@ -190,18 +191,21 @@ static int xilinx_load_device_tree(hwaddr addr, error_report("couldn't set /chosen/linux,initrd-end"); } =20 - r =3D qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdli= ne); + r =3D qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", + machine->kernel_cmdline); if (r < 0) fprintf(stderr, "couldn't set /chosen/bootargs\n"); cpu_physical_memory_write(addr, fdt, fdt_size); - g_free(fdt); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D fdt; + return fdt_size; } =20 static void virtex_init(MachineState *machine) { const char *kernel_filename =3D machine->kernel_filename; - const char *kernel_cmdline =3D machine->kernel_cmdline; hwaddr initrd_base =3D 0; int initrd_size =3D 0; MemoryRegion *address_space_mem =3D get_system_memory(); @@ -294,9 +298,8 @@ static void virtex_init(MachineState *machine) boot_info.fdt =3D high + (8192 * 2); boot_info.fdt &=3D ~8191; =20 - xilinx_load_device_tree(boot_info.fdt, machine->ram_size, - initrd_base, initrd_size, - kernel_cmdline); + xilinx_load_device_tree(machine, boot_info.fdt, + initrd_base, initrd_size); } env->load_info =3D &boot_info; } --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664217258; cv=none; d=zohomail.com; s=zohoarc; b=AI22WC9/v/Ab3LFZBiiXWqYK+84U2GsLewb2r5xuaEpHhBIDo9j7v72bjjkMVLUXT0MT3WWJhyvxnElzgcvPtGSObdi2bKJmY0YGMxsYOsA3scLeXKnzpcshpWaBeiMMIhzgduMIa7K9G8H5yHfYAUCEWHadcJf5Q4Ml6qaVAkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664217258; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3W5wihXh5/uTB6ZcQHXv1GIO5L/PO6INFau93sPuEXE=; b=POGBatNJrS8jiCX3HxnP2q0h2B1IksTLMCHLrkk1ZOt7YZ3YtoaNBIgrhqFV0vZ1l+Vu9Rts/yqxsoBzlwjsmXbvqzoVz8YHTr2PsrJURUJ2mY0kS7CiIXR1QcMCqXvV3JL18EFwtr1fdRl1i9p2d4h2VEmYJHQbcj4pNHmtYo0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664217258533979.3908453315175; Mon, 26 Sep 2022 11:34:18 -0700 (PDT) Received: from localhost ([::1]:55658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocsvp-0003uM-16 for importer@patchew.org; Mon, 26 Sep 2022 14:34:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4n-0008Ec-BZ; Mon, 26 Sep 2022 13:39:31 -0400 Received: from mail-oa1-x35.google.com ([2001:4860:4864:20::35]:38652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4k-00028P-F0; Mon, 26 Sep 2022 13:39:29 -0400 Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-1278624b7c4so10183344fac.5; Mon, 26 Sep 2022 10:39:25 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:24 -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:subject:date; bh=3W5wihXh5/uTB6ZcQHXv1GIO5L/PO6INFau93sPuEXE=; b=pTwlwLQEU0gzILCJ3zoXp6fJyzqc42RVJUelbix8g/sAxDq7oRFZa+16xM5YHeNQE4 IGmmDcNmxXcpNqHOQVmvAzyukbmV82OI7HAe4bsKjMNTt+9kvpJVipcC2mFGd9qz4SGd V0tfeE5oNyBSzzs4hnx/MU354CPdB7TAofuCb2IGJQFw0wDDvA2y9EYKYnjgo5KgDhkq I0eVL1OgmifYgHvVkqF/MOczxHNtecWMB4pPs2/GXrcWYMM0tc1lIxkLdPBoBBPeHMMa TfPMjFEdUgQUjAR76BhjEwa5mk/80IKDENthEwPXHn+fwXTDeF2m+NjBB+gll+Z61v/y IbCA== 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 :subject:date; bh=3W5wihXh5/uTB6ZcQHXv1GIO5L/PO6INFau93sPuEXE=; b=BY1YdxnnimtX9XBH5nL/hs+T7HPEy9TLINX4kQcKJtkaMl1jqp1gm1vNIAulg/UCyD hrNmWL4lz5ovz71WXw16JW6pJB+G8eyhLgS5hP5wadWZye30gYFCkcmkCHjKk4xlX4nv 4B+lVPXbvCtLg0kDjZrnsbGr1/nzqx2yR9q+HyjNXi7BXYpdU6fQ5I+NN6XwA1awdtu1 zu715E55NBowYSbHVTCh5jin+wtCTwsocKCyTMj/othz38VeTM1r+au4iqxL6zRuHJFv TdelMch1hsfZJvMhZkN4Fz+BxAW0Z54LbMaRvSArPQuR3SDT73C5bFzou3UOj+Udu5Hf zUYA== X-Gm-Message-State: ACrzQf1nHBACGPVq35DtHxmpsk50N+WsdXHtvdxJdaC+dBq34yXxk28D eBSc48b4srrfiHKFrCMdMPqI6qTnq70= X-Google-Smtp-Source: AMsMyM7K6HtwWJMY36Jde7BOVbY1iNmUQs5bLTu9VenrA6HLO9TIG4A4QrxVdU5u5v/83LtvSKDoRQ== X-Received: by 2002:a05:6870:e2d1:b0:125:f220:750e with SMTP id w17-20020a056870e2d100b00125f220750emr12272203oad.74.1664213964537; Mon, 26 Sep 2022 10:39:24 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , BALATON Zoltan , qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 11/16] hw/ppc: set machine->fdt in pegasos2_machine_reset() Date: Mon, 26 Sep 2022 14:38:50 -0300 Message-Id: <20220926173855.1159396-12-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::35; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x35.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664217260471100001 We'll introduce a QMP/HMP command that requires machine->fdt to be set properly. Cc: BALATON Zoltan Cc: qemu-ppc@nongnu.org Reviewed-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza --- hw/ppc/pegasos2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 61f4263953..ecf682b148 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -331,6 +331,10 @@ static void pegasos2_machine_reset(MachineState *machi= ne) =20 vof_build_dt(fdt, pm->vof); vof_client_open_store(fdt, pm->vof, "/chosen", "stdout", "/failsafe"); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D fdt; + pm->cpu->vhyp =3D PPC_VIRTUAL_HYPERVISOR(machine); } =20 --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664214798; cv=none; d=zohomail.com; s=zohoarc; b=SOGOfp/LxLP1betozYpBsWXx/qhttUNTqoaF4HAA1Sh/CZz9cxRqSTk87Oh9nE2S0Vn28LrXNKCyU3i2B0pPQHpU4h/rLrnCuK//TiWfonm29UVd2VcKozY8ki3rvlFWF3NP8asCYFFBXKcd29tk88A1a/vbUimxal0twuaQw8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664214798; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ozDC9a04ZCGETBJqu69PyFI6JbnzTsgup1wMXc7FuEY=; b=Y1vZDk8VDEBmoqUWGyto7BoyLiXj2WQfGdiB9mxabh8CjpXDtAvk5KjUQDzu+0pJjJX86oWTgASqgumiS4SJ9qPmoE9ErQy34nnRH6luKRZA3GbrJW0RNyGWO5RpoIWMclOuBwk+n2spm3szCgEVUVYqhFSaikZB4on5QxqGYsg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664214798148454.0331885198633; Mon, 26 Sep 2022 10:53:18 -0700 (PDT) Received: from localhost ([::1]:37602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocsI8-0002O1-VC for importer@patchew.org; Mon, 26 Sep 2022 13:53:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4o-0008Ep-Jq for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:33 -0400 Received: from mail-ot1-x332.google.com ([2607:f8b0:4864:20::332]:37443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4m-00029m-0M for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:30 -0400 Received: by mail-ot1-x332.google.com with SMTP id w22-20020a056830061600b006546deda3f9so4922292oti.4 for ; Mon, 26 Sep 2022 10:39:27 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:26 -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:subject:date; bh=ozDC9a04ZCGETBJqu69PyFI6JbnzTsgup1wMXc7FuEY=; b=Hhs77T4W9Wwzc6GJny1Dg9LtqI7mTNqF5jwJKsevBEzo2sbvfW3WlOr+ha4Ko9wV/F xRLJFxC2u8NqzITGkm5NNuufDN+iSQMsk0GcwbJma7Gbmr3SFBVKOkX+rtbJ+c+ZhQFo kARcRQVdZb1IIu6R88NTLDVPbVO0VRkjyiNNPVBitT2muwIT7qiKdN/SXPuDLoS3ruGs BQatYkhSak2Mvu3MZO9zQj7GU057cJQM4orJ5ewstm+yuxPx1kU/ITey0ZSw4We5a8hI gSoQ8MoOmxMe5u/GPkPt5x8FwpU66fW8ARBJmc/V9ugfPTUScG+hp02uK9WFrqe+GC49 B0xA== 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 :subject:date; bh=ozDC9a04ZCGETBJqu69PyFI6JbnzTsgup1wMXc7FuEY=; b=FD9LjpDnC3BATD3yhL68ScnvaGSbczFzNzFoRF788czdbdKKeTVVJRW9Z88/rYtEAq B8zAVD/MWV+rLgN74X83SNf66e+HR3qLVwuvq8M3q0COkHKZap28QtBgxjuJWPA6+BMS vplEnsvgEN1IgjoFdP24DNuej2KBvAebzGz6cxSlGqikr0OKvn5pjc5zPK2GJB1PESI2 2Sddp6TaLEesGXJdcRHOzQoA3WAXoPvGD8PhvdNS1qcO7BWJQO7w8vVvmaQEeIvFYWgA KqpmrzV3T5hg910xKII2GCJfC60qrITgyJDtV/hF1eKNFlgYmAP7wVpQr+pRdqBg2MPo JnqA== X-Gm-Message-State: ACrzQf0fZUg2agH9duw76DbhRSNYSjsJQRQLDDIgSWvHbx4HciXEmD5X L83//0XtTOPe91QLkGX/NL1DeWYBqYY= X-Google-Smtp-Source: AMsMyM5HKeQrdAhu1C817AAcXgnclc0eDeRQ87epjdnDhp/brEJZmq/Iv4s+Gag/S3xjDdxfR01K9A== X-Received: by 2002:a05:6830:2706:b0:659:de15:2cae with SMTP id j6-20020a056830270600b00659de152caemr11005705otu.4.1664213966468; Mon, 26 Sep 2022 10:39:26 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Frederic Barrat Subject: [PATCH v8 12/16] hw/ppc: set machine->fdt in pnv_reset() Date: Mon, 26 Sep 2022 14:38:51 -0300 Message-Id: <20220926173855.1159396-13-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::332; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x332.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664214799283100001 This will enable support for the 'dumpdtb' QMP/HMP command for all powernv machines. Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Frederic Barrat Signed-off-by: Daniel Henrique Barboza --- hw/ppc/pnv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 354aa289d1..6a20c4811f 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -678,7 +678,13 @@ static void pnv_reset(MachineState *machine) qemu_fdt_dumpdtb(fdt, fdt_totalsize(fdt)); cpu_physical_memory_write(PNV_FDT_ADDR, fdt, fdt_totalsize(fdt)); =20 - g_free(fdt); + /* + * Set machine->fdt for 'dumpdtb' QMP/HMP command. Free + * the existing machine->fdt to avoid leaking it during + * a reset. + */ + g_free(machine->fdt); + machine->fdt =3D fdt; } =20 static ISABus *pnv_chip_power8_isa_create(PnvChip *chip, Error **errp) --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664215399; cv=none; d=zohomail.com; s=zohoarc; b=XqoLLypvHaQXyilWefk88tgFQrYcsST9WM+a0fo0+fgoz/k6ydOfN9VSOI+vBdgXM6/Eoj9+TpsFzdSqH98aTOh3Lr9IQd4gr6Xm2WSvZDIVOUXkL9Gb5DdqpR13fQHViaJYwfdLbth2Z/E3jArC8HKZckaOcfujKpjIpEUJg44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664215399; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Y9RLBDU0dSHl/m1njOcZ6g2cHHBmVgAY9ga7gdHAKyc=; b=iG3I46cI19W/Gkk5leSEmT7qoCABYxMn87cA8LAQydSq664hoXv4Z39wJSEJxF910xUlt2EiyFkjDPLCPkRF8hR4dXF7qfWcgSaxO1F2pYb15+Wicq8+Ppq8Iz33/QM9N7GNe6sWGKn0HVgFjny4pv0SzEqp7ROSqp4rJA7ufSg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664215399920726.1351733406458; Mon, 26 Sep 2022 11:03:19 -0700 (PDT) Received: from localhost ([::1]:58910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocsRq-00064c-Ji for importer@patchew.org; Mon, 26 Sep 2022 14:03:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4p-0008FR-Ti for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:39 -0400 Received: from mail-oi1-x235.google.com ([2607:f8b0:4864:20::235]:39520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4o-00029s-Cw for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:31 -0400 Received: by mail-oi1-x235.google.com with SMTP id m130so9126653oif.6 for ; Mon, 26 Sep 2022 10:39:29 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:28 -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:subject:date; bh=Y9RLBDU0dSHl/m1njOcZ6g2cHHBmVgAY9ga7gdHAKyc=; b=kghyHO/Ymm/R4DnF/cadb+r29wzXjPm8993cRBZxBkagTnCkPaAZSdeuj8+sHMwNQq yX1TfvICgwW3CGFROzGqmSK2kD5fNBeCMetiHOfs/hK0yyXKpUe3SJjKA9WIalPexZQ4 EGRUxA4L7w7wfFfC9K0BR9qnm4w6+UvdttrrvopTvbsswqZcRWgI/qelsRBcjCb8ZJR4 WxKD9bZmQJUMI6ova47We2Pl6z2KTyRc273gSHDZfJ8vQusAKyecOi27it6KZQEsR8Vy op9ln4ojPpIBvWR5hRxj4s78V4T2U4W+VATDjdUOSqJZb+wDee8+oXrZWYQ8o9OAb7Ea tl+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 :subject:date; bh=Y9RLBDU0dSHl/m1njOcZ6g2cHHBmVgAY9ga7gdHAKyc=; b=u0S5lYXk6wAlolrJpw+3xoBfzzquDbKl317BzyDfBYcqG3HIfvaGV5/PetVzc3Cbxt Q92JAao9MayQowxzPF8kWmliInVjXutW3sJSzef3QN1zDK3RZK63+7YDyX8MS5hSzayr zPDfgssORidJlppMRgFAjIh6zYVncFgTAyFdZw4gH+hqJNpE/heN/kGinYwHPxjKWywc zX8ztKu7Ts6DKMvCUIKfD9cYi+pv5wdUuvxatggr+B7LwzBb0iMQ0T1KYwz9ddfB+plS e1y7dA8E/IDON9d9KmkaHhpX84j6+i9H+JUK16pKpJRBPx1G3Hdb7R40fLKgA6R7GNwc /YQw== X-Gm-Message-State: ACrzQf2rQm6awlfo3sHpdcs45drDZxi8dNlaEFsXg22G0VErizxtDQ1S UfrLj9J/co7IYpKxlWORE4Q9TBPX7fs= X-Google-Smtp-Source: AMsMyM4cD7o6ZVaRUUTxaiP0WXOcKrE0ZIiTNw5OZUbJN2+W8+sdnXINiQOEXZGaGo0KzcboclHQ0Q== X-Received: by 2002:a05:6808:6ce:b0:34f:e70a:c8e9 with SMTP id m14-20020a05680806ce00b0034fe70ac8e9mr15444890oih.99.1664213968394; Mon, 26 Sep 2022 10:39:28 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 13/16] hw/ppc: set machine->fdt in spapr machine Date: Mon, 26 Sep 2022 14:38:52 -0300 Message-Id: <20220926173855.1159396-14-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::235; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x235.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664215401663100001 The pSeries machine never bothered with the common machine->fdt attribute. We do all the FDT related work using spapr->fdt_blob. We're going to introduce a QMP/HMP command to dump the FDT, which will rely on setting machine->fdt properly to work across all machine archs/types. Let's set machine->fdt in two places where we manipulate the FDT: spapr_machine_reset() and CAS. There are other places where the FDT is manipulated in the pSeries machines, most notably the hotplug/unplug path. For now we'll acknowledge that we won't have the most accurate representation of the FDT, depending on the current machine state, when using this QMP/HMP fdt command. Making the internal FDT representation always match the actual FDT representation that the guest is using is a problem for another day. spapr->fdt_blob is left untouched for now. To replace it with machine->fdt, since we're migrating spapr->fdt_blob, we would need to migrate machine->fdt as well. This is something that we would like to to do keep our code simpler but it's also a work we'll leave for later. Reviewed-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza --- hw/ppc/spapr.c | 3 +++ hw/ppc/spapr_hcall.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index cc1adc23fa..d988e59983 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1713,6 +1713,9 @@ static void spapr_machine_reset(MachineState *machine) spapr->fdt_initial_size =3D spapr->fdt_size; spapr->fdt_blob =3D fdt; =20 + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D fdt; + /* Set up the entry state */ first_ppc_cpu->env.gpr[5] =3D 0; =20 diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index a8d4a6bcf0..891206e893 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1256,6 +1256,14 @@ target_ulong do_client_architecture_support(PowerPCC= PU *cpu, spapr->fdt_initial_size =3D spapr->fdt_size; spapr->fdt_blob =3D fdt; =20 + /* + * Set the machine->fdt pointer again since we just freed + * it above (by freeing spapr->fdt_blob). We set this + * pointer to enable support for the 'dumpdtb' QMP/HMP + * command. + */ + MACHINE(spapr)->fdt =3D fdt; + return H_SUCCESS; } =20 --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664215104; cv=none; d=zohomail.com; s=zohoarc; b=BKJEjifSuIHwe/j43OaFG00fUQXNmQOiaxU2YcVH9fz/0iHdQ/aidoFwEcQIOvM84K+ETEeOsVzNKv2Yll3H5RyLZ9yRUyiCM2EB6t7v5g5T2f2ew/6LdciNDOjwfA4L7QA4JugNHlb1r5EDmNlG2Zy12tzt0r6NwI5ZtdJof9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664215104; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8k8m7tTIRsONuhUtiiTz4lsaFZ+v66z/dHGJZRmH4R4=; b=HEt7nAK664ngCAj1ciqu7w/OdeyDWChW+6yMH+7mR4xqu2qMTzDlH2NrKMXobGssNR2L33trkPpl/EXA00frNER1g+s61TY/mqEnwd+PzUn5Ep/zKIQJWNRw15bg+7zQ+pG8I/fGhb14VYKybR9kLm5Mw8pIjT5r/w6Nk/Mins4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664215104989320.9217794295653; Mon, 26 Sep 2022 10:58:24 -0700 (PDT) Received: from localhost ([::1]:45128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocsN5-0008Dr-GN for importer@patchew.org; Mon, 26 Sep 2022 13:58:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4s-0008FS-DG for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:39 -0400 Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]:34325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4q-0002AH-VE for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:34 -0400 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1280590722dso10212093fac.1 for ; Mon, 26 Sep 2022 10:39:32 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:30 -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:subject:date; bh=8k8m7tTIRsONuhUtiiTz4lsaFZ+v66z/dHGJZRmH4R4=; b=aMUze2F0FHOTqkPdQtsBjBlE7RYQ0kPjouz3EHBrkyiZhifCSo0JRjGPEQpOq26pNd 6PQ0kkDNwrQUc+W6dFhJ8fV2qu3S6unXQTEBxgI2/PdXS/EDfNhOPOV5mY1ZxccmSH7u GCmQikVVUjlsdkqTqjBrKfRh5vzpysWNKT+D9sYhBO7rlROALLueCuYoIRPcLrlthct6 5WNlymqTgDi3jIbXwYWkEqXJtAXaWUenYQpdxF3aKWG6MOwrbUBDv/xUp1qWauvJHTO7 hHrWn/VjPOxR0TJnqItYjGLO7apSeaxgeIfcpvu/OfaipkmUEGINLrm8bebRYOXO/w9q juvw== 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 :subject:date; bh=8k8m7tTIRsONuhUtiiTz4lsaFZ+v66z/dHGJZRmH4R4=; b=KjDhTqWzuop4B58oNbe/ATUkB6zGA8NxZZ7G1sN0TZuNgFZcJgCTiESB9+K8/veseM lmaiOY2uclSgwqLCH/I7rbymwER0mO3dQKa5ee+7utqk9rHrrS9Yvc1glmO18/PS0zyi 6567oHFrKaZdSnmtsK8v+JT5JzrMZf5hEtUrSzutxoiC2n9h5AFW5azGbKteu1Zv+Z83 RAgLW9ziZynUVFkTFXslsYYw1FdTWc6JAnSGjqY7nZam6x5x2qv0+j90dlSGBwgMktbE aWN89cpLjcwK23XRi0UJDVw+PiC8VZ0nbRJQHJVQVgqH0MuDDbQ92cd5riBsDSqvpBA8 sC2w== X-Gm-Message-State: ACrzQf3uj7avZZ2ifQknW+/gZCJD9qxXuObw3mQJW9sEsbfqKOPAG1Q2 8qA1wJxVaA10CczaU5eg/grl3kQkwyo= X-Google-Smtp-Source: AMsMyM65ReA/+PzOglZmVv5rpPWqcofLsQS/pHR7LWoV+FUhGN3wg8FFAhbJc03ogL1+gkPXv261jw== X-Received: by 2002:a05:6870:d299:b0:131:6b65:b010 with SMTP id d25-20020a056870d29900b001316b65b010mr988250oae.234.1664213971088; Mon, 26 Sep 2022 10:39:31 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Alistair Francis , Bin Meng , Palmer Dabbelt , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 14/16] hw/riscv: set machine->fdt in sifive_u_machine_init() Date: Mon, 26 Sep 2022 14:38:53 -0300 Message-Id: <20220926173855.1159396-15-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::32; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x32.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664215106670100001 This will enable support for 'dumpdtb' QMP/HMP command for the sifive_u machine. Cc: Alistair Francis Cc: Bin Meng Cc: Palmer Dabbelt Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza --- hw/riscv/sifive_u.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index e4c814a3ea..b139824aab 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -634,6 +634,9 @@ static void sifive_u_machine_init(MachineState *machine) start_addr_hi32 =3D (uint64_t)start_addr >> 32; } =20 + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D s->fdt; + /* reset vector */ uint32_t reset_vec[12] =3D { s->msel, /* MSEL pin state */ --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664218688; cv=none; d=zohomail.com; s=zohoarc; b=NLAH+zeC6l/SDV+Bl729hpOiljpIlVIsBb8jqVpuijuYeXcYYB2v3rC2PgtGjRDhno+wx4TuZ+TCKYLyaDJ9YG5tbfwx9N5ffF3YWNkpezgnogVMROr9i6TFkWxElt/YJDOawOWW+o53f12ffzZzul/+LDYPKjYwZRFo4uL9f6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664218688; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bEv0r4uQfAAcTHe8q+ogFy53mtFMlPlNpf2Vxa9ZPHw=; b=amkmRmdJGkO+aV9ICuyQ9mdo0XvuRstjHhUp6G7Dupj0aooUnYwxWG/DwBLBEtLuHbRuypDUS5WSCqW+kLNmjaDK0AjwH9hMY4G0I1nxP5NPEkR27+ed9Cci3e4p6FvXWNOkOW+KiKSXnvS1mDrm7XjmGC+Y9QFdD3PoE0LP4l8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664218688824259.3772468317567; Mon, 26 Sep 2022 11:58:08 -0700 (PDT) Received: from localhost ([::1]:56412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octIs-0004QQ-IN for importer@patchew.org; Mon, 26 Sep 2022 14:58:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4v-0008G0-Fr for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:39 -0400 Received: from mail-oo1-xc30.google.com ([2607:f8b0:4864:20::c30]:44810) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4t-0002AS-U4 for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:37 -0400 Received: by mail-oo1-xc30.google.com with SMTP id d74-20020a4a524d000000b004755f8aae16so1222356oob.11 for ; Mon, 26 Sep 2022 10:39:34 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:33 -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:subject:date; bh=bEv0r4uQfAAcTHe8q+ogFy53mtFMlPlNpf2Vxa9ZPHw=; b=UwPl+epvXpU6ZpsamYeFwfEBCjyyuymPV7wPcXBINcGCl7AIXe3AxdnOEhXrefbPOH tt8/kvC5Dzs5lP3+9I3ZnWuQhaAtjAZQCresk/CUX5sCR6RtY1dA9HSuaSRIM4C+v9lj a9HIWgJeRo4iLEikAE3qZs0YpEQCvqPPQcGBRNQw6/jJj7rEJk50+6wqoNTadguM9tah BEI4Atq1k2pWyMmDzRYNE1fQhfpTWe0FT3wB1p8lHlTo4o0p/2uSY5NL++RCBWmGOgrt pHhE1FfMiDpaCH+QU16kom7haUVntcJ8lFgH5mlXPg8oXXL8V2rNSAYtc+16MoHLA16d Czjg== 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 :subject:date; bh=bEv0r4uQfAAcTHe8q+ogFy53mtFMlPlNpf2Vxa9ZPHw=; b=6/vn4xNkXqAVVekvV0E5mNKycs9NRhQQ5247cCOaMQJhElWLMDFWGRlCYvFn9/GT8H 8ti1D2sqSZ53k9tpGAc4phDIO18POE4pI8v1wSCcilWAEtvmcXttl2lHlvznL/jo2QUI UUFaQ9Y0dAKj601pFu7HIK244z4j/3owWwou9F1vPCg0woF96h5YMiMhegfIsl4S5BT3 1rxQAykbw4ucvQVPqGMNLXQCJFUsPKop8wLR8bM36JJV4B19fksfh43aMqmxWZJABADG sS9RMV4r7wBE3XAuGqThYyiwDn1bz/2CySi7bXgQKdE9uO+7RGQ5oVUszGayCkBNeJDv uZVA== X-Gm-Message-State: ACrzQf0PZ65tUEenbxJhEI06JRDWkjQNHYg5S0N+S/s7TehgrZ4DHnTO +6348Jud516lyTJZlBwG8aNLL6dozUs= X-Google-Smtp-Source: AMsMyM4z6BK6vT/x97ns5ZrJWDUu4sHT1JB+bAWImuZwVgClypQ+/AkKlzo3YdD+qMQQPb/5fXGF7A== X-Received: by 2002:a4a:8887:0:b0:475:af37:295d with SMTP id j7-20020a4a8887000000b00475af37295dmr9308483ooa.85.1664213973704; Mon, 26 Sep 2022 10:39:33 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Palmer Dabbelt , Alistair Francis , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 15/16] hw/riscv: set machine->fdt in spike_board_init() Date: Mon, 26 Sep 2022 14:38:54 -0300 Message-Id: <20220926173855.1159396-16-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c30; envelope-from=danielhb413@gmail.com; helo=mail-oo1-xc30.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664218690670100001 This will enable support for the 'dumpdtb' QMP/HMP command for the spike machine. Cc: Palmer Dabbelt Cc: Alistair Francis Cc: Bin Meng Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza --- hw/riscv/spike.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 5ba34543c8..1e1d752c00 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -40,6 +40,8 @@ #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" =20 +#include + static const MemMapEntry spike_memmap[] =3D { [SPIKE_MROM] =3D { 0x1000, 0xf000 }, [SPIKE_HTIF] =3D { 0x1000000, 0x1000 }, @@ -304,6 +306,10 @@ static void spike_board_init(MachineState *machine) /* Compute the fdt load address in dram */ fdt_load_addr =3D riscv_load_fdt(memmap[SPIKE_DRAM].base, machine->ram_size, s->fdt); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D s->fdt; + /* load the reset vector */ riscv_setup_rom_reset_vec(machine, &s->soc[0], memmap[SPIKE_DRAM].base, memmap[SPIKE_MROM].base, --=20 2.37.3 From nobody Fri May 17 00:38:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1664219287; cv=none; d=zohomail.com; s=zohoarc; b=b8tYFKg6nWS91p8BbRFmGxzWUQTy+E2h660d0tl6sp/gtm9nkyElOof1FAX9Z+yxJnX4lEi3LKiXRMLETP58eC1aooS5Z9M0rSLHZjyfMwML14R+REKn45py6ydon1C5kd7x20lRjBG8YHOGyMU3qhDAVhekq8cMTYCKJikEVr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664219287; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zECDqm6f1LsQeHy+YP77QCUaQ1hC8k4wbK8cK5DRO7g=; b=iZluprdSHHBejitBtiXHKlp9bMuwpRlTmxluFtAItHfltYm7Xkz8hJ5nppfRUamJOWNx18CtehCiVm7k5ZFe7fyzhP1AT03MV4/sWW0TAS/jr5qruNRe85JZbumaK6HJghZ2/V/QmyVasTeel0vy0qQ7/OcdpoC4cF4U8HOFiGc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664219287689747.4041577276486; Mon, 26 Sep 2022 12:08:07 -0700 (PDT) Received: from localhost ([::1]:33406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octSX-0004Le-4g for importer@patchew.org; Mon, 26 Sep 2022 15:08:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocs4w-0008G2-Qj for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:39 -0400 Received: from mail-oo1-xc31.google.com ([2607:f8b0:4864:20::c31]:36416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocs4v-0002Ab-8i for qemu-devel@nongnu.org; Mon, 26 Sep 2022 13:39:38 -0400 Received: by mail-oo1-xc31.google.com with SMTP id t4-20020a4aa3c4000000b00475624f2369so1229650ool.3 for ; Mon, 26 Sep 2022 10:39:36 -0700 (PDT) Received: from balboa.COMFAST (189-68-154-15.dsl.telesp.net.br. [189.68.154.15]) by smtp.gmail.com with ESMTPSA id m12-20020a0568301e6c00b0061c9ab1032dsm7947165otr.18.2022.09.26.10.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 10:39:34 -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:subject:date; bh=zECDqm6f1LsQeHy+YP77QCUaQ1hC8k4wbK8cK5DRO7g=; b=IXMRNArAF35bioxQdlM2kjqpEo29Ka8+Gsm6UOBpdrpmUEhN6WpDn8sIcYP6LRHHge 7U8gNlFkdVQfXLAG19OYFCSnBdvVOylKNhz4jeB0MZHlK64jcfvaixWh3fczDAdr1CfH OI5Ge3oGcmug3Yw2HICyiro0QWT6/cToY1fSICtipvX+A9IqzPRX16Ofu/D1ee94eRik Ni43tGKd2wlQhy2+v8/h5QnkBx7bOhifLKL618iRkzxXTw1P0fnV7T1LH1XaRo1fFV3v +G3eJY+7efLkY2t5pY569iiZEUJDjIUB+iVEcyNn8NzkFNBA1m6YedkWk+Gz1B1G9tEB 7lOA== 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 :subject:date; bh=zECDqm6f1LsQeHy+YP77QCUaQ1hC8k4wbK8cK5DRO7g=; b=aiBWhgcMWX+OgaQdWtYW7uiArDhcVHS1FwlyKYze4awuP3IOHojWEjqJg7C0zT+kw7 ZtdoDNGerGv2D7/s5ro76GQoz40nb/rmtKOt2ykEk1Gp/yuehj8ExBeOgQECWH+3HHGC NnCRB7qrvJPNhk3JUCG4sChlHsMfmoVpgbaBzgD9f0y9YG3OBPIszwWZZHb+JXaNqSCw zRkA/JqO0yISf/k9n4ZKoakXQlP6n2J3Ic4UiYxViaPZm031KA6WJ4J498PQ2qGXAD4C l7BqKk1IcYG/4ec3hVPXD+3suGXp1Tve7PpWTNU9xiPHckkKFicuPDrl1LdNJa/ScFcn 2Oxg== X-Gm-Message-State: ACrzQf1s2m6e0zBwFS9rEY/wWdOSg3pdot9hnNuwWx/uobLALIiXEbzC u3lcKwWyEgazhdb+Qv0AzTLjkICxF2Y= X-Google-Smtp-Source: AMsMyM7d0c0xe5R1x6xNZFc+PrGiHDTatN/uixxEvjx3pGkDSQ2f/dEuytZT9EvoF3VOT3kjxLFtaw== X-Received: by 2002:a4a:a7c4:0:b0:476:c9f:773 with SMTP id n4-20020a4aa7c4000000b004760c9f0773mr9206301oom.49.1664213975338; Mon, 26 Sep 2022 10:39:35 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza Subject: [PATCH v8 16/16] hw/xtensa: set machine->fdt in xtfpga_init() Date: Mon, 26 Sep 2022 14:38:55 -0300 Message-Id: <20220926173855.1159396-17-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com> References: <20220926173855.1159396-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c31; envelope-from=danielhb413@gmail.com; helo=mail-oo1-xc31.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1664219288581100001 Content-Type: text/plain; charset="utf-8" This will enable support for the 'dumpdtb' QMP/HMP command for all xtensa machines that uses a FDT. Signed-off-by: Daniel Henrique Barboza --- hw/xtensa/meson.build | 2 +- hw/xtensa/xtfpga.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/xtensa/meson.build b/hw/xtensa/meson.build index 1d5835df4b..ebba51cc74 100644 --- a/hw/xtensa/meson.build +++ b/hw/xtensa/meson.build @@ -6,6 +6,6 @@ xtensa_ss.add(files( )) xtensa_ss.add(when: 'CONFIG_XTENSA_SIM', if_true: files('sim.c')) xtensa_ss.add(when: 'CONFIG_XTENSA_VIRT', if_true: files('virt.c')) -xtensa_ss.add(when: 'CONFIG_XTENSA_XTFPGA', if_true: files('xtfpga.c')) +xtensa_ss.add(when: 'CONFIG_XTENSA_XTFPGA', if_true: [files('xtfpga.c'), f= dt]) =20 hw_arch +=3D {'xtensa': xtensa_ss} diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 2a5556a35f..867427c3d9 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -50,6 +50,8 @@ #include "hw/xtensa/mx_pic.h" #include "migration/vmstate.h" =20 +#include + typedef struct XtfpgaFlashDesc { hwaddr base; size_t size; @@ -377,7 +379,9 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, M= achineState *machine) cur_tagptr =3D put_tag(cur_tagptr, BP_TAG_FDT, sizeof(dtb_addr), &dtb_addr); cur_lowmem =3D QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4 * KiB); - g_free(fdt); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + machine->fdt =3D fdt; } #else if (dtb_filename) { --=20 2.37.3