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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 476E7C433F5 for ; Wed, 26 Jan 2022 23:24:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8973A832D1; Thu, 27 Jan 2022 00:24:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="kiLj92Ak"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 72D29805F9; Wed, 26 Jan 2022 12:06:31 +0100 (CET) Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6305A800AA for ; Wed, 26 Jan 2022 12:06:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sunilvl@ventanamicro.com Received: by mail-pg1-x531.google.com with SMTP id e9so20848226pgb.3 for ; Wed, 26 Jan 2022 03:06:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iyjQz9db1XsaMvYm/bEWH0+Mgifjq96dECrP0mk7nBs=; b=kiLj92AkihMqvoXsIxZQ4E+Dp1CJ5yX6h4O1wumv862ZLbeUipMXh153TQyHSaQCOn i+AKsPMyNS9xE07Il/4VMQxz9lRrfThqtworA9AWhkK4aqfBzUS4FLQb0B4t47B30vou hQ4+58dL5N3Hu7ESI4DvQQKK8Ru33UenCI8/QkwlcGccm1oVqY0V4D27zCk6Qpv7H6mO GWTrgJ7P1yaHr3iHUgOR0xwvWo4+u/Dxfx9fPEMhVGWRfYLavy+fB01xlUcAwZySNiN4 K1vXThNnN5r/wFBGvew2X5Tp6IqQf1fXRu5kHX7Ef/Ujf1IvVnqETag7GfGLyJep3kP2 2DXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iyjQz9db1XsaMvYm/bEWH0+Mgifjq96dECrP0mk7nBs=; b=73pcVz+iJGG1BcXFKQ8P31tXGNoBXMxTOFTJcYNCOOmKb3s8NAXtJUFMCeSo3spnUE zjiyzB7i/bgitvADUdrgMDQJhnK4AFQN7vh8mE+xNW+v9SHFQOIqc9T9pdgGwKtf6u+b SquQ0vNPgOMNk+zC7kEr2uk0X3+sKxy6Y6zI1Sro/xJj56BLp6bcBcRuSi8AvfnqIqxQ EeTnSz735j6FhuBBBhwIJHWBqKaCxvPxC1CZqg9W82A5XtO6RrpYPpsO/R6lpr7Rn5D7 H0BiXMNgfp0phvT9jG1OOQlAxhOSzRoh9tP91rkr+LVHIXDso+TmMET7VjXVZlgUvo11 pv8A== X-Gm-Message-State: AOAM532RB+0KhhRiODh90gOIpeguI9ZMURbb1RdA+kSQtL636dGCeqsc lO9bs4oHARxEpIXW747mLBfBqA== X-Google-Smtp-Source: ABdhPJy2C0/RLsIwYRkKHHiWkbAE/7u2pE9eD4bv1r9cX0+U1WuMEEgvO0DI/Y06BoIOwWu/dib1DA== X-Received: by 2002:a63:b00a:: with SMTP id h10mr18608307pgf.400.1643195186755; Wed, 26 Jan 2022 03:06:26 -0800 (PST) Received: from sunil-ThinkPad-T490.dc1.ventanamicro.com ([49.206.3.187]) by smtp.gmail.com with ESMTPSA id u16sm1871866pfg.192.2022.01.26.03.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 03:06:26 -0800 (PST) From: Sunil V L To: Heinrich Schuchardt Cc: u-boot@lists.denx.de, Ard Biesheuvel , Anup Patel , Atish Patra , Abner Chang , Jessica Clarke , Sunil V L Subject: [RFC PATCH 1/1] efi_loader: Enable RISCV_EFI_BOOT_PROTOCOL support Date: Wed, 26 Jan 2022 16:36:11 +0530 Message-Id: <20220126110611.33325-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220126110611.33325-1-sunilvl@ventanamicro.com> References: <20220126110611.33325-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Thu, 27 Jan 2022 00:24:06 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This adds support for new RISCV_EFI_BOOT_PROTOCOL to communicate the boot hart ID to bootloader/kernel on RISC-V UEFI platforms. Signed-off-by: Sunil V L --- include/efi_api.h | 4 +++ include/efi_loader.h | 2 ++ include/efi_riscv.h | 16 +++++++++ lib/efi_loader/Kconfig | 7 ++++ lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_riscv.c | 69 ++++++++++++++++++++++++++++++++++++++ lib/efi_loader/efi_setup.c | 6 ++++ 7 files changed, 105 insertions(+) create mode 100644 include/efi_riscv.h create mode 100644 lib/efi_loader/efi_riscv.c diff --git a/include/efi_api.h b/include/efi_api.h index 8d5d835bd0..f123d0557c 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -438,6 +438,10 @@ struct efi_runtime_services { EFI_GUID(0x607f766c, 0x7455, 0x42be, 0x93, \ 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f) +#define RISCV_EFI_BOOT_PROTOCOL_GUID \ + EFI_GUID(0xccd15fec, 0x6f73, 0x4eec, 0x83, \ + 0x95, 0x3e, 0x69, 0xe4, 0xb9, 0x40, 0xbf) + /** * struct efi_configuration_table - EFI Configuration Table * diff --git a/include/efi_loader.h b/include/efi_loader.h index 701efcd2b6..1fa75b40fe 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -527,6 +527,8 @@ efi_status_t efi_disk_register(void); efi_status_t efi_rng_register(void); /* Called by efi_init_obj_list() to install EFI_TCG2_PROTOCOL */ efi_status_t efi_tcg2_register(void); +/* Called by efi_init_obj_list() to install RISCV_EFI_BOOT_PROTOCOL */ +efi_status_t efi_riscv_register(void); /* Called by efi_init_obj_list() to do initial measurement */ efi_status_t efi_tcg2_do_initial_measurement(void); /* measure the pe-coff image, extend PCR and add Event Log */ diff --git a/include/efi_riscv.h b/include/efi_riscv.h new file mode 100644 index 0000000000..6beb2637f6 --- /dev/null +++ b/include/efi_riscv.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * RISCV_EFI_BOOT_PROTOCOL + * + * Copyright (c) 2022 Ventana Micro Systems Inc + */ + +#include + +#define RISCV_EFI_BOOT_PROTOCOL_REVISION 0x00010000 + +struct riscv_efi_boot_protocol { + u64 revision; + efi_status_t (EFIAPI *get_boot_hartid) (struct riscv_efi_boot_protocol *this, + efi_uintn_t *boot_hartid); +}; diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 24f9a2bb75..77ba6a7ea1 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -369,4 +369,11 @@ config EFI_ESRT help Enabling this option creates the ESRT UEFI system table. +config EFI_RISCV_BOOT_PROTOCOL + bool "RISCV_EFI_BOOT_PROTOCOL support" + default y + depends on RISCV + help + Provide a RISCV_EFI_BOOT_PROTOCOL implementation on RISC-V platform. + endif diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index fd344cea29..b2c664d108 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -62,6 +62,7 @@ obj-$(CONFIG_GENERATE_ACPI_TABLE) += efi_acpi.o obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o obj-$(CONFIG_EFI_RNG_PROTOCOL) += efi_rng.o obj-$(CONFIG_EFI_TCG2_PROTOCOL) += efi_tcg2.o +obj-$(CONFIG_EFI_RISCV_BOOT_PROTOCOL) += efi_riscv.o obj-$(CONFIG_EFI_LOAD_FILE2_INITRD) += efi_load_initrd.o obj-$(CONFIG_EFI_SIGNATURE_SUPPORT) += efi_signature.o diff --git a/lib/efi_loader/efi_riscv.c b/lib/efi_loader/efi_riscv.c new file mode 100644 index 0000000000..91b8d2b927 --- /dev/null +++ b/lib/efi_loader/efi_riscv.c @@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Defines APIs that allow an OS to interact with UEFI firmware to query + * information about the boot hart ID. + * + * Copyright (c) 2022, Ventana Micro Systems Inc + */ + +#define LOG_CATEGORY LOGC_EFI +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +static const efi_guid_t efi_guid_riscv_boot_protocol = RISCV_EFI_BOOT_PROTOCOL_GUID; +static efi_uintn_t hartid; + +/** + * efi_riscv_get_boot_hartid() - return boot hart ID + * + * @this: RISCV_EFI_BOOT_PROTOCOL instance + * @boot_hartid caller allocated memory to return boot hart id + + * Return: status code + */ +static efi_status_t EFIAPI +efi_riscv_get_boot_hartid(struct riscv_efi_boot_protocol *this, + efi_uintn_t *boot_hartid) +{ + log_err(" efi_riscv_get_boot_hartid ENTER\n"); + if ((this == NULL) || (boot_hartid == NULL)) + return EFI_INVALID_PARAMETER; + + *boot_hartid = hartid; + + return EFI_SUCCESS; +} + +static const struct riscv_efi_boot_protocol riscv_efi_boot_prot = { + .revision = RISCV_EFI_BOOT_PROTOCOL_REVISION, + .get_boot_hartid = efi_riscv_get_boot_hartid +}; + +/** + * efi_riscv_register() - register RISCV_EFI_BOOT_PROTOCOL + * + * + * Return: status code + */ +efi_status_t efi_riscv_register(void) +{ + efi_status_t ret = EFI_SUCCESS; + + /* save boot hart id since gd is not accessible after launching + * the kernel + */ + hartid = gd->arch.boot_hart; + + ret = efi_add_protocol(efi_root, &efi_guid_riscv_boot_protocol, + (void *)&riscv_efi_boot_prot); + if (ret != EFI_SUCCESS) { + log_err("Cannot install RISCV_EFI_BOOT_PROTOCOL\n"); + } + return ret; +} diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index 49172e3579..380adc15c8 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -247,6 +247,12 @@ efi_status_t efi_init_obj_list(void) goto out; } + if (IS_ENABLED(CONFIG_EFI_RISCV_BOOT_PROTOCOL)) { + ret = efi_riscv_register(); + if (ret != EFI_SUCCESS) + goto out; + } + /* Secure boot */ ret = efi_init_secure_boot(); if (ret != EFI_SUCCESS) -- 2.25.1