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 E5A35D811C7 for ; Thu, 11 Apr 2024 15:45:07 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=rAIlDariL5Qm7EfcbEYEdUgzuuyzoX08uOHx6/tXcT0=; 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=1712850306; v=1; b=CQzNUYuACFo3Dh+wsX2qS9jaC6/wccvLFIxRvM0aOUvg6HJsO6la6+mmLV7EsB9fpsvLVseR 6oH0HVzjY32Y5V9nDRNJtsWo2wOT78saVjEpoItcc0oGwBjehQkRJEDuL1Dt6tU1+ndhf02Lw6q 0q4+ZqZ2BiUqDyj6Lut/dBZDCTCF8O7Ci8+mWOhDGHFsIj8oi4bBaz3rDKZreC/KMY51UjMrzus xB1v4xtYnQ0BF9anoJZfT4XYI94jvoCxFg2J4sf3lmpmje8T1QyW7o5hOh38BQdG91Pr00VjqT7 nFYjrvVFYvS4Xc68VAraBNs4zdCsKs6EtoTDV6Xb/EG0A== X-Received: by 127.0.0.2 with SMTP id bchMYY7687511xCI2pNv7qJH; Thu, 11 Apr 2024 08:45:06 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by mx.groups.io with SMTP id smtpd.web11.21586.1712850305520995903 for ; Thu, 11 Apr 2024 08:45:05 -0700 X-CSE-ConnectionGUID: d+5JjRBBQDaCYT0TpO43tA== X-CSE-MsgGUID: WaI7PUoSRKamt2Sh90mm2A== X-IronPort-AV: E=McAfee;i="6600,9927,11041"; a="12120048" X-IronPort-AV: E=Sophos;i="6.07,193,1708416000"; d="scan'208";a="12120048" X-Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2024 08:45:05 -0700 X-CSE-ConnectionGUID: G43rUQgDSpmRbawltYII5Q== X-CSE-MsgGUID: 7n4GwT8BQiS92riE5XCr3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,193,1708416000"; d="scan'208";a="51896495" X-Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa002.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 11 Apr 2024 08:45:05 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) 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 08:45:04 -0700 X-Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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 08:45:04 -0700 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.169) by edgegateway.intel.com (134.134.137.103) 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 08:45:03 -0700 X-Received: from MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by PH7PR11MB8598.namprd11.prod.outlook.com (2603:10b6:510:2fd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.25; Thu, 11 Apr 2024 15:45:01 +0000 X-Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::be3f:5a4f:5180:2ba9]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::be3f:5a4f:5180:2ba9%4]) with mapi id 15.20.7472.025; Thu, 11 Apr 2024 15:45:01 +0000 From: "Yao, Jiewen" To: "Bi, Dandan" , "Kuo, CindyX" , "devel@edk2.groups.io" CC: "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: AQHai73p5TO+Ie3Oe0yX27CfjkVh37Fi64AAgABK7gA= Date: Thu, 11 Apr 2024 15:45:01 +0000 Message-ID: References: <46e2b8943750c127746125f0265b91ab91a0a859.1712804652.git.cindyx.kuo@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW4PR11MB5872:EE_|PH7PR11MB8598:EE_ x-ms-office365-filtering-correlation-id: c9f87f1f-dc49-486d-402a-08dc5a3e593b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: uVkIwAE2HYIqIqUoMX6IWxmCuAeO4qrnjS9/oF5GgidNAce1H8HbSOjUfmSEL9Hcmv4KGoFqbp4lUgoKcCBd8wL3mEfQ+3yCEYdcHgWEZkPAoI4/sSf/kHEFRrV//kGkACrtwswZddXMf7+b33LF/rJXyOHnDsAOLpgBw6+w/Q+t3KPXIswWAkvQP5GFidt/wGoel8t6Fn4LeYMOaALipMCJrbF/uFRkQFl65RcpLY4PAvDyn3yXlVHdu4W02hNakQ0z/HRW1d8v8VfZ+ve124W2vj082RlFj0Fqm50A4EtHZa2RKkCCll7Sdd/YMCWjEQOyjau8oVVnDPM7jQoqOwtk/JAyj+x20dGm15eNQ7IcQIGg6CUrfem2AZVKg2Ue7lb3MFKDWepa9lcFkU9ZrNMf7X9ZjaKIX9/xifE3Rw9VlfLkHBXT++HRr0g5lU7XaDRr4CA3zevDGuTzv8+NNIZah+VOvQ3YmPVBnn56tNqrf9E2mazc3vQNywLddqQZyQJyEbmjOq421hTr8qlLZeTWiOhtAY79ugSaSDIaeJJ4FbMUsniW7zHRUs6alVrvT5aCieJvSu+9JzaIsh/a/oiwcGkRymctLn2CrvyLgo1hMilhq2TpCeSzrEv81VFXBAyiS128VAbMb1j7Hg0OcFquOPNVOXY8rvRdE0JEun4= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Qgu/QrgRJcE97SBRnjREDDVrOWRpvVBSdfT4s+iLCo/KVg1aUxiOLZjEQjrZ?= =?us-ascii?Q?WiGHWeiSNLLVOi0RCcuWP4ZyB4MOi7t1hsGNpYeZkTAxqIlo4diPhT+uqpoA?= =?us-ascii?Q?c9UrlgQxa5SwT4ueVZtMV9WLn4OBTqIfrGQRWipSDZK4aTAu+/HZP9lDeNRU?= =?us-ascii?Q?agbIlfpH6snUsevJOsdyJfkdxJQQUjMq8tk0WN4+pV9+My53kMaNb1MMltv6?= =?us-ascii?Q?w6NQXtV9b1/SKOj785J/qb+6+XCMXWrZd+XYEExlLV3n8e3HRbQ+vPwJug1/?= =?us-ascii?Q?yT9npAv3PaEVNhV1RK23K2IqH0K/NkUY17qp/1SD6+xLI4trn1B5AW+bU8+m?= =?us-ascii?Q?m5Z+3fp/4eE+mctGbO+3gT82WC+KVOaTytrOUbnPRBshW8oonXI50VaGwOIj?= =?us-ascii?Q?qHBWdvC/VlC9rZAsuRJne6Dzjg278yEON9YLi04BQCVN5s62JWWCdekuu3N8?= =?us-ascii?Q?jBhJSen2Yk8gwOPUMkuRavjFzb35XXefKlt4ZpP+fII9KelmTwDs2UZiNSxM?= =?us-ascii?Q?hXMntcbcozRHUixSkYrXVmMoN3e+a9d6AtmjodFYrpBJe1gdEWWCQCQqnO0R?= =?us-ascii?Q?Ct9ctjlw8hGfE7QJHbFT5NmNfJ4Y5r5ECFsspxEkwm3biPPfyjSmo/6nfRrq?= =?us-ascii?Q?FuzYnGLVW2SlWpQruF7QA3QLvwPFD2kFodhCaovzMK+EU2CUO2aEgW3Ga2oY?= =?us-ascii?Q?xzdg+CSi9kEKT32ZjBtZajCo1/FNEcB+c36/faWgf0FkLJhb8ijYXSWCxzOo?= =?us-ascii?Q?sHpdFzUt8ghKVxb71WT6b7tKkkEdT9rDv1SwCOyfFw0tB5AjMG9Zx6e6sQxz?= =?us-ascii?Q?9k0WvhEL2vTmVFPdOGK3inmpdYX8AkreHYRpkLHLpJ50GComgE7yf9ZKF9EC?= =?us-ascii?Q?D2CxqO0RF6l7LSuAPyU41+i80yk0wtZ5CEEd/rmlJ9pc3oFxxYufZqpbO3Q6?= =?us-ascii?Q?pr4582UvO2P0QYz7odzMN+iJpPYVAErs1G6bi6tTj/ardi8wNjj/rWmvUqV8?= =?us-ascii?Q?vf6PayjdNVc/4T7TkJPMPrQXeCeogsWx8YAXr+nNIbsMP5MWQBfv7DJS+Y3Z?= =?us-ascii?Q?DRyCaHXwQpDXn4RH5/xOFZxrbffOEusJCBogh7dhavHtJ4QEZkHKsvcW12Zb?= =?us-ascii?Q?MbCQ/XfaNHDRjcUDVJ7NSpr/Lzd9z+27kayY1MxDD5q6U3sf1BtWuJW7jKIb?= =?us-ascii?Q?+5C6RpNHW6wkYKItsh8XcBitlaLPb81geyQyom+5kaioqtws578w43nyI0wW?= =?us-ascii?Q?1pDGiK8dkcMVvNAjO3uodleSPnmIBy+wuIKabulRqAlXGfMAfsCSbHJFgxRY?= =?us-ascii?Q?WgWZTnEuOGXZ05W3OnJyUCGqijxf7Qj2gUdb2oDwcHuYDP/uUlq2z8pv2Zje?= =?us-ascii?Q?w7rfUwR4rzCWEClHfWePTejmawyv8wo7kkLpVO1Q7N+v0ZeZX2NyWX5FgquV?= =?us-ascii?Q?MjP+37QJqC0NIUi5Dm48lzywZsNWTiyZFqgS7oF7dbJlWhYWZfuEwB4862Mg?= =?us-ascii?Q?bVRFzfI/MJeyjhCYwUU64uOk3CK2jfM3+DO9ZpjWv8GCE4JnDzvOrhhj1IQn?= =?us-ascii?Q?PN7sQZSln3Qd+cV0n6rZpMiB0IsnpoSaBmufg7Yx?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9f87f1f-dc49-486d-402a-08dc5a3e593b X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2024 15:45:01.0936 (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: RdcHzf0Vknm3cU1cCWZ69gPpKx51VhwjYE51tLARJGG3+i8RZmFlcWYBqzhP98wpvMr9BPH+7YlJf1D/CL7iCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB8598 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 08:45:05 -0700 Resent-From: jiewen.yao@intel.com Reply-To: devel@edk2.groups.io,jiewen.yao@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: wHABaZekPyjNLF30M2OUkXJyx7686176AA= 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=CQzNUYuA; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.227.220 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) Hi It seems this patch adds more change than just "update UI according to UEFI= spec". Please help me understand why we need below 2 and 3. Are you required for U= EFI spec update? > 2. Create dummy label with suppressif statement in VFR for form update us= age. > 3. Add HiiUpdateForm() to force reparsing the IFR binary. Thank you Yao, Jiewen > -----Original Message----- > From: Bi, Dandan > Sent: Thursday, April 11, 2024 7:15 PM > To: Kuo, CindyX ; devel@edk2.groups.io > Cc: Yao, Jiewen ; Kumar, Rahul R > ; Tan, Ming ; Chen, Arthur G > ; Chen, Xiao X ; Chen, Ti= na > > Subject: RE: [PATCH v3] SecurityPkg/OpalPasswordDxe: Update UI according = to > UEFI spec >=20 > Reviewed-by: Dandan Bi >=20 >=20 > Thanks, > Dandan > -----Original Message----- > From: Kuo, CindyX > 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 U= EFI > spec >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4735 >=20 > Should not call HiiGetBrowserData() and HiiSetBrowserData() in FORM_OPEN = call > back function. > Those APIs are called within OpalHiiSetBrowserData/OpalHiiGetBrowserData > which have been used by OpalHii.c. >=20 > 1. Change callback action from FORM_OPEN to RETRIEVE. > 2. Create dummy label with suppressif statement in VFR for form update us= age. > 3. Add HiiUpdateForm() to force reparsing the IFR binary. >=20 > 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/OpalPassword/OpalPasswordDxe.inf | 1 + > .../Opal/OpalPassword/OpalPasswordForm.vfr | 8 +- > 5 files changed, 87 insertions(+), 13 deletions(-) >=20 > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h > b/SecurityPkg/Tcg/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 @@ > DriverCallback ( > 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 *)HiiCreateGuidOp= Code > (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 *)HiiCreateGuidOpCo= de > (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_ACTIONS\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_ACTIONS\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/SecurityPkg/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, 0= xda, > 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/OpalPasswordDxe.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 ## > UNDEFINED > + gEfiIfrTianoGuid ## CONSUMES >=20 > [Pcd] > gEfiSecurityPkgTokenSpaceGuid.PcdSkipOpalPasswordPrompt ## CONSUMES > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr > b/SecurityPkg/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), > SupportedDisks, 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), > + 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 (#117634): https://edk2.groups.io/g/devel/message/117634 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-