Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 27 Jan 2022 08:47:35 +0100
From:   Heinrich Schuchardt <xypron.glpk@gmx.de>
To:     Sunil V L <sunilvl@ventanamicro.com>,
        Ard Biesheuvel <ardb@kernel.org>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Albert Ou <aou@eecs.berkeley.edu>
CC:     linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-riscv@lists.infradead.org,
        Anup Patel <apatel@ventanamicro.com>,
        Atish Patra <atishp@rivosinc.com>,
        Abner Chang <abner.chang@hpe.com>,
        Jessica Clarke <jrtc27@jrtc27.com>
Subject: =?US-ASCII?Q?Re=3A_=5BRFC_PATCH_1/1=5D_riscv/efi=5Fstub=3A_A?= =?US-ASCII?Q?dd_support_for_RISCV=5FEFI=5FBOOT=5FPROTOCOL?=
User-Agent: K-9 Mail for Android
In-Reply-To: <20220126110615.33371-2-sunilvl@ventanamicro.com>
References: <20220126110615.33371-1-sunilvl@ventanamicro.com> <20220126110615.33371-2-sunilvl@ventanamicro.com>
Message-ID: <667AE324-A8D2-41ED-B9DF-62750F3C2574@gmx.de>
MIME-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Am 26=2E Januar 2022 12:06:15 MEZ schrieb Sunil V L <sunilvl@ventanamicro=
=2Ecom>:
>This patch adds the support for getting the boot hart ID in
>Linux EFI stub using RISCV_EFI_BOOT_PROTOCOL=2E

It would be helpful to add a link to the spec in the commit message and ma=
ybe a comment that this protocol is needed for the ACPI use case=2E

>
>Signed-off-by: Sunil V L <sunilvl@ventanamicro=2Ecom>
>---
> drivers/firmware/efi/libstub/efistub=2Eh    | 15 ++++++++++++
> drivers/firmware/efi/libstub/riscv-stub=2Ec | 28 ++++++++++++++++++++---
> include/linux/efi=2Eh                       |  1 +
> 3 files changed, 41 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/firmware/efi/libstub/efistub=2Eh b/drivers/firmware/=
efi/libstub/efistub=2Eh
>index edb77b0621ea=2E=2E0428f8816942 100644
>--- a/drivers/firmware/efi/libstub/efistub=2Eh
>+++ b/drivers/firmware/efi/libstub/efistub=2Eh
>@@ -720,6 +720,21 @@ union efi_tcg2_protocol {
> 	} mixed_mode;
> };
>=20
>+typedef union riscv_efi_boot_protocol riscv_efi_boot_protocol_t;
>+
>+union riscv_efi_boot_protocol {
>+	struct {
>+		u64 revision;
>+		efi_status_t (__efiapi *get_boot_hartid)(
>+							 riscv_efi_boot_protocol_t *,
>+							 size_t *);

I prefer to have parameter names for readability

According to the platform specification mhartid is MXLEN wide=2E UINTN (si=
ze_t) is SXLEN wide=2E=20

Does this have any implications on how we define the protocol?

>+	};
>+	struct {
>+		u32 revision;
>+		u32 get_boot_hartid;>+	} mixed_mode;
>+};
>+
> typedef union efi_load_file_protocol efi_load_file_protocol_t;
> typedef union efi_load_file_protocol efi_load_file2_protocol_t;
>=20
>diff --git a/drivers/firmware/efi/libstub/riscv-stub=2Ec b/drivers/firmwa=
re/efi/libstub/riscv-stub=2Ec
>index 380e4e251399=2E=2Ec7add4eb5453 100644
>--- a/drivers/firmware/efi/libstub/riscv-stub=2Ec
>+++ b/drivers/firmware/efi/libstub/riscv-stub=2Ec
>@@ -46,12 +46,34 @@ static u32 get_boot_hartid_from_fdt(void)
> 	return fdt32_to_cpu(*prop);
> }
>=20
>+static u32 get_boot_hartid_from_efi(void)
>+{

The returned value must be UINTN /size_t like the protocol=2E This width m=
ust be carried to the legacy entry point of Linux=2E

>+	efi_guid_t boot_protocol_guid =3D RISCV_EFI_BOOT_PROTOCOL_GUID;
>+	efi_status_t status;
>+	riscv_efi_boot_protocol_t *boot_protocol;
>+	size_t boot_hart_id;
>+
>+	status =3D efi_bs_call(locate_protocol, &boot_protocol_guid, NULL,
>+			     (void **)&boot_protocol);
>+	if (status =3D=3D EFI_SUCCESS) {
>+		status =3D efi_call_proto(boot_protocol,
>+					get_boot_hartid, &boot_hart_id);
>+		if (status =3D=3D EFI_SUCCESS) {
>+			return (u32)boot_hart_id;
>+		}
>+	}
>+	return U32_MAX;

U32_MAX is a legal value for the hart id=2E

>+}
>+
> efi_status_t check_platform_features(void)
> {
>-	hartid =3D get_boot_hartid_from_fdt();
>+	hartid =3D get_boot_hartid_from_efi();
> 	if (hartid =3D=3D U32_MAX) {
>-		efi_err("/chosen/boot-hartid missing or invalid!\n");
>-		return EFI_UNSUPPORTED;
>+		hartid =3D get_boot_hartid_from_fdt();
>+		if (hartid =3D=3D U32_MAX) {

U32_MAX is a legal value for the hart id=2E Please, separate status and va=
lue=2E

Best regards

Heinrich

>+			efi_err("/chosen/boot-hartid missing or invalid!\n");
>+			return EFI_UNSUPPORTED;
>+		}
> 	}
> 	return EFI_SUCCESS;
> }
>diff --git a/include/linux/efi=2Eh b/include/linux/efi=2Eh
>index ccd4d3f91c98=2E=2E9822c730207c 100644
>--- a/include/linux/efi=2Eh
>+++ b/include/linux/efi=2Eh
>@@ -380,6 +380,7 @@ void efi_native_runtime_setup(void);
> #define EFI_CONSOLE_OUT_DEVICE_GUID		EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4=
,  0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)
> #define APPLE_PROPERTIES_PROTOCOL_GUID		EFI_GUID(0x91bd12fe, 0xf6c3, 0x4=
4fb,  0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0)
> #define EFI_TCG2_PROTOCOL_GUID			EFI_GUID(0x607f766c, 0x7455, 0x42be,  0=
x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f)
>+#define RISCV_EFI_BOOT_PROTOCOL_GUID		EFI_GUID(0xccd15fec, 0x6f73, 0x4ee=
c,  0x83, 0x95, 0x3e, 0x69, 0xe4, 0xb9, 0x40, 0xbf)
> #define EFI_LOAD_FILE_PROTOCOL_GUID		EFI_GUID(0x56ec3091, 0x954c, 0x11d2=
,  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
> #define EFI_LOAD_FILE2_PROTOCOL_GUID		EFI_GUID(0x4006c0c1, 0xfcb3, 0x403=
e,  0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d)
> #define EFI_RT_PROPERTIES_TABLE_GUID		EFI_GUID(0xeb66918a, 0x7eef, 0x402=
a,  0x84, 0x2e, 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9)