From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51BE6C369CB for ; Wed, 23 Apr 2025 11:09:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7XwZ-0004T1-K5; Wed, 23 Apr 2025 07:07:07 -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 1u7XwQ-0004OT-Sn for qemu-riscv@nongnu.org; Wed, 23 Apr 2025 07:07:00 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7XwO-0000M8-2b for qemu-riscv@nongnu.org; Wed, 23 Apr 2025 07:06:58 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-22438c356c8so64960185ad.1 for ; Wed, 23 Apr 2025 04:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745406414; x=1746011214; 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=kOYMdiojT2/r6R0mXFsFLmQO6pzYznGqc+aniPhJJNA=; b=eGZaBWPAr6HA++UYCudnGRJ/Xk+I8voQb5XIuz6L1n5goX9ZTcZvCH3GYKa/t/3S3r sE9GZ9Cl6NHz/KEG9qoGaFtE1BmkmAgVxtMlhR4Z59oeDXF16xZH8b1CsisJbuv2/ypg jgjwApruR9/qPq1EMGkDlk7bcOX/u5Xkj7IXAJlukQjGQBSx4sR5FwFq6ftxPJmgxCtm wER7pzbGL4Det8W6RIZ3i783WFEEx7Pi1u0/LFC//hoQo3gOOsxGNvAnl7oPA6WNuGen ADkPTiPh4u0m/yxLFs9MpdR0HMPuJF7jwe4i7IcHltHP0D/1g5Rho5efzBbxpLj9pvy2 +9tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745406414; x=1746011214; 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=kOYMdiojT2/r6R0mXFsFLmQO6pzYznGqc+aniPhJJNA=; b=q7f1okjLm8T7aOWjdx7HRTYcqEGSV99KXO3RfFLjeZAlqYqQjF6hWItov1UzlABPDY GBOz2KLjEIusHnNQvG9wLT/nd8N2ZfuRwGOpUqB4En+b+NLExUUzDiUZon09jUg81s6q SZXTcukiacxorbtq0/tqjzFQF1Vr+xOIMpb5J487G5hZ/UbfCqcUC06C8OKI78X4HbU/ u3J2p1ltQORiulU4FtJSdMflzzGMnEcisVDZVULeB6PAcOLJRAviiKE+RY1yeZs4sAv4 BmztlnsPbyAZDljjW4c7UB4XeDMcHvTA3omQc0al5RjTDCUbkaLMMyU266GNGO6js8QB urRw== X-Gm-Message-State: AOJu0Yzwm6IYopZMoJ6Z7n0BL6huFznT4Miy7/F3z6Ml9Y2d7Tg1RCgd m+Iyu/9Ol837/k7/gZtoxG0uAs+xIUlBz8QdKGJrRV+EgAgp1kOVyRLRbuRlaY8= X-Gm-Gg: ASbGnct7FQuLnto3BSGetzSUpVEcUrNF+ANrE36e3pd3SE12S5l4rxuLahOWHikeq94 dCr19lp1Q4c4yb5BV5R5U0hOqv3Iwf2RyuuT3gCPR5S9Td95z/TOrANjBsNwVS10hKEetbM7ItO ATs9HA6ndPEkFrbepO2KC+2WUpYuYH10i3XOP4TUypiu+ST+1C4NrUdBmiEQG2k9/8oLxz+Mps7 NwuHsKyVa8u2G1fTbfYvQrxs3I7p/ERXYQdfdRr8NZTKJigvNMsFSUIP1Npjf1lOnKAk/Bt+6RX n92fWalhJgHgOJaYzYayNy7dmVxVyCzmc5CcC70Vfa9A/qa2KeX+T7goHDbHmIU= X-Google-Smtp-Source: AGHT+IHUL7oP7Mv9XUEcApwneT9S834LfOh7h9WJDSU09Smg+MkhC+AApzzdFRnmF2v5BfUOSLHXrA== X-Received: by 2002:a17:903:2383:b0:215:b9a6:5cb9 with SMTP id d9443c01a7336-22c53573d04mr314210705ad.5.1745406414266; Wed, 23 Apr 2025 04:06:54 -0700 (PDT) Received: from localhost.localdomain ([2804:7f0:bcc0:89f4:3b90:a265:963d:8357]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50fdf3b1sm101509895ad.248.2025.04.23.04.06.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 04:06:53 -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, Daniel Henrique Barboza Subject: [PATCH 5/9] hw/riscv/virt.c: use s->memmap in create_fdt() path Date: Wed, 23 Apr 2025 08:06:26 -0300 Message-ID: <20250423110630.2249904-6-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423110630.2249904-1-dbarboza@ventanamicro.com> References: <20250423110630.2249904-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62b.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-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org create_fdt(), create_fdt_flash() and create_fdt_fw_cfg() can access the memmap via their RISCVVirtState pointers. Signed-off-by: Daniel Henrique Barboza --- 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 77ebb517f2..02f3659d38 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -996,7 +996,7 @@ static void create_fdt_rtc(RISCVVirtState *s, const MemMapEntry *memmap, } } -static void create_fdt_flash(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt_flash(RISCVVirtState *s) { MachineState *ms = MACHINE(s); hwaddr flashsize = s->memmap[VIRT_FLASH].size / 2; @@ -1011,11 +1011,11 @@ static void create_fdt_flash(RISCVVirtState *s, const MemMapEntry *memmap) qemu_fdt_setprop_cell(ms->fdt, name, "bank-width", 4); } -static void create_fdt_fw_cfg(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt_fw_cfg(RISCVVirtState *s) { MachineState *ms = MACHINE(s); - hwaddr base = memmap[VIRT_FW_CFG].base; - hwaddr size = memmap[VIRT_FW_CFG].size; + hwaddr base = s->memmap[VIRT_FW_CFG].base; + hwaddr size = s->memmap[VIRT_FW_CFG].size; g_autofree char *nodename = g_strdup_printf("/fw-cfg@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); @@ -1146,7 +1146,7 @@ static void finalize_fdt(RISCVVirtState *s) create_fdt_rtc(s, s->memmap, irq_mmio_phandle); } -static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt(RISCVVirtState *s) { MachineState *ms = MACHINE(s); uint8_t rng_seed[32]; @@ -1173,7 +1173,8 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap) * The "/soc/pci@..." node is needed for PCIE hotplugs * that might happen before finalize_fdt(). */ - name = g_strdup_printf("/soc/pci@%lx", (long) memmap[VIRT_PCIE_ECAM].base); + name = g_strdup_printf("/soc/pci@%lx", + (long) s->memmap[VIRT_PCIE_ECAM].base); qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_add_subnode(ms->fdt, "/chosen"); @@ -1185,8 +1186,8 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap) qemu_fdt_add_subnode(ms->fdt, "/aliases"); - create_fdt_flash(s, memmap); - create_fdt_fw_cfg(s, memmap); + create_fdt_flash(s); + create_fdt_fw_cfg(s); create_fdt_pmu(s); } @@ -1720,7 +1721,7 @@ static void virt_machine_init(MachineState *machine) exit(1); } } else { - create_fdt(s, s->memmap); + create_fdt(s); } if (virt_is_iommu_sys_enabled(s)) { -- 2.49.0