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 C8B57C433EF for ; Fri, 17 Dec 2021 12:56:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BE6B083086; Fri, 17 Dec 2021 13:55:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="jrZBD/xE"; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="jrZBD/xE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8FB4683063; Fri, 17 Dec 2021 13:55:55 +0100 (CET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20616.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::616]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E2FA883007 for ; Fri, 17 Dec 2021 13:55:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Jose.Marinho@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BKZ7g3yfTqEpum7yWK5ezWKHH+6sHJbhucEuHeI7Vxk=; b=jrZBD/xECgTw6uoIbUjbrfuLXTs8cxoYzs5KyvQS8e6kjdjMBsv0KwRkMCEgCF7PsxC76AKA4bU7fXrBateo220eCQxMBRH3x65mmW2boMfDxdBq3VX9LXZJr9F1aL5lcFDgaqoEEl9H83aa3IhpRmdbvnfrT/cSbSVFdYkQVKY= Received: from DB6P18901CA0012.EURP189.PROD.OUTLOOK.COM (2603:10a6:4:16::22) by DBAPR08MB5719.eurprd08.prod.outlook.com (2603:10a6:10:1a6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Fri, 17 Dec 2021 12:55:48 +0000 Received: from DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:16:cafe::77) by DB6P18901CA0012.outlook.office365.com (2603:10a6:4:16::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 12:55:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT012.mail.protection.outlook.com (10.152.20.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 12:55:48 +0000 Received: ("Tessian outbound de6049708a0a:v110"); Fri, 17 Dec 2021 12:55:48 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ed3044887e7423e0 X-CR-MTA-TID: 64aa7808 Received: from 799c70e02e76.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 0FA51F52-5D0D-4545-9B84-10460543A872.1; Fri, 17 Dec 2021 12:55:37 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 799c70e02e76.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 17 Dec 2021 12:55:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lr5+3zuVGlg/w6DA9+J8enh7n5mUTdzfePQnbvaoAC4cjKed6SdQdHoeUaxTkB6thXpzZY+iyXIx8GwZBFpf714GcDG5b/hl7SgCgjitEuG2M8nBjuI6PEUM8IJmQ1kvO29QpKwi+4QvTfpvr8j4kRLS4nzr/+1fHW1R3FueylN/9F/MulWhTkDcF7A2OqWXHXfUUoE8z5c04DRpnQzAyTHMgUrAJs7QnAi5JtLQ7HyT/nCndsMxbvKdkhVMg8Zg8Hx7oTCnINgiXRNdBHS/A8qeqrTRUFCpDG5YJC0d2prQ+tr274mL59qaucvERQWQDg4JmgeON55RRTnYeyrSog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BKZ7g3yfTqEpum7yWK5ezWKHH+6sHJbhucEuHeI7Vxk=; b=Zx1526fWJ/DKxm+9wZ3UB5Z3kDNxK3J1c3RmmKFHhO7OOt/GWN9Atg1QjIgT4RHtvC+KEneI/3rB5GX1ACvdGClOqKNIEwx/d5PetDXO2BqCRabje1ik76Cen4Js/q+b2SE5n54Fe0GljABudVrZHmUg+eij0YGdR0fXH9qWa4XiG0kZG/X3xAbGdPFPsh3BY4KvmffzKiNaK92Ai0BIXzlv3GVaCW/CqLMkvRF+u7DKwgQVQEQRnpN5g8WGBikHaq3JNfL7IPtfH4feyMFTqyZwic3/zEJZ3WHDdvQsktQNhYsv3c314Kz/vZlb+gXw7ObWOI/kawAaGD/Z687kTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BKZ7g3yfTqEpum7yWK5ezWKHH+6sHJbhucEuHeI7Vxk=; b=jrZBD/xECgTw6uoIbUjbrfuLXTs8cxoYzs5KyvQS8e6kjdjMBsv0KwRkMCEgCF7PsxC76AKA4bU7fXrBateo220eCQxMBRH3x65mmW2boMfDxdBq3VX9LXZJr9F1aL5lcFDgaqoEEl9H83aa3IhpRmdbvnfrT/cSbSVFdYkQVKY= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from DBBPR08MB6012.eurprd08.prod.outlook.com (2603:10a6:10:205::9) by DBBPR08MB4629.eurprd08.prod.outlook.com (2603:10a6:10:f4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.18; Fri, 17 Dec 2021 12:55:36 +0000 Received: from DBBPR08MB6012.eurprd08.prod.outlook.com ([fe80::5d1b:4877:774f:275e]) by DBBPR08MB6012.eurprd08.prod.outlook.com ([fe80::5d1b:4877:774f:275e%9]) with mapi id 15.20.4801.015; Fri, 17 Dec 2021 12:55:36 +0000 From: Jose Marinho To: u-boot@lists.denx.de Cc: Jose Marinho , ilias.apalodimas@linaro.org, sughosh.ganu@linaro.org, xypron.glpk@gmx.de, takahiro.akashi@linaro.org, agraf@csgraf.de, nd@arm.com Subject: [PATCH 2/3] efi: ECPT add EBBRv2.0 conformance profile Date: Fri, 17 Dec 2021 12:55:05 +0000 Message-Id: <20211217125506.138902-3-jose.marinho@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211217125506.138902-1-jose.marinho@arm.com> References: <20211217125506.138902-1-jose.marinho@arm.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SN6PR08CA0012.namprd08.prod.outlook.com (2603:10b6:805:66::25) To DBBPR08MB6012.eurprd08.prod.outlook.com (2603:10a6:10:205::9) MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 891ff457-4398-4b8e-f9f9-08d9c15c8c56 X-MS-TrafficTypeDiagnostic: DBBPR08MB4629:EE_|DB5EUR03FT012:EE_|DBAPR08MB5719:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:6108;OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: ACYf1weILnsIUpwNjS9POvvG4fIShqccAgQybwFUsY/43AHfBYS82BWcIWg17jDh2AvKVZKosddYMhbzMsYhVPR/SRIisccgPz5LdLVTpJnzBLUIMBHGlmfcoe0Cheoxp+FFikzy/Q3hPr5esb/BdbnQoBEaEBwCa0guk0phjZL1NWySylvINq2STSwyflttSc1Bb8HPevM6tC+TwFCMCI4rZ0ZOqTO4L/Vk3//wWcY75AAWfYvFGmjGmqiYMrAmGeuJAy4vnMRAZD9DrmLUvfmBbZyqSBPrRuyGu4hgFLtP4oj4RzNrwtCj2bIcuQ3GpHOsiDNdWEl9Sy15SWWhErvguHRvZAVnP+FvJJRNPA2Ycbczr/usaWTbk8TH3+Gk0nFfGNBWNqidEDBQGubcwwp6PZLbu+oFZNptTh24/XuYYorzI2DsVq5S5RNHok2kJPbTlEtoBDciPQ9+0OYTUBn6XjyiZysrijdosZmIePxXtd4u123CueNKZicucWb6LUWnVE78t3Xu+/nQwl3nL//Hqu5Urf2K8nTZdAr4mn8QJpkbfRyzcn1WI0LftF4hMNEOkuTxJ1BFuGZN6qldsqP0xcf3PYLTkOck+xsvxI7FDGrpxArsl7BurwlpDVM2NhPOVIOlAusQMQ+00wmn6/M4zEzDpQVe96NfJhAfi6losk909eJQ0lXDnb+5o7ajSgS3DQGbCC2qCt+x76B9Bw== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR08MB6012.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(2906002)(38100700002)(38350700002)(1076003)(316002)(44832011)(5660300002)(6916009)(4326008)(26005)(36756003)(186003)(8676002)(8936002)(2616005)(508600001)(6506007)(6666004)(52116002)(6486002)(6512007)(66476007)(66556008)(66946007)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4629 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 30746947-3b54-44bc-d251-08d9c15c8491 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1UZtPuOY5ep4nz5R/UEmNUkiBvSYKg/PZddRatBIR/o+VFLpa1FYoIX8xT1x5lYs/XtxLAKrYWh3QJ5xDzQlf+ji+vK0GentBQMtUv9+natfZt+3w0dONW7ZbXwqxT/w4NcvzSJzEPFdwAWEK2zcOQrfb2x2xURj1nUV8qs87xzpMdYiTpe9DIt2mp3HLoAyrAwbV3M7gvumUW9b6f3acq6CmAZ4FCFocMtGJ8tsmegx7WWwwxwL4alNcAAdtBbb0qqrzNw6wbARk7mx/NaENnV3SNJZQr4LODY0AL6t3cqRQ3NHLszcmbGAcd3VXzAYr7Mgj6BepTmlYWY//uc9oXjSZq7h8vleteRqCGIMkHQWRM7rLt3OEH4lwTMwTMakrXRUu87hdnTiaRVSDRlh7+fTnfGgJ4p2/0BgSM/OjjrkD09GaZddDRBOU1JQ+vKg5dp9Rq3srv85LgqQT6NGGcluT9v4tf9QTHqRvr2UsTjzuCX4hNi3Kqkb/bGdFwPhT7/WAOYUWAz5Y2FgIDjw/QuwoTvUMHMNqvzOzcEs8mGJvjxNDEsuizhbiO+j5U7QIoNzdvqpx7gCEoPWbpEu2Prdt8EDXUa9533INJ7L7LKrrQduXOWhoXwfO1TsyxTMwS/+VWT8N/jKsGxWWbKuUcIeHa0N2tHGzeEya6bZs0h2HYRGLdMGbYJRFrp2y8mN1FZtQvjjLNO4rLNzL4ju6d+7jeGqdL4DRQu6omDS6QaQF9cNWWcv1RK5yMYWpUV5sPygzdMUL0AmXILBc5OolQ== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(40470700001)(86362001)(336012)(6486002)(82310400004)(6506007)(44832011)(2616005)(1076003)(4326008)(36756003)(26005)(186003)(6666004)(81166007)(47076005)(40460700001)(8936002)(5660300002)(8676002)(36860700001)(316002)(6916009)(70206006)(356005)(6512007)(2906002)(508600001)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 12:55:48.5228 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 891ff457-4398-4b8e-f9f9-08d9c15c8c56 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR08MB5719 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean Display the EBBRv2.0 conformance in the ECPT table. The EBBRv2.0 conformance profile is set in the ECPT if CONFIG_EFI_EBBR_2_0_CONFORMANCE=y. The config defaults to 'n'. Signed-off-by: Jose Marinho --- include/efi_api.h | 4 ++++ lib/efi_loader/Kconfig | 6 ++++++ lib/efi_loader/efi_conformance.c | 9 +++++++++ 3 files changed, 19 insertions(+) diff --git a/include/efi_api.h b/include/efi_api.h index 6fd4f04de3..49919caa35 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -230,6 +230,10 @@ enum efi_reset_type { EFI_GUID(0x36122546, 0xf7ef, 0x4c8f, 0xbd, 0x9b, \ 0xeb, 0x85, 0x25, 0xb5, 0x0c, 0x0b) +#define EFI_CONFORMANCE_PROFILE_EBBR_2_0_GUID \ + EFI_GUID(0xcce33c35, 0x74ac, 0x4087, 0xbc, 0xe7, \ + 0x8b, 0x29, 0xb0, 0x2e, 0xeb, 0x27) + struct efi_conformance_profiles_table { u16 version; u16 number_of_profiles; diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index b2398976f4..ab7476f68b 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -373,4 +373,10 @@ config EFI_ECPT help Enabling this option created the ECPT UEFI table. +config EFI_EBBR_2_0_CONFORMANCE + bool "Add the EBBRv2.0 conformance entry to the ECPT table" + depends on EFI_ECPT + default n + help + Enabling this option adds the EBBRv2.0 conformance entry to the ECPT UEFI table. endif diff --git a/lib/efi_loader/efi_conformance.c b/lib/efi_loader/efi_conformance.c index 86c26d6b79..b490ff3326 100644 --- a/lib/efi_loader/efi_conformance.c +++ b/lib/efi_loader/efi_conformance.c @@ -12,6 +12,7 @@ #include const efi_guid_t efi_ecpt_guid = EFI_CONFORMANCE_PROFILES_TABLE_GUID; +const efi_guid_t efi_ebbr_2_0_guid = EFI_CONFORMANCE_PROFILE_EBBR_2_0_GUID; #define EFI_CONFORMANCE_PROFILES_TABLE_VERSION 1 @@ -29,6 +30,9 @@ efi_status_t efi_ecpt_register(void) EFI_PRINT("ECPT table creation start\n"); + if (IS_ENABLED(CONFIG_EFI_EBBR_2_0_CONFORMANCE)) + num_entries++; + ecpt_size = num_entries * sizeof(efi_guid_t) + sizeof(struct efi_conformance_profiles_table); ret = efi_allocate_pool(EFI_BOOT_SERVICES_DATA, ecpt_size, @@ -44,6 +48,11 @@ efi_status_t efi_ecpt_register(void) ecpt->version = EFI_CONFORMANCE_PROFILES_TABLE_VERSION; ecpt->number_of_profiles = num_entries; + if (IS_ENABLED(CONFIG_EFI_EBBR_2_0_CONFORMANCE)) { + num_entries--; + guidcpy(&ecpt->conformance_profiles[num_entries], &efi_ecpt_guid); + } + if (num_entries) EFI_PRINT("ECPT check conformance profiles, not all entries populated in table\n"); -- 2.25.1