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 4857DD1CDC6 for ; Tue, 9 Dec 2025 12:29:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vSwpp-0000pz-FR; Tue, 09 Dec 2025 07:28:55 -0500 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 1vSwpe-0000pZ-Ro for qemu-devel@nongnu.org; Tue, 09 Dec 2025 07:28:44 -0500 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vSwpc-00060O-Kq for qemu-devel@nongnu.org; Tue, 09 Dec 2025 07:28:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date :Subject:Cc:To:From:Sender:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=eWMokKsPZGcz6PiGyfwed1EXepx7o1F37MpM0Ih0uFs=; b=E3wdFcFowwJ4OVT vUcu76fHKbsdlOXks7lCljfRtnbG14tugyekQjfUY6ibn1XPDmf71EY+QCqwVmKGxkyX+F4EuKig0 t9cgniZ+41+TQq4y6erxt9xg1TPRFIf7jFTKPsZWe5Uvu4mASCINbvO/5vLDJtKOvplAEG3YJEiDO Fo=; To: qemu-devel@nongnu.org Cc: philmd@linaro.org, alistair.francis@wdc.com, palmer@dabbelt.com, Anton Johansson Subject: [PATCH] hw/riscv: Treat kernel_start_addr as vaddr Date: Tue, 9 Dec 2025 13:31:35 +0100 Message-ID: <20251209123135.22534-1-anjo@rev.ng> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: , Reply-to: Anton Johansson From: Anton Johansson via Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Changes kernel_start_addr from target_ulong to vaddr. Logically, the argument represents the virtual address at which to load the kernel image, which as a fallback gets treated as a hwaddr if elf/uimage loading fails. (Note: callers of riscv_load_kernel() currently pass in a hwaddr as kernel_start_addr, so I'm not 100% if hwaddr or vaddr is right here. Please correct me if I'm wrong.) Suggested-by: Philippe Mathieu-Daudé Signed-off-by: Anton Johansson --- include/hw/riscv/boot.h | 2 +- hw/riscv/boot.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index 51b0e13bd3..d872fe5e98 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -57,7 +57,7 @@ hwaddr riscv_load_firmware(const char *firmware_filename, symbol_fn_t sym_cb); void riscv_load_kernel(MachineState *machine, RISCVBootInfo *info, - target_ulong kernel_start_addr, + vaddr kernel_start_addr, bool load_initrd, symbol_fn_t sym_cb); uint64_t riscv_compute_fdt_addr(hwaddr dram_base, hwaddr dram_size, diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 75f34287ff..02a2bb2f87 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -228,7 +228,7 @@ static void riscv_load_initrd(MachineState *machine, RISCVBootInfo *info) void riscv_load_kernel(MachineState *machine, RISCVBootInfo *info, - target_ulong kernel_start_addr, + vaddr kernel_start_addr, bool load_initrd, symbol_fn_t sym_cb) { -- 2.51.0