From nobody Mon Nov 17 06:01:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8xvG2yBVz6GdRl; Mon, 17 Nov 2025 06:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8xvG02fKz3Qv1; Mon, 17 Nov 2025 06:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763359274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XAHQDEcBvrCPbrvgieVdej7CBvvszIWEaV3HjZTvgIY=; b=F2pSGWBB335uGYzaCuNBji+ulwqfX4NCe5p9qlJsIqHPs26984B5TXdzzRKPFrE7LbGG5E CMsZ2bKQjmXx3izp0Af2UYQBxU25kFKXvSj2fDNDozk3qvFWLXlx9u9qZ1ETrXYlXKZgcq qZWIADtzVNP8DpCdEeguE4P3il8HD7AF7c4Bi4jKdfl0KO8ChsE/tlijWM0Qg0L6vGlL+a LI58ZHjAj36f0i0L06V799lsi3RAY71EZCPjuP35StEnM3PdhO6FA1TNrs8ermN42FrEPP Eq3HIZj0HpVZODLUEjvMxVOzNDds6GoSCrXxT5tzATnnOLghN47sV5fbj0Kh4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763359274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XAHQDEcBvrCPbrvgieVdej7CBvvszIWEaV3HjZTvgIY=; b=UtkxZT6HuiykNNvXi1ZnWRxj6dAmsRsEscsvHH8LB6VGxIGYN7/ylngtTZ83kW/ZgMb8RJ uqQhNC8RJTzOESpDKqHSaw6OkTOvdG4Z/MKYIlOrPiLE/73/1eC/kTMjBELr80r1ZI8ONA JmygBNiM4PuaWU2aIflfio1/U+5a7kDAlDnQgMVB6tkvKvTcN0i309s4LInJZKsHXgDjNl D4GtOOt8NoU6d5ZKxZqS02jDwyADhFLzXmsftubQcxnPoFsJT74EiSx+zsgcJFymKBOc++ 9j6nSj5XDFcNcrGTYs2t9694Ej/f2uokkQJ0fbflUFfXSkgNhiDkYTsG+dngAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763359274; a=rsa-sha256; cv=none; b=dcWQ21j6oPZlfDtACoC5Cu+UAYU33ASgXC4djMPwR+HpjRWZq1nMMPxEnL22VJp+9F0cPv PRrYnHx7dt8e7eorA4NfFbEuKNmaPM/6qgw+DbS9Pe/CtCnOSOHXcrl+9aniUEUeEUNNU0 Xhqc3wUIhBiuIiO2nT0sL7HS2kEozvclE8sdcFHjzfqexc0lyWJosmOvMy90q1vbvAlfPu 1LH18V80evjV0gEWnkAIUZsAWPvC3RBo5DGy5fBQcVVyQt7jRQL4rPcDpw5rmWl2qmk9zs ztr3qvQtEmIirzK3KxO4NtW4WzwOR4TrbP57aa0yTDnFIVeZkvAnsV/pszSOmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8xvF5tBLz1B2p; Mon, 17 Nov 2025 06:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AH61DUk018492; Mon, 17 Nov 2025 06:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH61Dwh018489; Mon, 17 Nov 2025 06:01:13 GMT (envelope-from git) Date: Mon, 17 Nov 2025 06:01:13 GMT Message-Id: <202511170601.5AH61Dwh018489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c62eaf8af905 - main - stand: Update riscv efi booting to edk2 includes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c62eaf8af9054b9f370bdd396cae411848bc617b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c62eaf8af9054b9f370bdd396cae411848bc617b commit c62eaf8af9054b9f370bdd396cae411848bc617b Author: Warner Losh AuthorDate: 2025-11-17 05:09:34 +0000 Commit: Warner Losh CommitDate: 2025-11-17 05:58:03 +0000 stand: Update riscv efi booting to edk2 includes Update to include the right includes for the riscv protocol to get the hypervisor details. Note: I expanded the GUID inline rather than using a #define because there was none. This is only listed in UefiCpuPkg/UefiCpuPkg.dec, so include it here inline until we can automate using those files. Fixes: 43b8edb32051 Sponsored by: Netflix --- stand/efi/loader/arch/riscv/exec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/efi/loader/arch/riscv/exec.c b/stand/efi/loader/arch/riscv/exec.c index a53fbd9442b0..8d1a0bd03de0 100644 --- a/stand/efi/loader/arch/riscv/exec.c +++ b/stand/efi/loader/arch/riscv/exec.c @@ -41,10 +41,14 @@ #include "bootstrap.h" #include "loader_efi.h" +#include +#include + static void riscv_set_boot_hart(struct preloaded_file *fp) { - EFI_GUID riscvboot = RISCV_EFI_BOOT_PROTOCOL_GUID; + // No #define in EDK2 for this + EFI_GUID riscvboot = { 0xccd15fec, 0x6f73, 0x4eec, { 0x83, 0x95, 0x3e, 0x69, 0xe4, 0xb9, 0x40, 0xbf }}; RISCV_EFI_BOOT_PROTOCOL *proto; EFI_STATUS status = 0; uint64_t boot_hartid = ULONG_MAX;