From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: jian.j.wang@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Sun, 15 Sep 2019 22:57:32 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Sep 2019 22:57:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,492,1559545200"; d="scan'208";a="180330424" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga008.jf.intel.com with ESMTP; 15 Sep 2019 22:57:32 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 15 Sep 2019 22:57:31 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 15 Sep 2019 22:57:31 -0700 Received: from shsmsx107.ccr.corp.intel.com ([169.254.9.89]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.146]) with mapi id 14.03.0439.000; Mon, 16 Sep 2019 13:57:29 +0800 From: "Wang, Jian J" To: "Gao, Liming" , "devel@edk2.groups.io" CC: "Zhang, Chao B" Subject: Re: [Patch v2] SecurityPkg Tcg2Config: Move common definitions to new Tcg2Internal.h Thread-Topic: [Patch v2] SecurityPkg Tcg2Config: Move common definitions to new Tcg2Internal.h Thread-Index: AQHVaTBKm3PgvZ9JjE6iZA5pe9Du3qct1NGA Date: Mon, 16 Sep 2019 05:57:29 +0000 Message-ID: References: <1568268405-780-1-git-send-email-liming.gao@intel.com> In-Reply-To: <1568268405-780-1-git-send-email-liming.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGE0NjQ2ZTItMDU1Yi00NWM5LWEwZGEtZDdhYjRhZjQ0NmM4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiN0xBbUNubDJCNWIyaG5hQUszTnRpSlNSaHY1eExwcEFMbGpkRUhCcGZaS2g2VjFqKzgzTlA1bHJWRXNaVzRORSJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: jian.j.wang@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jian J Wang > -----Original Message----- > From: Gao, Liming > Sent: Thursday, September 12, 2019 2:07 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Zhang, Chao B > > Subject: [Patch v2] SecurityPkg Tcg2Config: Move common definitions to ne= w > Tcg2Internal.h >=20 > Common definitions are not consumed by VFR. They are not required to be > defined in Tcg2ConfigNvData.h with WA way. New shared internal header > file is added to include those common definitions. >=20 > Cc: Jian Wang > Cc: Chao Zhang > Signed-off-by: Liming Gao > --- > In V2: > Keep struct TCG2_DEVICE_DETECTION in Tcg2ConfigNvData.h. > Only remove BUGBUG definition. >=20 > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c | 1 + > SecurityPkg/Tcg/Tcg2Config/TpmDetection.c | 1 + > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf | 1 + > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h | 3 +++ > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h | 35 ---------------------= ------ > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 1 + > SecurityPkg/Tcg/Tcg2Config/Tcg2Internal.h | 26 ++++++++++++++++++++ > 7 files changed, 33 insertions(+), 35 deletions(-) > create mode 100644 SecurityPkg/Tcg/Tcg2Config/Tcg2Internal.h >=20 > diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c > b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c > index a50a128766..a15919685e 100644 > --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c > +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c > @@ -23,6 +23,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include >=20 > #include "Tcg2ConfigNvData.h" > +#include "Tcg2Internal.h" >=20 > TPM_INSTANCE_ID mTpmInstanceId[] =3D TPM_INSTANCE_ID_LIST; >=20 > diff --git a/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c > b/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c > index 2f220c6c90..eeaadc5e2f 100644 > --- a/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c > +++ b/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c > @@ -20,6 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include >=20 > #include "Tcg2ConfigNvData.h" > +#include "Tcg2Internal.h" >=20 > /** > This routine check both SetupVariable and real TPM device, and return = final > TpmDevice configuration. > diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > index 866e47d23e..6417ab82a1 100644 > --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > @@ -30,6 +30,7 @@ > Tcg2Config.vfr > Tcg2ConfigStrings.uni > Tcg2ConfigNvData.h > + Tcg2Internal.h >=20 > [Packages] > MdePkg/MdePkg.dec > diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h > b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h > index 4b0e18dfbb..af542d52ef 100644 > --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h > +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.h > @@ -36,6 +36,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include >=20 > #include "Tcg2ConfigNvData.h" > +#include "Tcg2Internal.h" > + > +#define TCG2_PROTOCOL_VERSION_DEFAULT 0x0001 >=20 > // > // Tool generated IFR binary data and String package data > diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h > b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h > index d0a124684f..a91c052850 100644 > --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h > +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h > @@ -13,15 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include > #include >=20 > -// > -// BUGBUG: In order to pass VfrCompiler, we have to redefine below MACRO= , > which already in . > -// > -#ifndef __TCG2_H__ > -#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 0x00000001 > -#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_2 0x00000002 > -#endif > -#define EFI_TCG2_EVENT_LOG_FORMAT_ALL > (EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 | > EFI_TCG2_EVENT_LOG_FORMAT_TCG_2) > - > #define TCG2_CONFIGURATION_VARSTORE_ID 0x0001 > #define TCG2_CONFIGURATION_INFO_VARSTORE_ID 0x0002 > #define TCG2_VERSION_VARSTORE_ID 0x0003 > @@ -55,9 +46,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #define TPM_DEVICE_INTERFACE_MAX TPM_DEVICE_INTERFACE_PTP_FIFO > #define TPM_DEVICE_INTERFACE_DEFAULT > TPM_DEVICE_INTERFACE_PTP_CRB >=20 > -#define TCG2_PROTOCOL_VERSION_DEFAULT 0x0001 > -#define EFI_TCG2_EVENT_LOG_FORMAT_DEFAULT > EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 > - > #define TCG2_PPI_VERSION_1_2 0x322E31 // "1.2" > #define TCG2_PPI_VERSION_1_3 0x332E31 // "1.3" >=20 > @@ -97,27 +85,4 @@ typedef struct { > #define TCG2_DEVICE_DETECTION_NAME L"TCG2_DEVICE_DETECTION" > #define TCG2_VERSION_NAME L"TCG2_VERSION" >=20 > -#define TPM_INSTANCE_ID_LIST { \ > - {TPM_DEVICE_INTERFACE_NONE, TPM_DEVICE_NULL}, \ > - {TPM_DEVICE_INTERFACE_TPM12, TPM_DEVICE_1_2}, \ > - {TPM_DEVICE_INTERFACE_TPM20_DTPM, TPM_DEVICE_2_0_DTPM}, \ > -} > - > -// > -// BUGBUG: In order to pass VfrCompiler, we have to redefine GUID here. > -// > -#ifndef __BASE_H__ > -typedef struct { > - UINT32 Data1; > - UINT16 Data2; > - UINT16 Data3; > - UINT8 Data4[8]; > -} GUID; > -#endif > - > -typedef struct { > - GUID TpmInstanceGuid; > - UINT8 TpmDevice; > -} TPM_INSTANCE_ID; > - > #endif > diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > index 837cbd12f0..f2aa3234ad 100644 > --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > @@ -28,6 +28,7 @@ > [Sources] > Tcg2ConfigPeim.c > Tcg2ConfigNvData.h > + Tcg2Internal.h > TpmDetection.c >=20 > [Packages] > diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2Internal.h > b/SecurityPkg/Tcg/Tcg2Config/Tcg2Internal.h > new file mode 100644 > index 0000000000..6ed1015ef2 > --- /dev/null > +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2Internal.h > @@ -0,0 +1,26 @@ > +/** @file > + The internal header file defines the common structures for PEI and DXE > modules. > + > +Copyright (c) 2019, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef __TCG2_INTERNAL_H__ > +#define __TCG2_INTERNAL_H__ > + > +#define EFI_TCG2_EVENT_LOG_FORMAT_DEFAULT > EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 > +#define EFI_TCG2_EVENT_LOG_FORMAT_ALL > (EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 | > EFI_TCG2_EVENT_LOG_FORMAT_TCG_2) > + > +#define TPM_INSTANCE_ID_LIST { \ > + {TPM_DEVICE_INTERFACE_NONE, TPM_DEVICE_NULL}, \ > + {TPM_DEVICE_INTERFACE_TPM12, TPM_DEVICE_1_2}, \ > + {TPM_DEVICE_INTERFACE_TPM20_DTPM, TPM_DEVICE_2_0_DTPM}, \ > +} > + > +typedef struct { > + GUID TpmInstanceGuid; > + UINT8 TpmDevice; > +} TPM_INSTANCE_ID; > + > +#endif > -- > 2.13.0.windows.1