From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail03.groups.io (mail03.groups.io [45.79.227.220]) by spool.mail.gandi.net (Postfix) with ESMTPS id D98AE740035 for ; Thu, 11 Apr 2024 11:15:06 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=xLa4qjQRvgvtUrNS4bynvr2hpiZ56pDjKUWG4Cq8URQ=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1712834105; v=1; b=s4GR4vBWSmoc5iXYJcQ9yG88tG3rV1y+XdUs1RuAdCJyIH5ZhYrU60/n2b4t40tKMoFpXnrl 5By+84BVwxf7p7TVoAYurpaJQxch3OmFXCnIFPq0ZDmeI2wJf2LfLnZtt+C+Sw+N2yrNg49jXC9 LSgDIsL6XO3z3AtHqfL0O2D6AJmIfDNL1Tnk5uIWSEHJT0681EqEsIEGb04suyPjk1K4+1Fx//o RDC2exiO4Ud6oR0YsrsfZd8ynfwjpfyCm+5BG/lIzw6Kb9528TFrurBwKj6s3GujW6QEPxN5sSp ZXEJ6kDX6OAqMCnr8FAMSehvm/w0eETUt36LYQahqonkg== X-Received: by 127.0.0.2 with SMTP id KSZjYY7687511xIEbRYTJePL; Thu, 11 Apr 2024 04:15:05 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by mx.groups.io with SMTP id smtpd.web10.15275.1712834104646596748 for ; Thu, 11 Apr 2024 04:15:04 -0700 X-CSE-ConnectionGUID: fd0MBVYzRIyw1w0IMKcmkg== X-CSE-MsgGUID: HBr5j4oWTo2+VrpPVvGATA== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8091949" X-IronPort-AV: E=Sophos;i="6.07,193,1708416000"; d="scan'208";a="8091949" X-Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2024 04:15:04 -0700 X-CSE-ConnectionGUID: FweZxU/FQsm4l2chQnjCYQ== X-CSE-MsgGUID: bQwBcp4uQ4COwoGNliiYDg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,193,1708416000"; d="scan'208";a="25385534" X-Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmviesa003.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 11 Apr 2024 04:15:04 -0700 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 11 Apr 2024 04:15:03 -0700 X-Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 11 Apr 2024 04:15:03 -0700 X-Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Thu, 11 Apr 2024 04:15:03 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.169) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 11 Apr 2024 04:15:03 -0700 X-Received: from MN6PR11MB8242.namprd11.prod.outlook.com (2603:10b6:208:474::11) by PH7PR11MB5959.namprd11.prod.outlook.com (2603:10b6:510:1e2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.26; Thu, 11 Apr 2024 11:15:01 +0000 X-Received: from MN6PR11MB8242.namprd11.prod.outlook.com ([fe80::d663:212b:6dcc:852e]) by MN6PR11MB8242.namprd11.prod.outlook.com ([fe80::d663:212b:6dcc:852e%7]) with mapi id 15.20.7430.045; Thu, 11 Apr 2024 11:15:01 +0000 From: "Dandan Bi" To: "Kuo, CindyX" , "devel@edk2.groups.io" CC: "Yao, Jiewen" , "Kumar, Rahul R" , "Tan, Ming" , "Chen, Arthur G" , "Chen, Xiao X" , "Chen, Tina" Subject: Re: [edk2-devel] [PATCH v3] SecurityPkg/OpalPasswordDxe: Update UI according to UEFI spec Thread-Topic: [PATCH v3] SecurityPkg/OpalPasswordDxe: Update UI according to UEFI spec Thread-Index: AQHai73oWAzwVMiRz0SvwsBbb5un4bFi62mA Date: Thu, 11 Apr 2024 11:15:00 +0000 Message-ID: References: <46e2b8943750c127746125f0265b91ab91a0a859.1712804652.git.cindyx.kuo@intel.com> In-Reply-To: <46e2b8943750c127746125f0265b91ab91a0a859.1712804652.git.cindyx.kuo@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8242:EE_|PH7PR11MB5959:EE_ x-ms-office365-filtering-correlation-id: f9aafc74-de15-422e-6d95-08dc5a18a118 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: xUUtv+t5LI/i6znpcPf3pwoL4kQzqnzI5/WVASzw/3GbskAIoMK2u0DiHcMkcp1fes8U4Aj1ytT5e5PQAIwm2R7KDQ3eHc5YuTHG1n1I2QO8qq8nvZawnW5xO1O/ETGZ/Fd5jO74xzm+FrFepPg0j3GFqcCi+UfchJ9CbH7E8M3zbgsqtXdDlcpy89Ak/O8P+yf5IT21+1pNdEEXYNpNcmmq7Kpw9U7JiHX0efyq50XeBIyOmNhRwuFCxISqavkyNVaI66RSQv9PT47BymE82JIGUsVZF1iAuJKFJQ0tJZIvN+2V4qOhIUDPvePISGgFPJUWhCa6acuvLmHvV1A5j8pyOvFKM5lbBa5B/ReShzNG+K3sz//HgbqilGk9NphRepdZybxmwC1J4exE6QIoVhpNXA6R6W3JpShWnTVPY6yUKIHo/Uhdcn2U9wn3zIbqfloxjBmmm1kbyxg7tjJATuyerCDrkRgC8wDCJvDKJ5n3ZyK8Q/wjixOKliumbxG8o6jNMCfBKcyUQZHmJVcVFsgdnAgw1QMqMUH/Xk4H2CQQAYEbpTEzt4HW5EryRzdSbGBxaJcO/B0UliPxgExRzKNQK9U1XHJdisa1vrQ2o8+tX+8t8pmGnSW9RuRwYt9Ph8o6OIW9GC6W3bFi+PgNADlF6lv+IhM+C9F42Z9rXOQ= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?iXuVsTbkZ+yc7ga6lb0FRbtI9N7eKRJYggUOObfBqOxpdnRNXoOqBvHxjYOj?= =?us-ascii?Q?R623KAGQlI5fMIWWyV2fOw5pYSqiyK4kUSb7HUooKC7kb/J8M4HhmwZyHVjf?= =?us-ascii?Q?NISkEFYR+PcE0B3pzYd/KkENnOx8/QZlnA+me3N8zFfVVZ6mpr81whyO17Qd?= =?us-ascii?Q?kIKHitgwRxdQgiCjZl0LPSEpBGI3l56RXraRKNdRlZyO3rlkH+xe7ztNi082?= =?us-ascii?Q?AyOTMyqzUIS9mmCvl3n2V+itjLzEYFSGpNzjPbxqV9KNJiLJ7kUBg5G1UTA9?= =?us-ascii?Q?clbqbI3Bl4QZcvbAYuQK2N2O6vMUE2BT+vmeKFaDseMTWrvBkJX0hr/1AmBF?= =?us-ascii?Q?UcTj1WeN3uTv2IhEq29XkoEUstQJowrxwZS/Mm/KJ7dmg8Xm/cYpJOVp9W2c?= =?us-ascii?Q?ugLUqigcTZFabr9psHeLkBcyf9nz0zh7JZKguTRl3BGtQeLdSnHvacjMGilD?= =?us-ascii?Q?o8DaEbKlHnbX9ZeGgue39NQ23mv5QWvlox9QFKL3ZcvcIwG+n4yMxMZu15d4?= =?us-ascii?Q?Zx1tZ0Us8Pw4VmLFAX9sgclvya/Aiek9ZoL8lqkaarGuuISpLqKJ2tPC0wFU?= =?us-ascii?Q?0mfXvITH23n0JUmMy6JKOfBF5hGKxFE+D+QiRPyQhwi+MRNrEJUReocF7BlH?= =?us-ascii?Q?4JGivy6mz+TTnHhQvG/uh45qvvz87tsztse/tUnlp2MO8+RzRsdANWqp7oi4?= =?us-ascii?Q?ilnEKFMIXgWo437sunkhWZ428J9FFg1s6wefKU4r6pjIEx4+VRYygJbIHTb4?= =?us-ascii?Q?c2AXvypkdzr+UrxfIsWh+msb80vlaMsxGdgj04au4QwbwRk4ZHRu8b/ud17C?= =?us-ascii?Q?gRPz7KDqlZGJj35zeRHitTDKh/33+jr0JBgFGwxO7ihw5sYuqxblDb2h/+DU?= =?us-ascii?Q?0wcMMDBRBtl7H240RL3+TXAohtsSE5IMNMq/yA+aTKug+hrnnWACyaCFvC2I?= =?us-ascii?Q?XeYpbp1BwDEcMkMRagpVZvgsqrVjR5kvXmng7JJU2dsGx7c/TAFt9oR1MdVd?= =?us-ascii?Q?w+85QUoGIFbkLJHr6ADtEkGerJjRxDLPwmjxJR7pnDW4v4mn03T73SDYvljq?= =?us-ascii?Q?RgOFOgdx5NE0RGowd8UaBtNzd+p3HTgmzsBxQgC5r7Bkqk/0LfeoWlr6dO89?= =?us-ascii?Q?toru1IvjDDx5xzd8J4A1fUVy35MPx5jmmDleUQWpKyqgq8pCfeGDNRVU6Uem?= =?us-ascii?Q?POx++w3NpNAY4RIRRYMnoO34ReAbhgnaX5fQeSedRkco7ySlk/1VuxDSAi5r?= =?us-ascii?Q?nIesHEkQZS+zw31tDm2t2Oh1U2pLyJyqG9QCgqSQd1b4BIi8FdMSbQ7G3LXl?= =?us-ascii?Q?egkTDzSaOW1cvRJtDpym+NYllLqjnUN3aiBwSmqon3dDQBeI4tqtSXamyGCt?= =?us-ascii?Q?sfxzCyMktm7XwdCPWSbr6e+zN7dZaOAEYI9BTWch7nyTW1YI7YobdHwrcOhB?= =?us-ascii?Q?sUtO/OFPB7MFySBiQFMAOTPQn3Mr/S4f/kbFoQxIlEufLwt3r/CsMvHzVBRZ?= =?us-ascii?Q?gmrRB9sOiP07RF0f+gnB9XizpxPc0DCzuxz6UBUnqTyBIxHn//BRzoUSXYbN?= =?us-ascii?Q?sARmQX2wN4N/3/Idih811AiJJOz8q5+6LoaIDVoA?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8242.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9aafc74-de15-422e-6d95-08dc5a18a118 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2024 11:15:00.7893 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 1fLEnM6UI3+qsNWJqcdG3xBX6TCj+CgAEZuRaRFOHFEFbxnIxfe2FaEmYSunVsWjRRTQiidJEsh5omrrHskWVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB5959 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 11 Apr 2024 04:15:04 -0700 Resent-From: dandan.bi@intel.com Reply-To: devel@edk2.groups.io,dandan.bi@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: XUoNrvdhvTKu8PacZnJrq8bGx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=s4GR4vBW; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.227.220 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: Dandan Bi Thanks, Dandan -----Original Message----- From: Kuo, CindyX =20 Sent: Thursday, April 11, 2024 11:11 AM To: devel@edk2.groups.io Cc: Kuo, CindyX ; Yao, Jiewen ;= Kumar, Rahul R ; Bi, Dandan = ; Tan, Ming ; Chen, Arthur G ;= Chen, Xiao X ; Chen, Tina Subject: [PATCH v3] SecurityPkg/OpalPasswordDxe: Update UI according to UEF= I spec REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4735 Should not call HiiGetBrowserData() and HiiSetBrowserData() in FORM_OPEN ca= ll back function. Those APIs are called within OpalHiiSetBrowserData/OpalHiiGetBrowserData which have been used by OpalHii.c. 1. Change callback action from FORM_OPEN to RETRIEVE. 2. Create dummy label with suppressif statement in VFR for form update usag= e. 3. Add HiiUpdateForm() to force reparsing the IFR binary. Cc: Jiewen Yao Cc: Rahul Kumar Cc: Dandan Bi Cc: Ming Tan Cc: Arthur Chen Cc: Xiao X Chen Cc: Tina Chen Signed-off-by: CindyX Kuo --- .../Tcg/Opal/OpalPassword/OpalDriver.h | 1 + SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c | 84 ++++++++++++++++--- .../Tcg/Opal/OpalPassword/OpalHiiFormValues.h | 6 ++ .../Tcg/Opal/OpalPa= ssword/OpalPasswordDxe.inf | 1 + .../Opal/OpalPassword/OpalPasswordForm.vfr | 8 +- 5 files changed, 87 insertions(+), 13 deletions(-) diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h b/SecurityPkg/T= cg/Opal/OpalPassword/OpalDriver.h index 2089bd81b6..1a4671c602 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h @@ -23,6 +23,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include #include +#include =20 #include #include diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c b/SecurityPkg/Tcg/= Opal/OpalPassword/OpalHii.c index 8035f44ebe..47af4fee40 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c @@ -40,6 +40,7 @@ EFI_HII_HANDLE gHiiPackageListHandle =3D NULL; // const EFI_GUID gHiiPackageListGuid =3D PACKAGE_LIST_GUID; const EFI_GUID gHiiSetupVariableGuid =3D SETUP_VARIABLE_GUID; +const EFI_GUID gOpalSetupFormSetGuid =3D SETUP_FORMSET_GUID; =20 // // Structure that contains state of the HII @@ -611,10 +612,15 @@ DriverCa= llback ( EFI_BROWSER_ACTION_REQUEST *ActionRequest ) { - HII_KEY HiiKey; - UINT8 HiiKeyId; - UINT32 PpRequest; - OPAL_DISK *OpalDisk; + HII_KEY HiiKey; + UINT8 HiiKeyId; + UINT32 PpRequest; + OPAL_DISK *OpalDisk; + EFI_STATUS Status; + VOID *StartOpCodeHandle; + VOID *EndOpCodeHandle; + EFI_IFR_GUID_LABEL *StartLabel; + EFI_IFR_GUID_LABEL *EndLabel; =20 if (ActionRequest !=3D NULL) { *ActionRequest =3D EFI_BROWSER_ACTION_REQUEST_NONE; @@ -632,15 +638,69= @@ DriverCallback ( HiiKey.Raw =3D QuestionId; HiiKeyId =3D (UINT8)HiiKey.KeyBits.Id; =20 - if (Action =3D=3D EFI_BROWSER_ACTION_FORM_OPEN) { - switch (HiiKeyId) { - case HII_KEY_ID_VAR_SUPPORTED_DISKS: - DEBUG ((DEBUG_INFO, "HII_KEY_ID_VAR_SUPPORTED_DISKS\n")); - return HiiPopulateMainMenuForm (); + if (Action =3D=3D EFI_BROWSER_ACTION_RETRIEVE) { + if ((HiiKeyId =3D=3D HII_KEY_ID_VAR_SUPPORTED_DISKS) || (HiiKeyId =3D= =3D HII_KEY_ID_VAR_SELECTED_DISK_AVAILABLE_ACTIONS)) { + // + // Allocate space for creation of UpdateData Buffer + // + StartOpCodeHandle =3D HiiAllocateOpCodeHandle (); + if (StartOpCodeHandle =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + + EndOpCodeHandle =3D HiiAllocateOpCodeHandle (); + if (EndOpCodeHandle =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + + // + // Create Hii Extend Label OpCode as the start opcode + // + StartLabel =3D (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCo= de (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL)= ); + StartLabel->ExtendOpCode =3D EFI_IFR_EXTEND_OP_LABEL; + + // + // Create Hii Extend Label OpCode as the end opcode + // + EndLabel =3D (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode= (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL)); + EndLabel->ExtendOpCode =3D EFI_IFR_EXTEND_OP_LABEL; + + switch (HiiKeyId) { + case HII_KEY_ID_VAR_SUPPORTED_DISKS: + DEBUG ((DEBUG_INFO, "HII_KEY_ID_VAR_SUPPORTED_DISKS\n")); + Status =3D HiiPopulateMainMenuForm (); + + StartLabel->Number =3D OPAL_MAIN_MENU_LABEL_START; + EndLabel->Number =3D OPAL_MAIN_MENU_LABEL_END; + HiiUpdateForm ( + gHiiPackageListHandle, + (EFI_GUID *)&gOpalSetupFormSetGuid, + FORMID_VALUE_MAIN_MENU, + StartOpCodeHandle, + EndOpCodeHandle + ); + break; + + case HII_KEY_ID_VAR_SELECTED_DISK_AVAILABLE_ACTIONS: + DEBUG ((DEBUG_INFO, "HII_KEY_ID_VAR_SELECTED_DISK_AVAILABLE_ACTI= ONS\n")); + Status =3D HiiPopulateDiskInfoForm (); + + StartLabel->Number =3D OPAL_DISK_INFO_LABEL_START; + EndLabel->Number =3D OPAL_DISK_INFO_LABEL_END; + HiiUpdateForm ( + gHiiPackageListHandle, + (EFI_GUID *)&gOpalSetupFormSetGuid, + FORMID_VALUE_DISK_INFO_FORM_MAIN, + StartOpCodeHandle, + EndOpCodeHandle + ); + break; + } + + HiiFreeOpCodeHandle (StartOpCodeHandle); + HiiFreeOpCodeHandle (EndOpCodeHandle); =20 - case HII_KEY_ID_VAR_SELECTED_DISK_AVAILABLE_ACTIONS: - DEBUG ((DEBUG_INFO, "HII_KEY_ID_VAR_SELECTED_DISK_AVAILABLE_ACTION= S\n")); - return HiiPopulateDiskInfoForm (); + return Status; } } else if (Action =3D=3D EFI_BROWSER_ACTION_CHANGING) { switch (HiiKeyId) { diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h b/Securi= tyPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h index ab6957fc6f..0e098854ba 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h @@ -96,6 +96,12 @@ typedef struct { =20 #define HII_KEY(id) HII_KEY_WITH_INDEX(id, 0) =20 +/* Label */ +#define OPAL_MAIN_MENU_LABEL_START 0x6100 +#define OPAL_MAIN_MENU_LABEL_END 0x6101 +#define OPAL_DISK_INFO_LABEL_START 0x6200 +#define OPAL_DISK_INFO_LABEL_END 0x6201 + #define PACKAGE_LIST_GUID { 0xf0308176, 0x9058, 0x4153, { 0x93, 0x3d, 0xd= a, 0x2f, 0xdc, 0xc8, 0x3e, 0x44 } } =20 /* {410483CF-F4F9-4ece-848A-1958FD31CEB7} */ diff --git a/SecurityPkg/Tcg/= Opal/OpalPassword/OpalPasswordDxe.inf b/SecurityPkg/Tcg/Opal/OpalPassword/O= palPasswordDxe.inf index 87519198c0..89e72a74bc 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf @@ -69,6 +69,7 @@ [Guids] gEfiEndOfDxeEventGroupGuid ## CONSUMES ## Event gS3StorageDeviceInitListGuid ## SOMETIMES_PRODUCES ## U= NDEFINED + gEfiIfrTianoGuid ## CONSUMES =20 [Pcd] gEfiSecurityPkgTokenSpaceGuid.PcdSkipOpalPasswordPrompt ## CONSUMES dif= f --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr b/Security= Pkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr index f0d3e220b2..a1049686ff 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr @@ -25,8 +25,11 @@ formset form formid =3D FORMID_VALUE_MAIN_MENU, title =3D STRING_TOKEN(STR_OPAL); =20 - //CONFIG_VARIABLE(HII_KEY(HII_KEY_ID_VAR_SUPPORTED_DISKS), SupportedDi= sks, 0x0, 0xFFFF); suppressif TRUE; + label OPAL_MAIN_MENU_LABEL_START; + label OPAL_MAIN_MENU_LABEL_END; + + //CONFIG_VARIABLE(HII_KEY(HII_KEY_ID_VAR_SUPPORTED_DISKS),=20 + SupportedDisks, 0x0, 0xFFFF); numeric name =3D SupportedDisks, varid =3D OpalHiiConfig.SupportedDisks, @@ -149,6 +152,9 @@ form formid =3D FORMID_VALUE_DISK_INFO_FORM_MAIN, title =3D STRING_TOKEN(STR_OPAL); =20 suppressif TRUE; + label OPAL_DISK_INFO_LABEL_START; + label OPAL_DISK_INFO_LABEL_END; + numeric name =3D SelectedDiskAvailableActions, varid =3D OpalHiiConfig.SelectedDiskAvailableActions, -- 2.44.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117632): https://edk2.groups.io/g/devel/message/117632 Mute This Topic: https://groups.io/mt/105456188/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-