From nobody Tue May 21 13:25:43 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=1662334661; cv=none; d=zohomail.com; s=zohoarc; b=gI+9MF3tx3wzSejGLFbZ5+BnDglCC/jNxu7TXQ//emf3TKYmKFW37LWRwrJeYxrKdz1PE8W/0WfvX6IOjjtzk9rnGj+jEI676j21cSJG1Ygq2sTwg6X/Z+t4TD9U4UhRUdKrSzgkqEaSPzoyA2bc9Jnk/EG2Bm7m2QRmKrOUbkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662334661; 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=HovcpPksbyRH4MetLfjOHLX26QOG2cA8NngwzZBGLTg=; b=Bk9cMvvBykMHlUYFq8zpmMcqoQSk0VKsRSUlGjHgPpxJ3elFJS+1DAt7vII/SKy+OphJb8KZnMDfNujKU0+HvK53oFkg9/lLOHk9fvCxxaeZB4m/2e1cLC9d+3g17+e/YJ5hEMCBYuKQNO7UqObwvEU9k7bItJ2XHaKDbyhlaWw= 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 166233466129398.06349767360109; Sun, 4 Sep 2022 16:37:41 -0700 (PDT) Received: from localhost ([::1]:47492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzBL-0001gl-0v for importer@patchew.org; Sun, 04 Sep 2022 19:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz8u-0006hS-DQ; Sun, 04 Sep 2022 19:35:08 -0400 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]:44679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz8s-0004wz-Mb; Sun, 04 Sep 2022 19:35:08 -0400 Received: by mail-ot1-x32e.google.com with SMTP id t11-20020a05683014cb00b0063734a2a786so5187260otq.11; Sun, 04 Sep 2022 16:35:05 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35: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=HovcpPksbyRH4MetLfjOHLX26QOG2cA8NngwzZBGLTg=; b=e/qJ2ngIxltIyrc7/PR0+LvflU1ys+K3+bSDKWpo5L6Xj2NaOIQQz92UVq6PVTnFQD J+Dz2QwJzBu+4gZY9PirQTTo1vBn+fkH8qaZNcSgPXXl8mrnuk0tNjt9IgbBqpPfdOn0 uiBXIJfQSCD8RYbd28niJhCa6ho+47H+eD58A50u4guZbX4hjcim0EzdCSyfc8OrGsJY VBntBOfhdlTNJWx7DCUQiu3xS/Xn7FzV+Qn5QYCsWXorFK1MOLrxeDVjmhrCHl5aoCW5 gC6uCq0f1CS6PDmXH3qHAFDD4L3wdA51HxtedmL3fwtA9Qr4LMt6rS/8CI1NS7lLkLBi Wyng== 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=HovcpPksbyRH4MetLfjOHLX26QOG2cA8NngwzZBGLTg=; b=RUcQ80l7mLaqSEPir8ZhWyiGjz/RhR0kG33DW8uRtSUi6qfpxMmk5rMgxYk64UUfk8 rQvqSdr0VYDbIkz5N0EW9T63u/COLTyjKr0mdKqE9ChtclmCca6bBQU/YatYWx7jFx7F ewoKSgQOnige89ukW51CLFtSx2QoXfj5KEcN2ZN0VsS/PwHxVJpOhPUy+6+feLJBUWtZ DAc8pFUTSisIcNLj2u94WfX6JO+5+XJz3u0Otq92frFnFO9DlOcinkVgP5yLyU6S87nY jllMK2lnWuUS9RyT9BGlV7+qVAVFb2YRD233oeyb6LBLexqWRV2llu36zgWQTtI4vwaS Kylg== X-Gm-Message-State: ACgBeo36pSUqi04kLu6Rs9wu3hi2GmLbeNUp0JfwRDBkS/bcvGKTc/Zk 64jeEmondcOR5ZuDlMNbeMeiQbHm36aOpA== X-Google-Smtp-Source: AA6agR4K3KgViuQEdBEKDcp8UNZHIRYV+UlcjeiyaOEZmCpAD0ZgA+zJccaASa5gP+yfz1mS91FyQg== X-Received: by 2002:a05:6830:3914:b0:638:f80c:e964 with SMTP id br20-20020a056830391400b00638f80ce964mr18348282otb.220.1662334504590; Sun, 04 Sep 2022 16:35:04 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , Peter Maydell , qemu-arm@nongnu.org Subject: [PATCH v6 01/14] hw/arm: do not free machine->fdt in arm_load_dtb() Date: Sun, 4 Sep 2022 20:34:43 -0300 Message-Id: <20220904233456.209027-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::32e; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x32e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662334663129100001 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.2 From nobody Tue May 21 13:25:43 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=1662334670; cv=none; d=zohomail.com; s=zohoarc; b=gqsXsFefO8um8hG4zzc9ZL/BwQFWenZvkKvvJGzdA4SgPWTZQfzPMWZsucw6QlEedkGAIEMdkKMLsRdebOGy8LH5Kkb/R5erFgM/W4TT3N7lJouhZhoUnDKGxm9ax9vXNT8dSpygpLyj3wzA7HbaJoJWAOhIvM9SKOKDXBCvAYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662334670; 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=cjAKqoCsh4ucsmwOdsaJfx2iBShktx1X0R5EseCjguM=; b=HcYGv75HRr0al7EQX6VwjIbKGGo+Ve7jeEr0BVPSHw0mP5w3d493K1QUMSTidOloTVRjszUDpGXNm/HmjH+7iQlGOdic+xMJA4XewcDgXvf0gv7j9MwRaXP2HvuMl45Jhir234iy1XN1+kD4k6GFY4IHXuhntcLkT/hQK4obkLg= 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 1662334670077742.2417964498817; Sun, 4 Sep 2022 16:37:50 -0700 (PDT) Received: from localhost ([::1]:54194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzBV-00029c-0f for importer@patchew.org; Sun, 04 Sep 2022 19:37:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz8w-0006k9-8P; Sun, 04 Sep 2022 19:35:11 -0400 Received: from mail-oa1-x31.google.com ([2001:4860:4864:20::31]:39685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz8u-0004ym-KJ; Sun, 04 Sep 2022 19:35:09 -0400 Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-11e9a7135easo18033797fac.6; Sun, 04 Sep 2022 16:35:07 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35: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=cjAKqoCsh4ucsmwOdsaJfx2iBShktx1X0R5EseCjguM=; b=ezDiH1ekEb4Ezv9oCmBJ046+XsPeXkBgQxnjLN8zOj+RCkgyhMZs9E1hJp6SNPcmoL vr9mBPaL9tbTPgNKDTG7ssipoYLOkzTNxsKdo+kdx0+xRKip+yVI4eXzNzHiW9+reTCp 27jVu7gRiQboZVODcFt9+fDurYtRHEGRLdFIslOr0LO2iRdXdoO36+yww25dn3PmOJbA VTLrb5g4MRlekO58717kJz0QCYVhJNx0uGcA0Z1qKmJmnWC1K3Ifm/hG/p418OoD8f7N vUxSQVs8v9vJNQnq5NuPNkSjSwuCH5S4OwpsYYGvHQfUvwQg5YKlXbgScs//LAKxlrcu 1naA== 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=cjAKqoCsh4ucsmwOdsaJfx2iBShktx1X0R5EseCjguM=; b=waMzy7bQxQ0rx7Y7Q40bRX8y/eLId5MxolU0dBhhD2QUcXiWDX1PrUc4OtoWKlsLuk zH4fTaslIe2nSPpdYvrCc1WtIw4mWbxBYn77YRCj7umarGkIIFt+VIdtdRDYT2eqHiyE zK9WKMP/eNCRb/y82Lp96UAvCeGM2hftcB0RE2m7HwYKDAwAuDvoHclHkOkHMRFwsxCG h4SiW0foTXCaDc246izHFpC0v1bWvEHIeYNvlC4a0cvk9Wq67UPyZ0smX24LhV6Iq0+H URAw/at8yfIe5KZEQFdEpPFh/6O8UDZVu5s6oBCebEsWwQGm7U6knTcKepr9ArALvkGC vS2A== X-Gm-Message-State: ACgBeo25XzZjQ0o9Shza7g9fL3GvgLDYhz9dV8Y2xDEP1HbExViOWV1E xZ6EkkMaWngMDGe7zIyEPc4YwUDVo9EQWg== X-Google-Smtp-Source: AA6agR7V7Uvo+UrzBd+2ZN0spGZkyi/AMiqqY0BWCU5h8ZrTO/N8ZmqsfgatrYFWsnwXtuvUt257zw== X-Received: by 2002:a05:6871:96:b0:11d:ca1b:db19 with SMTP id u22-20020a056871009600b0011dca1bdb19mr8076282oaa.74.1662334506968; Sun, 04 Sep 2022 16:35:06 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , "Edgar E . Iglesias" Subject: [PATCH v6 02/14] hw/microblaze: set machine->fdt in microblaze_load_dtb() Date: Sun, 4 Sep 2022 20:34:44 -0300 Message-Id: <20220904233456.209027-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::31; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x31.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662334671150100005 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 8b92a9801a..c8eff7b6fc 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -39,6 +39,8 @@ =20 #include "boot.h" =20 +#include + static struct { void (*machine_cpu_reset)(MicroBlazeCPU *); @@ -72,6 +74,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; @@ -100,7 +103,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.2 From nobody Tue May 21 13:25:43 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=1662334948; cv=none; d=zohomail.com; s=zohoarc; b=Qn/o0KsJ7MlXfoVRKwWy3jG+6J5chdugdZ8YXKAV4lv5Ea1G4rs3tB1CSjudfFj3EZa5y9wmY6RcMWPnAh45eFPt3IjEnVqXyva6w3ogCNjAgZfRZ/W/PtvRP3LXLggq5i/gdMJngWmMLC8UbxnkVxcn08aQLgVhgmuCNKBrZ7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662334948; 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=YOFZ9NdiFBAa9F2Aq+WCsRHWWt7d567/X2aplHJ6aKE=; b=lrftbP/2hoKFyjic4SlpuZfcmRlPbpTSClgwCvTnLReXH8k3WjoQXhSK8TagZxabz5K8NuR/sFJvb6S0mU6mnCx+5ufotJeRZZ2il/9wlEDB42QRX3iFnje6qQkINq1M+bxDWIW3OSiezbO8i0H+yS2SCWjYKWci662gjxfcHxI= 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 1662334948263452.52343658822144; Sun, 4 Sep 2022 16:42:28 -0700 (PDT) Received: from localhost ([::1]:51900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzFy-0007pF-P4 for importer@patchew.org; Sun, 04 Sep 2022 19:42:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz91-0006m3-1A; Sun, 04 Sep 2022 19:35:16 -0400 Received: from mail-oa1-x2a.google.com ([2001:4860:4864:20::2a]:35688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz8x-0004zP-F0; Sun, 04 Sep 2022 19:35:13 -0400 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-1225219ee46so18119857fac.2; Sun, 04 Sep 2022 16:35:10 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35: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=YOFZ9NdiFBAa9F2Aq+WCsRHWWt7d567/X2aplHJ6aKE=; b=ePp3QHGaMyOVmX7CNb68sPWM3hPrUL712DTQdBgSr1mKBxf4JsgXzB/7XW1TBqVVPl u4WPaINUVeaiRChIH4xYQ7nLgwg96Z3pmvKT1kmeCn+HOBHvSltET+2jNgXBba4OE/WU 94TSwJA9K3sCf8dFN+Fkg++8OqeUzrKKDR/eCsv1l1CSBeohg0hNWhsjHrtY/BH5Jmyd vSds43dQrxBfX+YqW1a0quw73v/ahof5QHffcHUHAej8yoanPnCkrX7Lp5pzXKrEkjBs SANhv34F7xfAKxlzpNgz+f9eWcf/3W2n35kRAxFoVp/lSltwndHgNdtgdXFTFvkp6fq/ iJYA== 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=YOFZ9NdiFBAa9F2Aq+WCsRHWWt7d567/X2aplHJ6aKE=; b=myioW/86fUF0dTHb6HHKzfVJ8vdXO7HwtlqF06wBJ+Gfu28F10JbLjKPbkolui+t0S OC4uEQjOncG5UfRmgkYGI8dzLW/xD94jd2dlDvu+tGTKoWWGhYJnCm5g1FPFN3veM5vb uAqltxvHcgCkHj2h3vLHAuWAHJnQ3ZeokP9HmIKOBXDhxJrx9dX0csqLzU+jOAmB+cLR cwaurrlaKt8Vc4e1dWOVEwn5DaTTVHJO9mlmk0fPeEhe71N4JGkU06MAj0Ysw+RExmFg Oj3piGKPeEEe6HJt+00VXx/0obrjrn2km9vVB8pDw+lf/nwLRz3VVe8ivWVuGWb6pFMx NopQ== X-Gm-Message-State: ACgBeo18LP4/PICUuQiGbxuAUhyFEAIPSHu90Jv+Yd3E4YvN6aR2DWKN I57GJcSgjqziANxLkZpiZqNKgp593dGKfA== X-Google-Smtp-Source: AA6agR6XVALs+N7zwpMQa+MHoDvRKp5aeWVgYEpwuaAjbX4wx227gxK7DKZvf0On15dtaGW5jaIW0Q== X-Received: by 2002:a05:6870:5b84:b0:10c:d1fa:2f52 with SMTP id em4-20020a0568705b8400b0010cd1fa2f52mr7615920oab.92.1662334509580; Sun, 04 Sep 2022 16:35:09 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , Chris Wulff , Marek Vasut Subject: [PATCH v6 03/14] hw/nios2: set machine->fdt in nios2_load_dtb() Date: Sun, 4 Sep 2022 20:34:45 -0300 Message-Id: <20220904233456.209027-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::2a; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x2a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662334950483100003 Content-Type: text/plain; charset="utf-8" This will enable support for 'dumpdtb' QMP/HMP command for all nios2 machines that uses nios2_load_dtb(). Cc: Chris Wulff Cc: Marek Vasut 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.2 From nobody Tue May 21 13:25:43 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=1662334920; cv=none; d=zohomail.com; s=zohoarc; b=iLipAsKaMO+VNbuvRZ/nay/NhPnCTeHSjgmU26TiR5JMkEYwqOh8RpgweV+MpJG65FPJxrAbbUDHlR2QJj5V9HIBQpjoLbuFcViVjT2Uvcuj0U+imxq6oA4lZrc0Rrcv20vJmWp0MmaizeOHMAst88TqHe8gV06GB4yIkTBktds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662334920; 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=mGG3U2Luf4I4urQShsm1RjBsPx5YCf60/nn93DboxwM=; b=VdxXyULCL3DtJAea7vjuI3P7C4b60w7Rq6U+tqIgMzCm3koFU+r2NysHrxDjZPOcfaqc2tapqdpAY02t1RS4oXm9v0dWpLRFQERfRB9gzZMynCUeXclDMIiO8k/9MjHzgFyPhC3ZRSDT2mJkoz3L3LYIb19JDnp2163h7ik3v00= 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 166233492049566.7900150337432; Sun, 4 Sep 2022 16:42:00 -0700 (PDT) Received: from localhost ([::1]:52292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzFV-00078f-33 for importer@patchew.org; Sun, 04 Sep 2022 19:41:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz93-0006mY-NB; Sun, 04 Sep 2022 19:35:19 -0400 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]:33473) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz90-0004ze-1O; Sun, 04 Sep 2022 19:35:15 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-1274ec87ad5so3150477fac.0; Sun, 04 Sep 2022 16:35:12 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35: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=mGG3U2Luf4I4urQShsm1RjBsPx5YCf60/nn93DboxwM=; b=aeXSB98oZcnCCIUZ9q/2+OlkGqeikR5EeaJIb7U5BnTwlqfbmKiLf0a/JBSkAnY1IG wn9vb13M8ij5JMo86GoPicP51oCLO2rk0utX+hgm0vPgOVFeiyyfo1qeEQeZ7TiW57nS BKFue6FYg8LqtaM1PJqaDYDpZFEEVt84z3XKHH/hSynJ0HUbBkxwJWJsiYmXfx4U/U31 U9FteFwCEifrG5qzO/B6n3Cb7nxRM8OM2zI7ixvpBfivvm64AwYwHFuhKh47EXfiMVeU nAGVY3pSNW85xTRT/QmIvjWVfnqSSfIjSIScfXe5LF3bVtndf2Z185AvMB39HtQBq28a Z7qw== 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=mGG3U2Luf4I4urQShsm1RjBsPx5YCf60/nn93DboxwM=; b=2qa9eM09Kyj3O9q5FP0GwXAy42iqHsIIItM6b/bch3uk2//Jj+kkhjezNf0B89rT8U SfHQ4h1ooi1VcJDU8k2zAcDr34AEfKzpzv8TEBYGZcVgrZW1aK36MsKYw37bJmT/EJ1C 5ObeZGoYvyvp/6r6F39jEc8u8UpVQPirY3YMfD0a2g9yIi4irkThijftUi76QIXtzH85 LdrGq5uKHDtEJLl1uSpERO8algIyOwdbS+6r6c7DYaphCIfET2sNOzMorbNtYInYKziK QnHuuY+STZMQFFrohrTQaIxnTx1r+sxd933t1Q6KygUSYB3x5kCfE2dLfMlYBm48qDcG d4xQ== X-Gm-Message-State: ACgBeo1TxdVl7nrTuigXAJKbUInNqBqLJhOpnNwC5UeE9IiJKPvUuHK/ eWRXFAY9mUePceC1Q/NAOxDTQqPN4xzpzA== X-Google-Smtp-Source: AA6agR7ibbXBUUpvop56BsxwRpYqXJTsOAWOpBtRduXZh35PFWYAQU2mpJX3lAOx2pA3eKcaLXv5Hg== X-Received: by 2002:a05:6870:e416:b0:122:5d6c:f32d with SMTP id n22-20020a056870e41600b001225d6cf32dmr7844808oag.239.1662334511721; Sun, 04 Sep 2022 16:35:11 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza Subject: [PATCH v6 04/14] hw/ppc: set machine->fdt in ppce500_load_device_tree() Date: Sun, 4 Sep 2022 20:34:46 -0300 Message-Id: <20220904233456.209027-5-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662334922385100001 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.2 From nobody Tue May 21 13:25:43 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=1662335181; cv=none; d=zohomail.com; s=zohoarc; b=nUN+10xmlU/F66RdW+2UN81YBsgmKRwqv3lH34x0C72dkaplHgvGvOM2fr6Acvn11gJQBiz3eO3GDWZmzEioWOBMGpgz7dhqBqK5J/s1W2G5j4k431oJJiNrAlZcXfEIEWeIQBry3TICgBcAAI/xmahS1+6kMmBBBA2bj50OX0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335181; 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=jd3wQPysMcgs0ZoMNBn7tHzgPrtVMg9YzAzU5clTyec=; b=CaBBYbFDXvQ4PV+3+gJZxz9FGwXkGCqUtJyHhLnq7c3ypqX302I+YcYGd87PZeBIfD2+Oo/C95rvdDr1ytGihW59NRXgOZsqEUzQOM0WdCMzzdTU8CwVI6ncRZQIkQVPFyy/XyL+JTIlOtIUIM+/ylg3iWTCXDLh7b/lnbuR484= 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 1662335181049130.96017283883384; Sun, 4 Sep 2022 16:46:21 -0700 (PDT) Received: from localhost ([::1]:54070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzJj-0004Zo-Ps for importer@patchew.org; Sun, 04 Sep 2022 19:46:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz93-0006nC-VY; Sun, 04 Sep 2022 19:35:19 -0400 Received: from mail-oa1-x30.google.com ([2001:4860:4864:20::30]:34693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz91-0004zq-UX; Sun, 04 Sep 2022 19:35:17 -0400 Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-11ee4649dfcso18115326fac.1; Sun, 04 Sep 2022 16:35:14 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35:13 -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=jd3wQPysMcgs0ZoMNBn7tHzgPrtVMg9YzAzU5clTyec=; b=WX94BPoJm4suje18bXoBVnVCW7ziPu/DMm8XRVFjIhmCn9xbLfyyIdlULOFxZtVmE5 KwVSfWOX6nxPXBdD/1msWH7GrbTTJCISsz22h/+dy39FuKX9iHgDg458g3T6BLNHi2yA ErozQT3SIi+wMyKdJo++iyLySV8aexQeSF/d34hV/eF4GA3nwFkk72DfaNOGdIrX8+gK a6EE4BWtkKEZ3XlqKeIXfDlYHFBFZVo2I+lZ4i4MbIngS6AnV994tRENQmMaSonZW+cf dgDY2HpPqPKdCqx2rAPHd7b1PacSOTqBQkDJNT0EbQdr6SQvlfLiVge0bHJr+QJ3BVCi wwlg== 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=jd3wQPysMcgs0ZoMNBn7tHzgPrtVMg9YzAzU5clTyec=; b=YLlDDiuATQh72epo3alGvtRXXaIetbUIEuC9r6Y5tZyaUdKZRpqsgR+ikCh9u+M+wO 9Yt9xNpR/tP4EsI07qXe5DeFJP4TWhf4oWcuWHtulhF0LsTx/KVvyuJ9QLCbrr2e7LgX JdkHKQzB8S2LxTvtNVSHM75P1hI4ufmmiaj7OBuiZifj+T//4T3A8JFcxbBBjlERJw5N XRkWM0dR13vf6/eutEJHkSMkkIf9lP9z4TNb0zRiv5min6v7y2lIaZYQiHGKLo74NYKf 3Y+Y501Ua1PJ9Dzlo6c+piCbIWLdeq+DNUJJtNEsFM13pe3Vo7+23C7MIdsg/d5wsxB3 +xXw== X-Gm-Message-State: ACgBeo0yhy0JM7T89x5U27ZLXg9fDgZ/lN4pTIiwgYda04kgTRFxYQ/T D2jeNkJoKRtevPKxD1kSSbQKh6SnbZSupA== X-Google-Smtp-Source: AA6agR7CmAxnD7/BkZ2sS+owkYujR6GPXnZd24CHsri7ScXmff+eOXibyxKv1bJxZq/rWS7U4mi3+A== X-Received: by 2002:aca:f16:0:b0:344:9d67:f3ce with SMTP id 22-20020aca0f16000000b003449d67f3cemr6435556oip.110.1662334513852; Sun, 04 Sep 2022 16:35:13 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza Subject: [PATCH v6 05/14] hw/ppc: set machine->fdt in bamboo_load_device_tree() Date: Sun, 4 Sep 2022 20:34:47 -0300 Message-Id: <20220904233456.209027-6-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::30; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x30.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335183113100001 This will enable support for 'dumpdtb' QMP/HMP command for the bamboo machine. Cc: C=C3=A9dric Le Goater Signed-off-by: Daniel Henrique Barboza --- hw/ppc/ppc440_bamboo.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index ea945a1c99..aa5c901b09 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 */ @@ -62,6 +64,7 @@ static int bamboo_load_device_tree(hwaddr addr, hwaddr initrd_size, const char *kernel_cmdline) { + MachineState *machine =3D MACHINE(qdev_get_machine()); int ret =3D -1; uint32_t mem_reg_property[] =3D { 0, 0, cpu_to_be32(ramsize) }; char *filename; @@ -119,7 +122,13 @@ 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); + + /* + * Update the machine->fdt pointer to enable support for + * 'dumpdtb' QMP/HMP command. + */ + machine->fdt =3D fdt; + return 0; } =20 --=20 2.37.2 From nobody Tue May 21 13:25:43 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=1662335456; cv=none; d=zohomail.com; s=zohoarc; b=BsKRl5eli5ByDDDIPkJRc3Yw03/+UzKUzP/rEFGsnm9CgBPHL7sF6Ee2E84rsPeCQgiqU8A9nSwBRPXgi1bxQAxLph6Jp9E8LODntw4Vu2uiX/wToV+6YMC8pbHArlf193dnxdtb6A4FRIfbVjkWQGFZJIbg6F/D8aaz7nn99HU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335456; 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=DBvC6gMlxv38oDowLsx39beO0QHSfCd560SFv+bV5CA=; b=iPGBDG82R5a5AHLtS7mDFRBgAxXeAuanqfimLNMWb+Z8XfTzNBaH/zTtPpgvvc6hy29/v5zmi9Cg0vcojIDYoQzzRGCa1+9t7GOLSLehboRZqGmWqime9DFnpdD5wWHVcS1RsrJhurbyVUDj0jI5zp1XxIo1keFF2ZoVGMRcdPs= 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 1662335456827903.5383520596887; Sun, 4 Sep 2022 16:50:56 -0700 (PDT) Received: from localhost ([::1]:37366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzOB-00022b-Mr for importer@patchew.org; Sun, 04 Sep 2022 19:50:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz96-0006nW-Ki; Sun, 04 Sep 2022 19:35:20 -0400 Received: from mail-oa1-x29.google.com ([2001:4860:4864:20::29]:34687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz94-00050N-TK; Sun, 04 Sep 2022 19:35:20 -0400 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-11ee4649dfcso18115458fac.1; Sun, 04 Sep 2022 16:35:18 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35: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=DBvC6gMlxv38oDowLsx39beO0QHSfCd560SFv+bV5CA=; b=YwnZZXlfKed31oKHY2dYS4jSecE/S74gS7LhLU5p1vTWdMHx+QxLyMco15pXLuoECv vWt/khhl09zuUJCUbQX90bTCJ9Z8yXk2Y9dPYiQY7hgDl3fSXCkjBSXuSplCZhQ/BiKg GyGIfae+Nb+k3ZjE5HR+x05NgxG75K1t0woNbVZjwqgeQ55FKuxy31PQanBItF5H8cLg ui+EXW2eyZ2peSnrGThYSjIg7Rp/G1tt50kn2HHY5vxhlioOt/JsuwanErJ7FyDeu0ki wxIC16Qv/Ftp9Rtg6bKWXw3n9pUZr/zFKwqTw9dISjwdaCD1VcaovZzoA5ButwwiJ9wN 8kFQ== 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=DBvC6gMlxv38oDowLsx39beO0QHSfCd560SFv+bV5CA=; b=azj4dBSIn4PpvLswGX2lKVq3B/dClpgFldTfrsRx+9qN2nOdJ663QG4+9yZJfDpsI2 pOFzypw0mga2ialG/IQ+SDOvwJY0nDfT9+fHk14lK+64ChyiEjnPkIxbysTnYvtGxXKl RI50bBx5O43U4RMbZzN8eIbEQOyNuVtPBmBIwQRHVXMqHH73XE+FrMiy+vWIVOM+mL8y o0zVxZRAKDpmr2qXn4Rj3FU1o0lf81l9P/sNmL8Mgl19Ml/9wW2h7Uz/F+VsxzuU5rgr X4+5qzL/Bo6rdOJ2iEFfqFNe6VOBnQGRIW42GkWxP4Qf22JjR50dfEDmkDZqdz8N7QkF xZSA== X-Gm-Message-State: ACgBeo0CF8nUgEuN6+LTu09XuUescow45s+uc1ReAD8o2kSf+DEEQsB+ masK5jpE15oJVKxKmkPKennzIsQtexOT9Q== X-Google-Smtp-Source: AA6agR4oY5ZcXxLMot0/ya7g/ipZINsEbM2orPmbq2R/EJjoHoNIgs1z8tVXm6k58kyJLxrUf+AAwQ== X-Received: by 2002:a05:6808:18a6:b0:345:557b:aa7c with SMTP id bi38-20020a05680818a600b00345557baa7cmr6678150oib.274.1662334516246; Sun, 04 Sep 2022 16:35:16 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , BALATON Zoltan Subject: [PATCH v6 06/14] hw/ppc: set machine->fdt in sam460ex_load_device_tree() Date: Sun, 4 Sep 2022 20:34:48 -0300 Message-Id: <20220904233456.209027-7-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::29; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x29.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335458501100003 Content-Type: text/plain; charset="utf-8" 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. Cc: BALATON Zoltan Signed-off-by: Daniel Henrique Barboza Reviewed-by: BALATON Zoltan --- 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.2 From nobody Tue May 21 13:25:43 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=1662335573; cv=none; d=zohomail.com; s=zohoarc; b=l2e6kBlnHARXncx7Cp8SgCDpGmAm9fhxAjqIvBE5HZB5ulSwtTvD1+WZNq9ZHRP6QnEuzFhYTr+KJvg4t3l5b+6/rRSdRIWX+XgmzEIA2ZcBoG7DSlyAzt0600p4d/QKWgJM4uWNGUL5IQaL7SYF4hAsmybZPbnTDIPewPNelsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335573; 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=ZnjR+HSANRXzGpPVU79J/JVQUyEsaYRiAdtq9yVQORw=; b=EJdIEGIWbm2bKxG2FCy9Q/qIEsFf5HzI0IhXe0T1vMwojXHuFVKfeUpyqXTDrns3H7zy7ZjlRRqnqIzrU7SITfNnHCZ+zZ3jB/4XD4CF3yG7f0oG52RWr8jBJjZI085KMTt3OPwkB1SWeRf/odWf93ppNFuhP+vVYHi2FGn7N+I= 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 1662335573937864.7430102636573; Sun, 4 Sep 2022 16:52:53 -0700 (PDT) Received: from localhost ([::1]:60336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzQ4-0005p6-Nt for importer@patchew.org; Sun, 04 Sep 2022 19:52:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz97-0006pV-T9; Sun, 04 Sep 2022 19:35:26 -0400 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]:34691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz96-000540-3O; Sun, 04 Sep 2022 19:35:21 -0400 Received: by mail-ot1-x334.google.com with SMTP id q39-20020a056830442700b0063889adc0ddso5215254otv.1; Sun, 04 Sep 2022 16:35:19 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35:18 -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=ZnjR+HSANRXzGpPVU79J/JVQUyEsaYRiAdtq9yVQORw=; b=V0GxQITWYAAN9iB4yqwXYAkAJPHixaFli3Qj6xuYV/nAbzvoNNrkxHzE8MKNF0laXL dYxusUodsYh4x+ufExLIoXBj75/6L/VquOUqM4vFowWJgDDM+2NG76LXbcKXaB0cSTVg /McEBU75UYPGkOCf1XN+6bfzqAa2zI4sy2DZFLPXiS2jYPHqG6263vKUZm5PbqRTH4pH zXEakJZ0ESV+PNogxHJxi3dFxs719k6UM8DRfio/lo22Wfgsaa0ptd5Jhn6DF+ZuqoC1 O9mRrHrZklDWakWUHz//NKxihr80UlUR0zvGYTJGr/NpOGm67znhDG6qJBzHwpf2EOms Lxfw== 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=ZnjR+HSANRXzGpPVU79J/JVQUyEsaYRiAdtq9yVQORw=; b=uAn1QF6miqj8ZCxASu7yfKwb0PhCE0wGhce4ySnRFEdXyoiVXqUvbADogVMau6rjxF qZVa9VjqMUPt5Bp374Kb9L9YLf4XotWY81DyAv7HSk0Lzv174zQksgBga4RCAe9V+8SN bL8QkpQDMoc5XyBCBk5oFpJmU4c2F3oKmLHuUHKztX9ccA3X+BpN/WQeOEEqlL78SibH aBUdsJ7aASdcRLKmOZvA8nfDzsq76zN3/ceNXavHQnA3pzxdjuFQcRsPoM5sk6QZQJJd ihTWdIYOuGDF3cl5CSB83r2HEIgfi7kCZFwqygNLHS/6PWpeARB/hGm1JAj8YuaUkeX7 omig== X-Gm-Message-State: ACgBeo2VZE59Py3+IAC9b/UfdwqXscqzYZ9vCSum/aWW6dEGke+L7VWn zbiWYcPKBkXBjJloeu9EXmkZFFwIhdZjGg== X-Google-Smtp-Source: AA6agR5IhvgRHJzv+WTegA6adR2VI+wCWpM49pmUZW5Kenn0Xf4cZ6Yq+O0fLkYetMBpr5AJZ4Y4pQ== X-Received: by 2002:a05:6830:3150:b0:637:1a0f:f344 with SMTP id c16-20020a056830315000b006371a0ff344mr18270378ots.149.1662334518517; Sun, 04 Sep 2022 16:35:18 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , "Edgar E . Iglesias" Subject: [PATCH v6 07/14] hw/ppc: set machine->fdt in xilinx_load_device_tree() Date: Sun, 4 Sep 2022 20:34:49 -0300 Message-Id: <20220904233456.209027-8-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::334; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x334.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335574645100001 Content-Type: text/plain; charset="utf-8" This will enable support for 'dumpdtb' QMP/HMP command for the virtex_ml507 machine. Cc: Edgar E. Iglesias Signed-off-by: Daniel Henrique Barboza --- hw/ppc/virtex_ml507.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 493ea0c19f..d30f186979 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 @@ -150,6 +152,7 @@ static int xilinx_load_device_tree(hwaddr addr, hwaddr initrd_size, const char *kernel_cmdline) { + MachineState *machine =3D MACHINE(qdev_get_machine()); char *path; int fdt_size; void *fdt =3D NULL; @@ -194,7 +197,10 @@ static int xilinx_load_device_tree(hwaddr addr, 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 --=20 2.37.2 From nobody Tue May 21 13:25:43 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=1662335327; cv=none; d=zohomail.com; s=zohoarc; b=nFMBjrj1STh6jtmqcCIpfz/i8ixO3we9REww9o+JdS65o6w/MhWrvLA99dX59A049ERsJmFWdtHZy64rL9NrGMi3OqvU3SFOlOnGSkj1+p6B49ShzU5HRf0rLMt56c0uSRMfGRsBQLUvSBbXBjJPh29AzCi1/IU1zrywERKUIKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335327; 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=hBI/7RO7Fr1a9pi8i5aU6Jr0VxpF0f01rU6VBZnellI=; b=JJvp1SbmLxjbE4QGEUCuUkUsiGn7a1PqgcumexmqJFr06mvwmOK/zxS2rIrMB+SbokoCKDyd6YUN2+ryn6PJec/XlWkmbJlnXobZOmz8qeYe8YeUatnfKdZpvhoQgNU0eKAN0U0k01h5c6EzMh0QXG8D/VQDlQubYR4hyR8UcKg= 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 1662335327787616.3994083517456; Sun, 4 Sep 2022 16:48:47 -0700 (PDT) Received: from localhost ([::1]:33764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzM6-0007Ht-Ek for importer@patchew.org; Sun, 04 Sep 2022 19:48:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz9E-0006uq-E3; Sun, 04 Sep 2022 19:35:28 -0400 Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]:46711) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz9B-00055D-Jv; Sun, 04 Sep 2022 19:35:28 -0400 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-1273a47cdb6so4100063fac.13; Sun, 04 Sep 2022 16:35:21 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35: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=hBI/7RO7Fr1a9pi8i5aU6Jr0VxpF0f01rU6VBZnellI=; b=CEu0xFxc8fOqebSA1zvlCwGlhAykRCyOfwJaWOiQebIB6y6dqcKL0WzA/SMPR28Dm6 v6ZEsH101nEVZsnZblgTF61vIMK8DwmQuv4gMFOI63IN2WpVtWzdNmFlR327Q7qCTmzI CNJxAQu7ErIYVHRkap9yY0i0rBEhGcTTMxVAmn28hmHkz8l9G+BvtvbyUQw9DwTTe7mU IyzFyq5QKQQxCIZ6gBGyFdp/UQGmyE7IIqSCFpCUwwVPNYdMZl73g3R0q5spJoKic37g xzFvgOf5BZBt58iotV4qEgKoebgrnQB3cnK+dSAMoRSb/K5BPoq4kFfJYgTjI0+jfseH HGqQ== 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=hBI/7RO7Fr1a9pi8i5aU6Jr0VxpF0f01rU6VBZnellI=; b=cCQbUrjrDfiPAiKcjvymV1Hp+RBAr5kngjY09RtZ97kf7fvsGVuWd4XaV1lMTTlSaH ysJOraB1GC1z6cs2tIcbNh+KnDV297BZlahp0QOHOXSlr79LuXUwI8+ittwuzskt2AII 047MkKOZDNKe+E8BeV48BeVAP2SIgYOjJ2nS8UCaPKwzK6xDi5K/eXTvuUhVd2bWwmBn nrOv6vju2q47f0nYyY8DzzAAQLOYwWzh1bfeR+IKtghf0SD6ugAWD52mnMucJ26akisL ODa+BL23GUUWYem820Xslef2uiUW7DkmitBL7wNHUJ2CYfO6eGi8fCLebGMjTVh1Tj3e aN4g== X-Gm-Message-State: ACgBeo2bE4R5ZC1cTBfTz36k2O6WDNayBSuy+e/lIESJ/BoGJi6oFl1S 4W77wqGciF9gKJEoYYbLNqnUQhFJft+hzA== X-Google-Smtp-Source: AA6agR7QW4Iz40Mdl7AMZhuwHHY6rDjSGdXENOFY4c9bKr/umfR3wrrefqzkOPGVASbt631bpee9Iw== X-Received: by 2002:a05:6870:630e:b0:10d:ac9c:362b with SMTP id s14-20020a056870630e00b0010dac9c362bmr7795219oao.157.1662334520928; Sun, 04 Sep 2022 16:35:20 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , BALATON Zoltan Subject: [PATCH v6 08/14] hw/ppc: set machine->fdt in pegasos2_machine_reset() Date: Sun, 4 Sep 2022 20:34:50 -0300 Message-Id: <20220904233456.209027-9-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::2c; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x2c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335330037100001 Content-Type: text/plain; charset="utf-8" We'll introduce a QMP/HMP command that requires machine->fdt to be set properly. Cc: BALATON Zoltan Cc: qemu-ppc@nongnu.org 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.2 From nobody Tue May 21 13:25:43 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=1662334668; cv=none; d=zohomail.com; s=zohoarc; b=mLr3SqyOdPfDBk4/MvX0+6zIsrZcQOh+O5oE8x1YJ6IeS1MKZgHAAliNiIZmcCzvFWCHlXhgGzMrCIUPWW+txSuUsPCilide8Q4hjxmlSC4ATopGS8MEDPXD/VDgPp3fjqGbwCNt/lLwQlK6ojbowpdCmYys6gSsfiSRjHF8kEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662334668; 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=VqXniqw9Zh63qugXsqiyJS4wC4jwjztfl5QCDy2Nztk=; b=EJrqpwkA5jIkyU508Ly3xUY5mgCIwAIOuz4nmP8x+UUSYhlm9AK9KmMhaw9DGBR5PDgwUrMDSLbzcf1GsT3ZijPQFSgZHkgBTkhHneCRb0XSVCDXfjCi2OX8gGC+R/ZIxoRd0zwMYNkf3LdY9B/gkGWE0z/qryjEhipQFqtVyGI= 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 1662334668878236.1135485850275; Sun, 4 Sep 2022 16:37:48 -0700 (PDT) Received: from localhost ([::1]:54192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzBT-00025p-Pf for importer@patchew.org; Sun, 04 Sep 2022 19:37:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz9E-0006ut-Fd; Sun, 04 Sep 2022 19:35:28 -0400 Received: from mail-oa1-x2a.google.com ([2001:4860:4864:20::2a]:35688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz9B-0004zP-KN; Sun, 04 Sep 2022 19:35:28 -0400 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-1225219ee46so18120541fac.2; Sun, 04 Sep 2022 16:35:23 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35:22 -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=VqXniqw9Zh63qugXsqiyJS4wC4jwjztfl5QCDy2Nztk=; b=NCpxpFpxdW60SEOoPAb5JjjZndauWBVQUEzI7O/+BjkEXSdgYM3vfSbPOtjPdYaBqC 7MNnPBdshIXpFBATOFsr1eTYxI6Lb1c2RQJZqDgHogVZx5tdLbrOop81d4jAOHoR1J/D g1Ez35O0PcwPrLjWQomMYyjLMD5gTFqU4lRfxInE4BxDf2ZBS1/JePEITaWVfaXO9Ebb sVQafZ0c/rGzUoLTJ+uRHKRVSygPJsKJk2gr5gY3hkqm8lFNgX1d8ePA3qFoTD1Gc8IY x4iU4AZhowg+6V2PlCg/sEdCeh/N96Eqo9sgUoP9iB9MMdaAtOTWDCfPb44wsyDDm3m8 2vxA== 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=VqXniqw9Zh63qugXsqiyJS4wC4jwjztfl5QCDy2Nztk=; b=E0U25dgximwVyYxTy/EYG1Id6GYs0f5fcP8Wt76ByH2xKGzjMNVK+bth59mlqFly1o G2hXxlfdVxpDfVthMjJF1KI8FRrS2bJPSqLtFC995rDOhq0nYL9tHd+7whO2mkHe0EX1 KGZ1wOCOWojD1NZm85Pnx/udfurXOWJ/EBJTBmRgVpdEC+T1JFR9mTFNokyOcPBFsCQn umbbUHSaMcTpzHliS/ewFdmpD1IgM/TK/zVdXTM/biVeVSpty3IMiPWoBuzFLqCUNvMs wUBli1cBumlKHxAVtZPuRVSMK6arLZBF4Bl+/sc/nDU7eLtANOc+p5Jg1ZfObvIHHs6t RbTA== X-Gm-Message-State: ACgBeo32KVS5KN52ka1X8ReMkkNFTH8/aK3uSvgU2vTcQIBuqTG2C2FK pmnf88G6qkpQq0Oku8puUVUY5El9GaogjA== X-Google-Smtp-Source: AA6agR7AwhjYbOmjxpQMGGbl/FyiNrH8UZzMRyxfifnwTufdvNrlm+88onohu3uxBXIy7hvplNfXBA== X-Received: by 2002:a05:6808:1b2b:b0:343:f1e:1df9 with SMTP id bx43-20020a0568081b2b00b003430f1e1df9mr6885167oib.74.1662334523191; Sun, 04 Sep 2022 16:35:23 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , Frederic Barrat Subject: [PATCH v6 09/14] hw/ppc: set machine->fdt in pnv_reset() Date: Sun, 4 Sep 2022 20:34:51 -0300 Message-Id: <20220904233456.209027-10-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::2a; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x2a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662334669182100003 This will enable support for the 'dumpdtb' QMP/HMP command for all powernv machines. Cc: C=C3=A9dric Le Goater Cc: Frederic Barrat Signed-off-by: Daniel Henrique Barboza Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Frederic Barrat --- 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.2 From nobody Tue May 21 13:25:43 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=1662335042; cv=none; d=zohomail.com; s=zohoarc; b=WxqINRj7+sbqRh9SpQAAa3Nlod2krX4JS71wOLfLeENX+6wQDOghapoahSBlL3JUQKW9In/H5YVO5vsen8wcV3WsqNRPHkHXcHvZob/kgIc4cfDjGlN+gT2T9Kao/bqdI/e8zGBnU5G65MIjiLmRhbvi4gbEqL4wv1zzBassiK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335042; 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=IYuBpuhPoSwO0ADjmCL0+2qArTL7nXF9G6v9/opgL0c=; b=YtRM75tdnqSB+l9CogEMLbbIi6JimnsL449AbvwGUmHrrrHVr5E5v18uIMm4AjWluvGrrGc+/Z1ubVJJNFR9T6JVdLSxl4MiNJ4ofnnVWib7Gw+MIabhfYuvc9Gn9Gt2ieM347LJWRas/mrPXWbfd8qKOqDb6MM1r5IWT+tXBLc= 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 1662335042673658.1590801141684; Sun, 4 Sep 2022 16:44:02 -0700 (PDT) Received: from localhost ([::1]:42152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzHV-00011w-DR for importer@patchew.org; Sun, 04 Sep 2022 19:44:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz9G-0006xD-Dn; Sun, 04 Sep 2022 19:35:30 -0400 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]:44679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz9D-0004wz-CX; Sun, 04 Sep 2022 19:35:29 -0400 Received: by mail-ot1-x32e.google.com with SMTP id t11-20020a05683014cb00b0063734a2a786so5187554otq.11; Sun, 04 Sep 2022 16:35:25 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35:25 -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=IYuBpuhPoSwO0ADjmCL0+2qArTL7nXF9G6v9/opgL0c=; b=TFNnyilwKHl8whE5el2ZHAK1Fs6b1AF4zqBRfhHPe7IaQvoLlpfoOOybNC6pL6OPYJ wlitcMkNcpC0dA4V1jTiBBKoXG1Sroq7m/R+RlPHcTSAP+Cm/tqkK70Fle2qOMohXy+R 0z3H3LwCyDd2ekQjKaGPvDVY8gtsGLnl9gewGQu70kQHI+wKRHmNCxPuWOJDvt7jG3an 5PVyuUCIJuYoRL4sdxjTHMoK3fvyOZ12C5ZSXX8WFU71PXvbZHvb1oB0h+qGdfZ5YGzz a5S+btAVAfKRnz5C+iO6oD5XPYyZM9OUp0lcNR867zWnHLZMK6f/PdQPTmWJ1odtT0qw lZXw== 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=IYuBpuhPoSwO0ADjmCL0+2qArTL7nXF9G6v9/opgL0c=; b=7G5+ClYAJJ0LI1mesItKLgfVRGhSRKks8ozkfSDT1tS7h5Xyn4scr3DEw22ceU8wax JlyEc5GNWEoSmlYBlWT7Wg25oUOz0xUZuru6aAqp0NKDVIkp2jNm0CYrX8QpwJGargRP JS9KIvvlfsaLEdTaykUKrmsrZ/UMksX0U39rhL4xadO/fIC3cx+JiT35fwtdbonvaG73 Hl3gHsWsZ7RHcvZtt1GYOkUbDu+mCVe6sFzq+bMnLIitwzYGMW7Mi24AYqsJ3D85w0Eu HXWNgDNjMeNgdT0LbHijf7xGxcNBmcj5C0DpEx+pwnglOsxuFFWrnm7pwthuWe2O0BqS IZ7w== X-Gm-Message-State: ACgBeo2DeZUaIS/+KhRyGpEYafMGSJJHlQv3U4GGGxYbV6vtiYIZkNte g+D2TKNb/FXy+HdUzHSwCxERDvpnGrTQOA== X-Google-Smtp-Source: AA6agR5HS/Ze0l3RBplZc77918XTpBcwRLwE77lM11ZXaRqY+dcIcwTjyAuS1NuLQ2ey7JpFW7bRLw== X-Received: by 2002:a9d:740a:0:b0:63b:25dd:ed01 with SMTP id n10-20020a9d740a000000b0063b25dded01mr15481834otk.14.1662334525539; Sun, 04 Sep 2022 16:35:25 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , David Gibson Subject: [PATCH v6 10/14] hw/ppc: set machine->fdt in spapr machine Date: Sun, 4 Sep 2022 20:34:52 -0300 Message-Id: <20220904233456.209027-11-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::32e; envelope-from=danielhb413@gmail.com; helo=mail-ot1-x32e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335044744100001 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. Cc: C=C3=A9dric Le Goater Cc: qemu-ppc@nongnu.org Reviewed-by: David Gibson 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 fb790b61e4..170bbfd199 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.2 From nobody Tue May 21 13:25:43 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=1662335001; cv=none; d=zohomail.com; s=zohoarc; b=KWfUenRGyyLhdR5ilJ5HdjNLvangfxSI+rNkEXvGeAXuwXpyIGY1/K9Sd752DRhMFhT9ayeQPuPrDyYJCdJekuQGCKxk6FVjPLPAVGfWZiUkZtRx3Nlc4cSJLo0xWlSzzM85V69DTb8QsMvBd5NjOz82tdt4BbnPxbpCLJoEB30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335001; 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=knGOKFS2756lg9un0i8XENNl/xbiU4W5WHHiAwpLrxk=; b=F9l0Cn/BLsIpDGMD4ZTh3O5covNguULVnkZsN6gh3S78Pi/bGXyLJb8ajvvBUXLwLwOBwz6yfWLChUieLL1bd9OCWeRWlV4sxnzfJYaofBZpGyfgC5X3i74nf71FTNB1XzKccrsEwH8qa0KpuariTUks6H2RVhwL9RWIA/mV7Hw= 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 1662335001456627.1986419990538; Sun, 4 Sep 2022 16:43:21 -0700 (PDT) Received: from localhost ([::1]:45536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzGn-0008UU-TL for importer@patchew.org; Sun, 04 Sep 2022 19:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz9I-00072t-L7; Sun, 04 Sep 2022 19:35:32 -0400 Received: from mail-oa1-x2a.google.com ([2001:4860:4864:20::2a]:42943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz9H-00057L-5Y; Sun, 04 Sep 2022 19:35:32 -0400 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-11f34610d4aso17994330fac.9; Sun, 04 Sep 2022 16:35:30 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35: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=knGOKFS2756lg9un0i8XENNl/xbiU4W5WHHiAwpLrxk=; b=Yz3/XZKLUcWKh1DQHNk6pW+kt/790wvHxytTy2EFmHymDZ4eeCOiwn385M9Q/bA6hh PfNPyenLIbGduexYBOpmRPL71u6p0O/HsBngzzxF+apoInNi/7vpXO2xGseJiKns/wlj lwtaGMXxa8z/mtal+ntq16K+ulgwZT26OZwLPJupWzKsd0z2FFKuLZDhBmBZ626Sof8K Xu0ycw4VMT7U7kUBgNfkpKBIWFlD4bmv1fk2gCU5LwP+ztRIKgQ27yCCLGtR1ysMDJZQ FBtKkMJ00Z6xoavZmcVJLR0x316aYpZAd3TRxWpYB1dgqpDxo0gRJjJ4ECDosIBhYZtV Z+Qg== 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=knGOKFS2756lg9un0i8XENNl/xbiU4W5WHHiAwpLrxk=; b=Ktix3XOcafBs2BUjrKG5Okod+KbLv0zluzYV8VqE+4PRJxxtCAbfNWPd6bszpQvLs8 Z9Yyq3mEr5ivWvK3kx1AmlEUUCW280ZWffJKiuuZS5rIRTlEyWlJf+4TKiWEKHiEwrDL ulcSMl5nUEWUiVrvuUbTO6cf7arBi41C1vjhGIEK1xRgMQeVqhUvJFs8nMGygKqYGHVH 4XEpzMqv4OtYJAP3j4kNRfzS+BNSiDcNGWKaSgQBas5QrPbSzqc3AwbOdTKZeCW88aXI 6exGqwMj0hwpcOFC4jHwOnCpvusDwT8NZ32TOs4g+pJVPUOU0hjull6WyS1QTPPjNnFu keoA== X-Gm-Message-State: ACgBeo1WAWm/It2XZz7/LtTxYwgF70L/i+3fVUD185BF2GkljZsTsOVp /jV12UQ71sR2bJA+gTmWWllsYY6RVI6UtA== X-Google-Smtp-Source: AA6agR7duh7ztBkn0VxgQd6pZKwKsKmDY3fBNekO1B56eaKBrf8gM3LnZU9TkOvDFXT0hKCM0SmPBQ== X-Received: by 2002:a05:6870:349:b0:f1:928d:c803 with SMTP id n9-20020a056870034900b000f1928dc803mr7496754oaf.19.1662334528405; Sun, 04 Sep 2022 16:35:28 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , Alistair Francis , Bin Meng , Palmer Dabbelt , Alistair Francis Subject: [PATCH v6 11/14] hw/riscv: set machine->fdt in sifive_u_machine_init() Date: Sun, 4 Sep 2022 20:34:53 -0300 Message-Id: <20220904233456.209027-12-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::2a; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x2a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335003343100003 Content-Type: text/plain; charset="utf-8" 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 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.2 From nobody Tue May 21 13:25:43 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=1662335349; cv=none; d=zohomail.com; s=zohoarc; b=MCnGhz8nNKaX5gQ0ZvRO36nmWAVeeXcNNf5nljSflSk8gO7jMRP7gO6C4Ay//Yffj0vtHrnrxjYEILwaKiS6EqdIN7n/qDOZ/X/kC93qEsLXPqCDbGjA7CrQpq8hHOQzmsTqxCmBefHNooIKxscuEs6ptgfXNbJNPcgcKMsYjyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335349; 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=T2XPVnXjSf/goYp6DC/PRvFVzeZZ92N7U/dWPdd8yaM=; b=Iy7tr0pLQ9vAZhvkgNamJYAQSs6Df/9XJcA3g0UDtz+s9wHoM8jKf368Dr0mHCux8OOJxIsAqczJNVvvPDEqRNajf2mXilgtJQLrd8s4rwQya5M+Y7Pm7NcXLm8LkNA0E7vpG7w2YDHzLcsT9OKM4lI8qTjyMKSEf0FI4/vmz+k= 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 1662335349992871.1694201228288; Sun, 4 Sep 2022 16:49:09 -0700 (PDT) Received: from localhost ([::1]:37960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzMS-0008Ha-LZ for importer@patchew.org; Sun, 04 Sep 2022 19:49:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz9O-00079V-8n; Sun, 04 Sep 2022 19:35:38 -0400 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]:40689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz9I-00057q-Pu; Sun, 04 Sep 2022 19:35:37 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-11f0fa892aeso18033778fac.7; Sun, 04 Sep 2022 16:35:32 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35: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=T2XPVnXjSf/goYp6DC/PRvFVzeZZ92N7U/dWPdd8yaM=; b=oTzqPKOswLH7w+igVrIqeX2qIOHYsJOsAIP7dyPw3DYf7tx7YJsXXv0xpck840LQqq p32K0PlxC1V3a7KB5ev368bj+LLCBrE6IYNH5DJOKQLjcOUiH/bHoP+BUaUfysHLlAkz M8aN+tsheymF0ZNguj7cUOkGY7d5iY2Dg6263urAH1GKrbxqMf+PGob4EiameEw+yJbj f49E1U1S27Uhbw0+U65jdxMKTBe9njTlFO/I5rq4SAmd1/VDD56Vo3LLGxDISsyxeXHZ lkyP5yb5hCtPF0qUqCVXWHfWefDU1MrjsHoPNN9GEyq7Q4HaqcNL2a0vRCWfVD0MmeJ5 T/dg== 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=T2XPVnXjSf/goYp6DC/PRvFVzeZZ92N7U/dWPdd8yaM=; b=fa63uaFTw5u3owgZ++ZYAlZQZ64jjroo6b0WxeE9ZJAgtBmc5gJQ92RdflZKoc4oIa rh8L15PPfVohofun80EWjh0r61gTTpL17gqBVnrx1gXcuqssj6RXegmE1tPLANo9HHY4 FCWGX1v18cAYM8tQ6r6SSRuKMaO+zAfJf8HujeBakOZ6Iu7bOoOlAULSpZqDCZVIXHm3 ocp2YyO/ZZjbrCjGTeUzb+LuPh6UhfbfToFZmE7JE80hnPuVwI1zhlKZS01DZ3Uqqofs NRtOsTmUXJGtuJGV34USCEdbv2qjaHKkLs0+G0/pWR2ASnVnsfQG/8M4nj4tfGKnw4ve 0/Rw== X-Gm-Message-State: ACgBeo0uyUQUr6kVV8B6rPhtYxPG1WCp4aM2o2PGKA0y1GOvQctlEBQa LNfT+ws87jXyvc7zEfkhrhTTOE3PDPi0Ow== X-Google-Smtp-Source: AA6agR4YMgM/j2Tlb1R+FOmTMqBvKMGe03VkEo5wa2uZZrHMKu9RIvJonXW9B46PCtmCoOiMQA5+wQ== X-Received: by 2002:a05:6808:d46:b0:345:7b42:f987 with SMTP id w6-20020a0568080d4600b003457b42f987mr6503551oik.92.1662334531113; Sun, 04 Sep 2022 16:35:31 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , Palmer Dabbelt , Alistair Francis , Bin Meng Subject: [PATCH v6 12/14] hw/riscv: set machine->fdt in spike_board_init() Date: Sun, 4 Sep 2022 20:34:54 -0300 Message-Id: <20220904233456.209027-13-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::36; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x36.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335352078100001 Content-Type: text/plain; charset="utf-8" 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 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 e41b6aa9f0..a980e568a4 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.2 From nobody Tue May 21 13:25:43 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=1662335535; cv=none; d=zohomail.com; s=zohoarc; b=SDzLabhjsZTMzo6h8a5GOl8LoOjVF1Fro9QaGs3fy7R8Fa1hPSm5W0IYEFNJttvQio3TOWRIDq9YyIUXaWnZg9QAiCKuMwC+kkMwflolJi3u+ykGAIuUnrqZmxw88+RfU6moB7lSu1oHnhUCxfyXvrYTwOyaNInoizyM8443HeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335535; 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=16WddNSZhqtrCV5F9Z1jI9UMmcItES0z/obJPMI510U=; b=CLU2EiDk0qkePVzO7ijhehtLtOOmU3lUthF78szFLjiiehHLPYA0kbYXamJt/ymH5P2P5GFvZe0SYYbJh/RambyV3UK42DUhYnFLiIYpVQOaglgeSMwjUtnuvrfEJsF0SAO3YV/IZFU97UcUi6r3Te5ksFfjlPBN4UFm9pj8CZI= 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 166233553538749.871861332241; Sun, 4 Sep 2022 16:52:15 -0700 (PDT) Received: from localhost ([::1]:55728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzPS-00050p-9T for importer@patchew.org; Sun, 04 Sep 2022 19:52:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz9Q-0007FA-Io; Sun, 04 Sep 2022 19:35:40 -0400 Received: from mail-oa1-x2f.google.com ([2001:4860:4864:20::2f]:36840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz9N-000586-0v; Sun, 04 Sep 2022 19:35:40 -0400 Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-11f11d932a8so18073413fac.3; Sun, 04 Sep 2022 16:35:34 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35:32 -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=16WddNSZhqtrCV5F9Z1jI9UMmcItES0z/obJPMI510U=; b=DZ+PqfAvWVXHN0M1UNlJqMsdiSSARtcCB90uMK2PHe5KEIk8gARk4V9iXgTYqdazDu sQ/GWrUj7tar7WqwHA1mx+iHTDbxZobe8zHXqtIC4Dd688+Ojn3vhGzrL0j0XaLvkK1o 5Hc4XuKdhDg5UpVn3lnbyUkd6V5VOpqhXHkd8HE8YhQIpj1jMOy2qRTksU7SlY3T8OD+ 9NzIDok+tI9l1GChC9sTTnbErDiq+NsovcuxHHSLKiydliovD/Y4Y+3QoJ5deZW4ISJl ACvv/F40aOUX9fN6SsPxighb7Bg+BJ3jBay8cuuq6YEj4VGZYgrC4PuWbauNvIGX4SmS s15g== 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=16WddNSZhqtrCV5F9Z1jI9UMmcItES0z/obJPMI510U=; b=J6XWB4nGYmpx1laXAgm1rzGJlSsAfu+oy3aBpXek8mKdJOVLXPhVH7gciPqetYocEf Y1h7UO+tf1YjO3i/MpOZ2DaqjyoK1s90JvLqTuWQ8f8jYS5qBW54Og4nd78fuStUKZZ6 gxL9+nayT30zZ6584PGMuKujkV1P2EKRAet/ba52c+O6q17SHWADqNqxmf1SbXnF5akl gNtYQfgNPcJDCZkIqO9ti2ns+ddJ95GbubG4ocDe6QNtb1eCIgj/H4/4PxnKdS3rH2Yo sMP601enl1B4BaNgSn0PoAyWpwJBdeazq1ZHoHaLRaCfas1dY1Tdjckdzw0hjkOcZDDn D4zA== X-Gm-Message-State: ACgBeo3Xe7QjFKGZA6L87iVYlwdsHLoSF+xodWhLypLVqsjyT3SED4V+ 59bzAyNPnxFQVIWN1PSQJ6qKFHFqSj83Ng== X-Google-Smtp-Source: AA6agR5/Onc8Rm0L3rssF+7hUGNDOZUwwoE/dJxm0m+VkPCBqBTkedfuyeMsi3lzrfs4ILIM533jmw== X-Received: by 2002:a05:6808:a19:b0:344:13cb:afce with SMTP id n25-20020a0568080a1900b0034413cbafcemr6815946oij.255.1662334533218; Sun, 04 Sep 2022 16:35:33 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza Subject: [PATCH v6 13/14] hw/xtensa: set machine->fdt in xtfpga_init() Date: Sun, 4 Sep 2022 20:34:55 -0300 Message-Id: <20220904233456.209027-14-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::2f; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x2f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335536505100001 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.2 From nobody Tue May 21 13:25:43 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=1662335657; cv=none; d=zohomail.com; s=zohoarc; b=eiqRHyxCe+9VOLQhycqeQnHBoLfnPgxTV3R0i614mJxk6b/8pSJPkKcm1EmnkSKTQsejyRbZ85KHw+C2KVf1QIkoo/Ve4IVwqnJfF/EZ5ApR9syrrDmxYj/zQuM0a1pKvj51Pm+Nm2dEXlXXwySAh/1PWVgpp3cUlDwnhWrTBS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662335657; 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=uglBf7F9CqWcvM3175bWUvlm+U1dUtA4yg1E7e2OX5s=; b=e7qXMhk+6tlRuALPDyQRxorwRG6XKpyRNCMYpaUSYqAGmPEsYL2e+doW/afY2OjyrZASnqerImqvX3uaGd1rS1aDLIqeQqdWpmS7xHsclDrbIXJrIUMHarE1BWdDBCXyoES0ACeJv0CeHwd/5cVRKuj1yL/GccZa0umDl8iP9Q8= 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 1662335657802428.1804907907998; Sun, 4 Sep 2022 16:54:17 -0700 (PDT) Received: from localhost ([::1]:43434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUzRQ-0007z0-IN for importer@patchew.org; Sun, 04 Sep 2022 19:54:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUz9Q-0007Fp-NJ; Sun, 04 Sep 2022 19:35:40 -0400 Received: from mail-oa1-x29.google.com ([2001:4860:4864:20::29]:38645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUz9N-00058P-La; Sun, 04 Sep 2022 19:35:40 -0400 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-11edd61a9edso18051127fac.5; Sun, 04 Sep 2022 16:35:37 -0700 (PDT) Received: from balboa.ibmuc.com (200-207-147-180.dsl.telesp.net.br. [200.207.147.180]) by smtp.gmail.com with ESMTPSA id o7-20020a4a9587000000b0044b4acd27c5sm2549793ooi.17.2022.09.04.16.35.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Sep 2022 16:35:35 -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=uglBf7F9CqWcvM3175bWUvlm+U1dUtA4yg1E7e2OX5s=; b=MlIdq6Io/FSmSAHaPND0456eptIk8wLcD8/4UeKT1f1rx7JLOMluLUsZH4aCSfx3nq Dt6hd3nwzBHYGyyurMQPBttKEnjNU/aTAxID9TB40N6yr9p8V8Zu896YU9wAmlO9978f AUZzxiL1fAFT2vTyJd4XC0byUlPG50gKUdW2ZKYJMYzR7fIvAbXX0fFg9Tx3vb8505qi gC1w3WnK7BUm3klX/I7YxRpchylSNyiiCCEJ55y8oOcKaV1wrrCg7svKYJLR426Uf6WP d05S3cuuXHxGJ4LNjos1XQV/lsS3O2TpJckMB8jZgLkrFhZTK14aLH5oCM3WZRHWlhUL q9Pw== 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=uglBf7F9CqWcvM3175bWUvlm+U1dUtA4yg1E7e2OX5s=; b=uZ8vwnZuNCBKydbPQThY9syPym2BDo7LpbrtHY9ky28r82lN3J/4lYNWVxaHn09EMI dh0sBr5C6V6AWj2XbUthhL2kqAmW4pNq/x6bauHTBamrZfYg8T2RgeRiU0/abqLAkyjd hrZUZBZEatExBnuxpkl9w5tIEaTMvZ2izeADgoxl7JdK+g0xIg89A2YBusScHApHfPBJ 02DzSQoRG9sRcIXkmrIKup0SyLqwq43U+xfAur38rHy6rgiGwjYVSsQ8A5tS3iqYUAYs CsR4NJXmbxjj2WzrFEJnbjVMFbTQpJRYRuCjFO2bn45jpOJ6G6bEr4VJBON2RkeppQdT EjFQ== X-Gm-Message-State: ACgBeo3YsZQ6Iv7ECFqMggn1nAUj24QPW1iV5sl6mWm9pH6yGQ1qc4Ks zWBqe7GE6GHktfGytMJ3lZBbSgSiY0MQ5Q== X-Google-Smtp-Source: AA6agR6SEPBuigblLRCl7hdTGbG8PHQBj2CHosnyVIzvLrrA/PgKY4fDbdUS8ByWinLQmjnfkOVkHA== X-Received: by 2002:a05:6870:4410:b0:122:520b:2159 with SMTP id u16-20020a056870441000b00122520b2159mr7810649oah.27.1662334536254; Sun, 04 Sep 2022 16:35:36 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , "Dr . David Alan Gilbert" , Markus Armbruster , Alistair Francis , David Gibson Subject: [PATCH v6 14/14] qmp/hmp, device_tree.c: introduce dumpdtb Date: Sun, 4 Sep 2022 20:34:56 -0300 Message-Id: <20220904233456.209027-15-danielhb413@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220904233456.209027-1-danielhb413@gmail.com> References: <20220904233456.209027-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::29; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x29.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1662335659088100001 Content-Type: text/plain; charset="utf-8" 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' paramenter and, if a valid FDT is available, it'll save it in a file 'filename'. In short, this is a '-machine dumpdtb' that can be fired on demand via QMP/HMP. A valid FDT consists of a FDT that was created using libfdt being retrieved via 'current_machine->fdt' in device_tree.c. This condition is met by most FDT users in QEMU. 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 Signed-off-by: Daniel Henrique Barboza Acked-by: Dr. David Alan Gilbert --- hmp-commands.hx | 15 +++++++++++++++ include/sysemu/device_tree.h | 1 + monitor/misc.c | 1 + qapi/machine.json | 18 ++++++++++++++++++ softmmu/device_tree.c | 31 +++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 182e639d14..9a3e57504f 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1800,3 +1800,18 @@ ERST "\n\t\t\t\t\t limit on a specified virtual cpu", .cmd =3D hmp_cancel_vcpu_dirty_limit, }, + +#if defined(CONFIG_FDT) +SRST +``dumpdtb`` *filename* + Save the FDT in the 'filename' file to be decoded using dtc. + Requires 'libfdt' support. +ERST + { + .name =3D "dumpdtb", + .args_type =3D "filename:F", + .params =3D "filename", + .help =3D "save the FDT in the 'filename' file to be decoded= using dtc", + .cmd =3D hmp_dumpdtb, + }, +#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 3d2312ba8d..e7dd63030b 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 6afd1936b0..f968a5d343 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. Requires 'libfdt' support. +# +# @filename: name of the FDT file to be created +# +# Since: 7.2 +# +# Example: +# {"execute": "dumpdtb"} +# "arguments": { "filename": "/tmp/fdt.dtb" } } +# +## +{ 'command': 'dumpdtb', + 'data': { 'filename': 'str' }, + 'if': 'CONFIG_FDT' } diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c index 6ca3fad285..cdd41b6de6 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,31 @@ out: g_free(propcells); return ret; } + +void qmp_dumpdtb(const char *filename, Error **errp) +{ + g_autoptr(GError) err =3D NULL; + int size; + + if (!current_machine->fdt) { + error_setg(errp, "Unable to find the machine FDT"); + return; + } + + size =3D fdt_totalsize(current_machine->fdt); + + 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); + + hmp_handle_error(mon, local_err); +} --=20 2.37.2