From nobody Fri Nov 14 21:01:26 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761638268; cv=none; d=zohomail.com; s=zohoarc; b=jMaguluD6LwhD28cyBWz36/nWQBCklFvsBb43NupNn6tN3skBFSfdk9n+LcjvD+TnAIG+/Bf4lUCUvFTk2K/oXI1zNlB/O01xi0ii9slJxP+C22C9xulpBeqoBAD+zA7iA15SQl8jsFiLSxN7SlYJPlDCEj2pVLQo3AVA8//CZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761638268; h=Content-Type: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=XAOz2csCYno2mCUJfERE/km5CitqJUewmQUOxMdlado=; b=gxOfrAxuwGLRDnNgelSu6IXjzCBjvfTXgciQXtDi4oRBeXXHeRp8sBv1tG8vTETLLEnte5AWDbhMXjLCiGQ94hlkOnmVSrzswDz9lxEgI1Bvl2g6eNtQx+ZbxB8Kx0V7LlkhA0JpEGSxUt4CCy9Ofk1nd+/HlmHpR6wywpW9v9A= 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 1761638268507782.9998613977856; Tue, 28 Oct 2025 00:57:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDeaK-0003Zc-BO; Tue, 28 Oct 2025 03:57:41 -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 1vDeaG-0003Q8-AU for qemu-devel@nongnu.org; Tue, 28 Oct 2025 03:57:36 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDeaC-0008Ed-1R for qemu-devel@nongnu.org; Tue, 28 Oct 2025 03:57:36 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4711b95226dso69750925e9.0 for ; Tue, 28 Oct 2025 00:57:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952ca979sm19250685f8f.14.2025.10.28.00.57.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Oct 2025 00:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761638248; x=1762243048; 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=XAOz2csCYno2mCUJfERE/km5CitqJUewmQUOxMdlado=; b=Pkl4zKxxDgNKUTdPqAtwqlI9uHAAIqFblfXW8DtbOW9AEEGD/wksVobAfVo0iGtddO tSzI2Co1aRbn6sAZxoeWd/Gj1mRZHfXfnASht0NJnHqH8Jz/UXL48Hq1eRlWMUWGFJ1H InUMt4HopgtGOaHLK44Or07xXyst+4PHaR3W5ZX+v3vo+dWhgaKLUgtOw2LIZdOQiEJL 9xcN1WgbCSwTt0vur50D419Dam7r22SfHWuP54XcIDZEGfr+JdlJctYBR8VAH4LAXnoO q2SbOKAMDK2uEyv7HteDv3T+cPOsPa6UIvCfTh+bgtEOVFVzlml7GFivwaAgLHAM+2M8 u92A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761638248; x=1762243048; 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=XAOz2csCYno2mCUJfERE/km5CitqJUewmQUOxMdlado=; b=miQKiYgn/NKwYi+MzpulQR+VS8shg1oDpokk7jkxjUJ513xdv2iDCK4zrr345eBa9b 9baazT7yeZwSPgvT4QApijgeSOu4pEsJ7dLnaoAu5qq2QzPT9VF+jRAKH0QKireDrxJR SjJ50+7nQyOzWGT273MmegDDHpRStmfaa3fd+PxJEzCXpOcXXvD4nmvZX8G+b3a7jPSB nUIk3Q87jX1c4xE5w1lbHJQ3XjMBhwEgCLE+bZp7HAGwU4j/jNVJX1UGSq5SQh2a4ew5 UbjbE/lpNy9xmY2tLZ1mv7ymhJiP75e8NVrGDWSGs9qLkOFEa+9T8txB7fVyA1vlH9F4 uuXg== X-Gm-Message-State: AOJu0Yz00g0f+WI8vuT6AdmzYEsG3YUp6+uCcH2816lWjRKElyqIAK+8 5V2jVWg2zYE2esfWzi0O5Q+oOzDxXsbIzK8ld3t1BS/ZGz4AJ/UEP5TGEXEGi28LwRcYbSz0rdW f+HK1U6U= X-Gm-Gg: ASbGncvqhw7zsxbaAMMwUgOwk1yoD9JZHOiGoTHYlWO95ac04pA11OTpvkGGf2mVg6j 3z97d8R6qkXEcN0mFPL4zDcz0hVSlcfIq5PKM430o0u7F7eQ3qg3DF2DCUhFCXqQY+48VVNIpLn DUd0+3DOvFHVCWrwvJoW5VPWSUwcOPQ1Q9XKmks/x1m6P2Yo3zCdfM9WNjI6B5bEhmAng8x4w9+ KY2lqF2DCypbxNQ8WLSe2hA0rck1+LQAyWNmvnYzoFdy51GeWdcU1uSPA0l/v5Aa+JlgGrLnFjJ CcV+zXKXKeLweNOmSuM90OpqeJsjKHN5XGnHEvtOi+MemJENLHX1Whvivccq+qN8f0LD7SdzE8N eqNNYtVJDdpWS/F6FDQ4pCZKr+U2H/HnDi65v71eR9rXrQ1LvJB7Y+mxhfhvhE5UYlnevmKO54h zy4ms5vVumSzGjIaRBxpGW1e0M9zNVT5L2BHS6zojuJDbxN1PQejDoPMQ= X-Google-Smtp-Source: AGHT+IF3LZNMDgS2QwB0NYDRHjXxvJqYPpwx2TusRSii+sMtD3wqJGYUBSbbGmtH34NxqAXIAs0hzQ== X-Received: by 2002:a05:600c:190d:b0:477:e66:4077 with SMTP id 5b1f17b1804b1-47717e67befmr19212065e9.29.1761638248323; Tue, 28 Oct 2025 00:57:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org Subject: [PULL 23/23] hw/riscv: Widen OpenSBI dynamic info struct Date: Tue, 28 Oct 2025 08:48:59 +0100 Message-ID: <20251028074901.22062-24-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028074901.22062-1-philmd@linaro.org> References: <20251028074901.22062-1-philmd@linaro.org> 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=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 @linaro.org) X-ZM-MESSAGEID: 1761638269611154100 From: Anton Johansson Since fw_dynamic_info is only used for non 32 bit targets, target_long is int64_t anyway. Rename struct to fw_dynamic_info64 and use int64_t. Reviewed-by: Alistair Francis Signed-off-by: Anton Johansson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251027-feature-single-binary-hw-v1-v2-3-44478d589ae9@rev.ng> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/riscv/boot_opensbi.h | 14 +++++++------- hw/riscv/boot.c | 22 ++++++++++++---------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/hw/riscv/boot_opensbi.h b/include/hw/riscv/boot_opensb= i.h index 18664a174b5..ab9999be3f7 100644 --- a/include/hw/riscv/boot_opensbi.h +++ b/include/hw/riscv/boot_opensbi.h @@ -29,17 +29,17 @@ enum sbi_scratch_options { }; =20 /** Representation dynamic info passed by previous booting stage */ -struct fw_dynamic_info { +struct fw_dynamic_info64 { /** Info magic */ - target_long magic; + int64_t magic; /** Info version */ - target_long version; + int64_t version; /** Next booting stage address */ - target_long next_addr; + int64_t next_addr; /** Next booting stage mode */ - target_long next_mode; + int64_t next_mode; /** Options for OpenSBI library */ - target_long options; + int64_t options; /** * Preferred boot HART id * @@ -55,7 +55,7 @@ struct fw_dynamic_info { * stage can set it to -1UL which will force the FW_DYNAMIC firmware * to use the relocation lottery mechanism. */ - target_long boot_hart; + int64_t boot_hart; }; =20 /** Representation dynamic info passed by previous booting stage */ diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 9510fca939b..75f34287ff1 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -388,7 +388,8 @@ void riscv_rom_copy_firmware_info(MachineState *machine, uint64_t kernel_entry) { struct fw_dynamic_info32 dinfo32; - struct fw_dynamic_info dinfo; + struct fw_dynamic_info64 dinfo64; + void *dinfo_ptr =3D NULL; size_t dinfo_len; =20 if (riscv_is_32bit(harts)) { @@ -398,15 +399,17 @@ void riscv_rom_copy_firmware_info(MachineState *machi= ne, dinfo32.next_addr =3D cpu_to_le32(kernel_entry); dinfo32.options =3D 0; dinfo32.boot_hart =3D 0; + dinfo_ptr =3D &dinfo32; dinfo_len =3D sizeof(dinfo32); } else { - dinfo.magic =3D cpu_to_le64(FW_DYNAMIC_INFO_MAGIC_VALUE); - dinfo.version =3D cpu_to_le64(FW_DYNAMIC_INFO_VERSION); - dinfo.next_mode =3D cpu_to_le64(FW_DYNAMIC_INFO_NEXT_MODE_S); - dinfo.next_addr =3D cpu_to_le64(kernel_entry); - dinfo.options =3D 0; - dinfo.boot_hart =3D 0; - dinfo_len =3D sizeof(dinfo); + dinfo64.magic =3D cpu_to_le64(FW_DYNAMIC_INFO_MAGIC_VALUE); + dinfo64.version =3D cpu_to_le64(FW_DYNAMIC_INFO_VERSION); + dinfo64.next_mode =3D cpu_to_le64(FW_DYNAMIC_INFO_NEXT_MODE_S); + dinfo64.next_addr =3D cpu_to_le64(kernel_entry); + dinfo64.options =3D 0; + dinfo64.boot_hart =3D 0; + dinfo_ptr =3D &dinfo64; + dinfo_len =3D sizeof(dinfo64); } =20 /** @@ -420,8 +423,7 @@ void riscv_rom_copy_firmware_info(MachineState *machine, } =20 rom_add_blob_fixed_as("mrom.finfo", - riscv_is_32bit(harts) ? - (void *)&dinfo32 : (void *)&dinfo, + dinfo_ptr, dinfo_len, rom_base + reset_vec_size, &address_space_memory); --=20 2.51.0