From nobody Sat Nov 15 23:41:32 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1745931555; cv=none; d=zohomail.com; s=zohoarc; b=DvYDic7fpY+Y5UOeLCE1D5wDEzaJWWkx8ssceE9MibHeT21H+VqGeST0pCY032/y6nGY7Mv7XGqvQiDLYXRMk+y3eYM9CQXBfYbv3qzc1igx8mec7lTUa8ENTSESZIWbNS2v1Lx/6hOmRU0ggZV2yzBf0zaYxQOuRoc0JKunOpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745931555; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BrXJgTd/+PWDNXelt13M1UFWn8uze3FGZwtv/Kgf7wI=; b=DBodB+J4eLgsCIP8sqCebvgfwVvwzevgxx3gmVMr//vNjXR85UmctytSZy51miXIl0AQW0P2qfUZu/Qd2M1KQxMceVLhTHfeQ58GOTwkX3CUNysNsNvsyUxxbG4Iy5XPXSjiEAuFmaq9LoDDN2U91Iogu5EhDB3/UdjD/dUIJoM= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745931555504109.41373398392693; Tue, 29 Apr 2025 05:59:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9kXo-0002TN-Ve; Tue, 29 Apr 2025 08:58:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9kXk-0002Sm-9D for qemu-devel@nongnu.org; Tue, 29 Apr 2025 08:58:36 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9kXi-0000AN-I2 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 08:58:36 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22c33e4fdb8so62791805ad.2 for ; Tue, 29 Apr 2025 05:58:34 -0700 (PDT) Received: from grind.. ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b15f7fb7e54sm8889440a12.30.2025.04.29.05.58.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 05:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745931513; x=1746536313; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BrXJgTd/+PWDNXelt13M1UFWn8uze3FGZwtv/Kgf7wI=; b=NIkm96u1ESCJfhhGBytYBbc6ommA/PYFHffHV7dn71PeECy4VUI1uer4U4/Ue4CPG9 Hcd+l8iTwZlJGw8L8P1OfDdRT0/TcbOIKAkDJgyqSR1jkUBJGYfrDGlhO3q8zoxWCVqE ba2MGfgGsxdchrDyGIC59SQRD4ORsMBfEA5w28ngVxP5HmpcpyToguhZIKGjno7Kpaux 3OsQ5wEjbp9SiNYNmN4P2LabCCcdMunNJnScx2ZpwdagEMqk4sQzZ8r4xvWt5DdkaUXr tQ22HaACXp8nXJSLqBYrHf6U+io29cNKIP1CbFqzqI5Q05JgAwGtfZI8H1zzxZt3DBkS VUYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745931513; x=1746536313; 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:message-id:reply-to; bh=BrXJgTd/+PWDNXelt13M1UFWn8uze3FGZwtv/Kgf7wI=; b=nYJLyRL0uwySDAsj2WoxG6omf37hweYmLa3XexeqowWWt4unQkxVb9sOPT3R+6Gnvd rJOoihC6YpH1nOUZrlGboQ41veN5B2sqanwXGD91H64rIulBCg0Qw/771WxfVPvsCGNW lskinILLQN69wP+GNCGkILoDz18ZR4/QTeK9ayX68m/edscY3xX1iRmEQF2x0hsOj2Mn SboboRfDKgda/mx+retZOlzcoCmN9hENlPf6hHaaWSHPvtm7s6hev+G9Z4i0aJA8o3vn RR72zUUzjqN/z3VgDbr8dQagKM5cnjcds2VC9BqY2iKz/peR1CJOabMNCOLRS+Ta4+N2 Kfmg== X-Gm-Message-State: AOJu0Ywbsw8SSqWiFV8c0hA7+CObg1/8C/doW6LNmc3XAcJBX73iTywg nFkjWHjNxi5tk0GduQwqntK1qlMR2e35Zmz0rV/k8JGdZQl79z1moIHdgct8hqIadTgf6WEMHsk S X-Gm-Gg: ASbGnculpigL48lr7LmsfuzjrPDpjulPNlnqVvPsbr7s67oQrXiKndgbNqJxWcqJm5q S0FrBQa7p2B2RzZrOypLcmBm4VxHCYZfSWn3760pCAOp5VwTp3v2T492AxeBJ9s86c0gRaQByLn aFoJ0+WhJSmgemKkPyTArGHDnEdgBvyI6YsWQeietNDr8cNZ8lw42tzRaYxbSLVfu4HA4WhIa9c ubi9/3tvMJQPoe/lyW0eY249sJv5KDkWFWSrE2a5v9K0fwEJBkhGmpZegcu3zzd4gD0E7wISz9s z/GT8vZij9AjwwZTfvuaM9eEJKbna7g3ztglZA6w/9Y= X-Google-Smtp-Source: AGHT+IG2o9oZQi4faXCTJ7bj7cvNjPnx0+6x+PgMtrYfbmTSNPpuPKdkkwhwkKGItKzLYti/4xZ2Iw== X-Received: by 2002:a17:902:cf10:b0:22d:e57a:27b9 with SMTP id d9443c01a7336-22de5fd252bmr58404925ad.22.1745931512766; Tue, 29 Apr 2025 05:58:32 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, joel@jms.id.au, Daniel Henrique Barboza Subject: [PATCH v2 5/9] hw/riscv/virt.c: use s->memmap in create_fdt() path Date: Tue, 29 Apr 2025 09:58:07 -0300 Message-ID: <20250429125811.224803-6-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429125811.224803-1-dbarboza@ventanamicro.com> References: <20250429125811.224803-1-dbarboza@ventanamicro.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::62c; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745931557692019000 Content-Type: text/plain; charset="utf-8" create_fdt(), create_fdt_flash() and create_fdt_fw_cfg() can access the memmap via their RISCVVirtState pointers. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- hw/riscv/virt.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 37f8abdd1c..5f31c95955 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -995,7 +995,7 @@ static void create_fdt_rtc(RISCVVirtState *s, const Mem= MapEntry *memmap, } } =20 -static void create_fdt_flash(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt_flash(RISCVVirtState *s) { MachineState *ms =3D MACHINE(s); hwaddr flashsize =3D s->memmap[VIRT_FLASH].size / 2; @@ -1010,11 +1010,11 @@ static void create_fdt_flash(RISCVVirtState *s, con= st MemMapEntry *memmap) qemu_fdt_setprop_cell(ms->fdt, name, "bank-width", 4); } =20 -static void create_fdt_fw_cfg(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt_fw_cfg(RISCVVirtState *s) { MachineState *ms =3D MACHINE(s); - hwaddr base =3D memmap[VIRT_FW_CFG].base; - hwaddr size =3D memmap[VIRT_FW_CFG].size; + hwaddr base =3D s->memmap[VIRT_FW_CFG].base; + hwaddr size =3D s->memmap[VIRT_FW_CFG].size; g_autofree char *nodename =3D g_strdup_printf("/fw-cfg@%" PRIx64, base= ); =20 qemu_fdt_add_subnode(ms->fdt, nodename); @@ -1145,7 +1145,7 @@ static void finalize_fdt(RISCVVirtState *s) create_fdt_rtc(s, s->memmap, irq_mmio_phandle); } =20 -static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt(RISCVVirtState *s) { MachineState *ms =3D MACHINE(s); uint8_t rng_seed[32]; @@ -1172,7 +1172,8 @@ static void create_fdt(RISCVVirtState *s, const MemMa= pEntry *memmap) * The "/soc/pci@..." node is needed for PCIE hotplugs * that might happen before finalize_fdt(). */ - name =3D g_strdup_printf("/soc/pci@%lx", (long) memmap[VIRT_PCIE_ECAM]= .base); + name =3D g_strdup_printf("/soc/pci@%lx", + (long) s->memmap[VIRT_PCIE_ECAM].base); qemu_fdt_add_subnode(ms->fdt, name); =20 qemu_fdt_add_subnode(ms->fdt, "/chosen"); @@ -1184,8 +1185,8 @@ static void create_fdt(RISCVVirtState *s, const MemMa= pEntry *memmap) =20 qemu_fdt_add_subnode(ms->fdt, "/aliases"); =20 - create_fdt_flash(s, memmap); - create_fdt_fw_cfg(s, memmap); + create_fdt_flash(s); + create_fdt_fw_cfg(s); create_fdt_pmu(s); } =20 @@ -1719,7 +1720,7 @@ static void virt_machine_init(MachineState *machine) exit(1); } } else { - create_fdt(s, s->memmap); + create_fdt(s); } =20 if (virt_is_iommu_sys_enabled(s)) { --=20 2.49.0