Hi Maggie, Thanks for your contribution!
Reviewed-by: Eric Dong <eric.d...@intel.com> And pushed: 8a9301cdd75439e781754014f514fa06d99140d1 Thanks, Eric > -----Original Message----- > From: Chu, Maggie > Sent: Wednesday, January 30, 2019 2:41 PM > To: edk2-devel@lists.01.org > Cc: Zhang, Chao B <chao.b.zh...@intel.com>; Yao, Jiewen > <jiewen....@intel.com>; Dong, Eric <eric.d...@intel.com> > Subject: [PATCH] SecurityPkg: Add a PCD to skip Opal password prompt > > https://bugzilla.tianocore.org/show_bug.cgi?id=1484 > Add a PCD for skipping password prompt and device unlock flow so that > other pre-OS applications are able to take over Opal devices unlock flow. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Maggie Chu <maggie....@intel.com> > Cc: Chao Zhang <chao.b.zh...@intel.com> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Eric Dong <eric.d...@intel.com> > --- > SecurityPkg/SecurityPkg.dec | 6 ++++++ > SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c | 4 ++++ > SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf | 3 +++ > 3 files changed, 13 insertions(+) > > diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec index > 2708e7953c..70c9ff28a8 100644 > --- a/SecurityPkg/SecurityPkg.dec > +++ b/SecurityPkg/SecurityPkg.dec > @@ -428,6 +428,12 @@ > # @Prompt Possible TPM2 Interrupt Number buffer > gEfiSecurityPkgTokenSpaceGuid.PcdTpm2PossibleIrqNumBuf|{0x00, 0x00, > 0x00, 0x00}|VOID*|0x0001001D > > + ## Indicates if Opal DXE driver skip unlock device flow.<BR><BR> > + # TRUE - Skip unlock device flow.<BR> > + # FALSE - Does not skip unlock device flow.<BR> > + # @Prompt Skip Opal DXE driver unlock device flow. > + > + > gEfiSecurityPkgTokenSpaceGuid.PcdSkipOpalDxeUnlock|FALSE|BOOLEAN|0 > x000 > + 10020 > + > [PcdsDynamic, PcdsDynamicEx] > > ## This PCD indicates Hash mask for TPM 2.0. Bit definition strictly > follows > TCG Algorithm Registry.<BR><BR> diff --git > a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > index 38268539fb..734c5f06ff 100644 > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > @@ -988,6 +988,10 @@ OpalDriverRequestPassword ( > > IsLocked = OpalDeviceLocked (&Dev->OpalDisk.SupportedAttributes, > &Dev->OpalDisk.LockingFeature); > > + if (IsLocked && PcdGetBool (PcdSkipOpalDxeUnlock)) { > + return; > + } > + > while (Count < MAX_PASSWORD_TRY_COUNT) { > Password = OpalDriverPopUpPasswordInput (Dev, PopUpString, NULL, > &PressEsc); > if (PressEsc) { > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf > index cfa55dded7..11e58b95cd 100644 > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf > +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordDxe.inf > @@ -75,5 +75,8 @@ > [Guids] > gEfiEndOfDxeEventGroupGuid ## CONSUMES ## > Event > > +[Pcd] > + gEfiSecurityPkgTokenSpaceGuid.PcdSkipOpalDxeUnlock ## CONSUMES > + > [Depex] > gEfiHiiStringProtocolGuid AND gEfiHiiDatabaseProtocolGuid > -- > 2.16.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
