From: "Yao, Jiewen" <jiewen.yao@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"Yao, Jiewen" <jiewen.yao@intel.com>,
"Xu, Min M" <min.m.xu@intel.com>
Cc: "Wang, Jian J" <jian.j.wang@intel.com>, Arti Gupta <ARGU@microsoft.com>
Subject: Re: [edk2-devel] [PATCH V1 1/1] SecurityPkg: Move TdTcg2Dxe from OvmfPkg to SecurityPkg
Date: Fri, 6 Jan 2023 10:45:55 +0000 [thread overview]
Message-ID: <MW4PR11MB5872D4AE99D91CD5263591748CFB9@MW4PR11MB5872.namprd11.prod.outlook.com> (raw)
In-Reply-To: <1737A9A8E5A24FDE.7095@groups.io>
Merged https://github.com/tianocore/edk2/pull/3862
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yao,
> Jiewen
> Sent: Friday, January 6, 2023 4:05 PM
> To: Xu, Min M <min.m.xu@intel.com>; devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Arti Gupta <ARGU@microsoft.com>
> Subject: Re: [edk2-devel] [PATCH V1 1/1] SecurityPkg: Move TdTcg2Dxe from
> OvmfPkg to SecurityPkg
>
> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
>
> > -----Original Message-----
> > From: Xu, Min M <min.m.xu@intel.com>
> > Sent: Wednesday, January 4, 2023 9:14 PM
> > To: devel@edk2.groups.io
> > Cc: Xu, Min M <min.m.xu@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>;
> > Wang, Jian J <jian.j.wang@intel.com>; Arti Gupta <ARGU@microsoft.com>
> > Subject: [PATCH V1 1/1] SecurityPkg: Move TdTcg2Dxe from OvmfPkg to
> > SecurityPkg
> >
> > From: Min M Xu <min.m.xu@intel.com>
> >
> > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4194
> >
> > The TdTcg2Dxe lives in the OvmfPkg instead of the SecurityPkg. Having
> > the TdTcg2Dxe at the same place as Tcg2Dxe will be easier for platforms to
> > consume.
> >
> > Definition of PcdCcEventlogAcpiTableLaml and PcdCcEventlogAcpiTableLasa
> > are also moved from OvmfPkg.dec to SecurityPkg.dec.
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Arti Gupta <ARGU@microsoft.com>
> > Signed-off-by: Min Xu <min.m.xu@intel.com>
> > ---
> > OvmfPkg/IntelTdx/IntelTdxX64.dsc | 2 +-
> > OvmfPkg/IntelTdx/IntelTdxX64.fdf | 2 +-
> > OvmfPkg/OvmfPkg.dec | 6 ------
> > SecurityPkg/SecurityPkg.dec | 6 ++++++
> > SecurityPkg/SecurityPkg.dsc | 5 +++++
> > .../Tcg}/TdTcg2Dxe/MeasureBootPeCoff.c | 0
> > {OvmfPkg/IntelTdx => SecurityPkg/Tcg}/TdTcg2Dxe/TdTcg2Dxe.c | 0
> > .../IntelTdx => SecurityPkg/Tcg}/TdTcg2Dxe/TdTcg2Dxe.inf | 5 ++---
> > 8 files changed, 15 insertions(+), 11 deletions(-)
> > rename {OvmfPkg/IntelTdx =>
> > SecurityPkg/Tcg}/TdTcg2Dxe/MeasureBootPeCoff.c (100%)
> > rename {OvmfPkg/IntelTdx => SecurityPkg/Tcg}/TdTcg2Dxe/TdTcg2Dxe.c
> > (100%)
> > rename {OvmfPkg/IntelTdx => SecurityPkg/Tcg}/TdTcg2Dxe/TdTcg2Dxe.inf
> > (93%)
> >
> > diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> > b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> > index 6ec64df91871..5bd74639b448 100644
> > --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> > +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> > @@ -774,7 +774,7 @@
> > #
> > # Cc Measurement Protocol for Td guest
> > #
> > - OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.inf {
> > + SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf {
> > <LibraryClasses>
> > HashLib|SecurityPkg/Library/HashLibTdx/HashLibTdx.inf
> >
> >
> NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.in
> > f
> > diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf
> > b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
> > index e79ad3e10217..a57bbcee8986 100644
> > --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf
> > +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
> > @@ -298,7 +298,7 @@ INF
> > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
> > #
> > # EFI_CC_MEASUREMENT_PROTOCOL
> > #
> > -INF OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.inf
> > +INF SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
> >
> >
> >
> ################################################################
> > ################
> >
> > diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
> > index 693925a1dc7a..e07546f4a701 100644
> > --- a/OvmfPkg/OvmfPkg.dec
> > +++ b/OvmfPkg/OvmfPkg.dec
> > @@ -459,12 +459,6 @@
> > # 2 - set by GOP Driver.
> > gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0|UINT8|0x64
> >
> > - ## This PCD records LAML field in CC EVENTLOG ACPI table.
> > -
> >
> gUefiOvmfPkgTokenSpaceGuid.PcdCcEventlogAcpiTableLaml|0|UINT32|0x66
> > -
> > - ## This PCD records LASA field in CC EVENTLOG ACPI table.
> > -
> >
> gUefiOvmfPkgTokenSpaceGuid.PcdCcEventlogAcpiTableLasa|0|UINT64|0x67
> > -
> > [PcdsFeatureFlag]
> >
> >
> gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE|BO
> > OLEAN|0x1c
> >
> >
> gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|
> > BOOLEAN|0x1d
> > diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
> > index 358b3dc543a1..8257f11d17c7 100644
> > --- a/SecurityPkg/SecurityPkg.dec
> > +++ b/SecurityPkg/SecurityPkg.dec
> > @@ -574,5 +574,11 @@
> > # @Prompt Tpm2AcpiTableLasa LASA field in TPM2 ACPI table.
> >
> >
> gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLasa|0|UINT64|0x000100
> > 23
> >
> > + ## This PCD records LAML field in CC EVENTLOG ACPI table.
> > +
> >
> gEfiSecurityPkgTokenSpaceGuid.PcdCcEventlogAcpiTableLaml|0|UINT32|0x0
> > 0010025
> > +
> > + ## This PCD records LASA field in CC EVENTLOG ACPI table.
> > +
> >
> gEfiSecurityPkgTokenSpaceGuid.PcdCcEventlogAcpiTableLasa|0|UINT64|0x00
> > 010026
> > +
> > [UserExtensions.TianoCore."ExtraFiles"]
> > SecurityPkgExtra.uni
> > diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
> > index 2f679c87a92f..3bad5375c01a 100644
> > --- a/SecurityPkg/SecurityPkg.dsc
> > +++ b/SecurityPkg/SecurityPkg.dsc
> > @@ -296,6 +296,11 @@
> > [Components.X64]
> > SecurityPkg/Library/HashLibTdx/HashLibTdx.inf
> >
> >
> SecurityPkg/Library/SecTpmMeasurementLib/SecTpmMeasurementLibTdx.in
> > f
> > + SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf {
> > + <LibraryClasses>
> > + HashLib|SecurityPkg/Library/HashLibTdx/HashLibTdx.inf
> > +
> >
> NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.in
> > f
> > + }
> >
> > [Components.IA32, Components.X64]
> >
> >
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig
> > Dxe.inf
> > diff --git a/OvmfPkg/IntelTdx/TdTcg2Dxe/MeasureBootPeCoff.c
> > b/SecurityPkg/Tcg/TdTcg2Dxe/MeasureBootPeCoff.c
> > similarity index 100%
> > rename from OvmfPkg/IntelTdx/TdTcg2Dxe/MeasureBootPeCoff.c
> > rename to SecurityPkg/Tcg/TdTcg2Dxe/MeasureBootPeCoff.c
> > diff --git a/OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.c
> > b/SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c
> > similarity index 100%
> > rename from OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.c
> > rename to SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.c
> > diff --git a/OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.inf
> > b/SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
> > similarity index 93%
> > rename from OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.inf
> > rename to SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
> > index 5efe7ef479f1..6861a1452d51 100644
> > --- a/OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.inf
> > +++ b/SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
> > @@ -31,7 +31,6 @@
> > MdeModulePkg/MdeModulePkg.dec
> > SecurityPkg/SecurityPkg.dec
> > CryptoPkg/CryptoPkg.dec
> > - OvmfPkg/OvmfPkg.dec
> >
> > [LibraryClasses]
> > MemoryAllocationLib
> > @@ -85,8 +84,8 @@
> > gEfiSecurityPkgTokenSpaceGuid.PcdTcg2NumberOfPCRBanks
> ##
> > CONSUMES
> > gEfiSecurityPkgTokenSpaceGuid.PcdTcgLogAreaMinLen ##
> > CONSUMES
> > gEfiSecurityPkgTokenSpaceGuid.PcdTcg2FinalLogAreaLen ##
> > CONSUMES
> > - gUefiOvmfPkgTokenSpaceGuid.PcdCcEventlogAcpiTableLaml
> ##
> > PRODUCES
> > - gUefiOvmfPkgTokenSpaceGuid.PcdCcEventlogAcpiTableLasa
> ##
> > PRODUCES
> > + gEfiSecurityPkgTokenSpaceGuid.PcdCcEventlogAcpiTableLaml
> ##
> > PRODUCES
> > + gEfiSecurityPkgTokenSpaceGuid.PcdCcEventlogAcpiTableLasa ##
> > PRODUCES
> > gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
> ##
> > CONSUMES
> > gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
> > ## CONSUMES
> > gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
> > ## CONSUMES
> > --
> > 2.29.2.windows.2
>
>
>
>
>
prev parent reply other threads:[~2023-01-06 10:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-04 13:14 [PATCH V1 1/1] SecurityPkg: Move TdTcg2Dxe from OvmfPkg to SecurityPkg Min Xu
2023-01-06 8:05 ` Yao, Jiewen
[not found] ` <1737A9A8E5A24FDE.7095@groups.io>
2023-01-06 10:45 ` Yao, Jiewen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MW4PR11MB5872D4AE99D91CD5263591748CFB9@MW4PR11MB5872.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox