public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH 1/2] MdePkg: Tpm2Acpi.h: Fix incompatible change
@ 2017-01-11  8:12 Zhang, Chao B
  2017-01-11  8:12 ` [PATCH 2/2] SecurityPkg: Tcg2Smm: " Zhang, Chao B
  2017-01-11  8:15 ` [PATCH 1/2] MdePkg: Tpm2Acpi.h: " Yao, Jiewen
  0 siblings, 2 replies; 5+ messages in thread
From: Zhang, Chao B @ 2017-01-11  8:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: jiewen.yao, star.zeng, Chao Zhang

Fix incompatible change.  Some modules are still referencing old definition.

Cc: Star Zeng <star.zeng@intel.com>
Cc: Yao Jiewen <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
---
 MdePkg/Include/IndustryStandard/Tpm2Acpi.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/MdePkg/Include/IndustryStandard/Tpm2Acpi.h b/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
index 7578676..0ac1ae0 100644
--- a/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
+++ b/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
@@ -21,11 +21,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #define EFI_TPM2_ACPI_TABLE_REVISION_3  3
 #define EFI_TPM2_ACPI_TABLE_REVISION_4  4
+#define EFI_TPM2_ACPI_TABLE_REVISION    EFI_TPM2_ACPI_TABLE_REVISION_4
 
 typedef struct {
   EFI_ACPI_DESCRIPTION_HEADER Header;
-  UINT16                      PlatformClass;
-  UINT16                      Reserved;
+  // Flags field is replaced in version 4 and later
+  //    BIT0~15:  PlatformClass
+  //    BIT16~31: Reserved
+  UINT32                      Flags;
   UINT64                      AddressOfControlArea;
   UINT32                      StartMethod;
 //UINT8                       PlatformSpecificParameters[];
-- 
1.9.5.msysgit.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/2] SecurityPkg: Tcg2Smm: Fix incompatible change
  2017-01-11  8:12 [PATCH 1/2] MdePkg: Tpm2Acpi.h: Fix incompatible change Zhang, Chao B
@ 2017-01-11  8:12 ` Zhang, Chao B
  2017-01-11  8:17   ` Yao, Jiewen
  2017-01-11  8:15 ` [PATCH 1/2] MdePkg: Tpm2Acpi.h: " Yao, Jiewen
  1 sibling, 1 reply; 5+ messages in thread
From: Zhang, Chao B @ 2017-01-11  8:12 UTC (permalink / raw)
  To: edk2-devel; +Cc: jiewen.yao, star.zeng, Chao Zhang

Address incompatible change introduced in patch
8f07a374b1d0497b6676491de8cbe2f08f4f7e9f

Cc: Star Zeng <star.zeng@intel.com>
Cc: Yao Jiewen <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
---
 SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
index 1df2da8..0c3b19c 100644
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
@@ -77,14 +77,14 @@ EFI_TPM2_ACPI_TABLE  mTpm2AcpiTemplate = {
   {
     EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE,
     sizeof (mTpm2AcpiTemplate),
-    EFI_TPM2_ACPI_TABLE_REVISION_4,
+    EFI_TPM2_ACPI_TABLE_REVISION,
     //
     // Compiler initializes the remaining bytes to 0
     // These fields should be filled in in production
     //
   },
-  0, // 16-bit PlatformClass
-  0, // 16-bit Reserved
+  0, // BIT0~15:  PlatformClass
+     // BIT16~31: Reserved
   0, // Control Area
   EFI_TPM2_ACPI_TABLE_START_METHOD_TIS, // StartMethod
 };
-- 
1.9.5.msysgit.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] MdePkg: Tpm2Acpi.h: Fix incompatible change
  2017-01-11  8:12 [PATCH 1/2] MdePkg: Tpm2Acpi.h: Fix incompatible change Zhang, Chao B
  2017-01-11  8:12 ` [PATCH 2/2] SecurityPkg: Tcg2Smm: " Zhang, Chao B
@ 2017-01-11  8:15 ` Yao, Jiewen
  1 sibling, 0 replies; 5+ messages in thread
From: Yao, Jiewen @ 2017-01-11  8:15 UTC (permalink / raw)
  To: Zhang, Chao B, edk2-devel@lists.01.org; +Cc: Zeng, Star

Hi
Can we add more comment:
> +  //    BIT0~15:  PlatformClass // this field is only valid for version 4 and above.

With the comment update, reviewed-by: Jiewen.yao@intel.com

Thank you
Yao Jiewen

> -----Original Message-----
> From: Zhang, Chao B
> Sent: Wednesday, January 11, 2017 4:13 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Zeng, Star <star.zeng@intel.com>;
> Zhang, Chao B <chao.b.zhang@intel.com>
> Subject: [PATCH 1/2] MdePkg: Tpm2Acpi.h: Fix incompatible change
> 
> Fix incompatible change.  Some modules are still referencing old definition.
> 
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Yao Jiewen <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
> ---
>  MdePkg/Include/IndustryStandard/Tpm2Acpi.h | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
> b/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
> index 7578676..0ac1ae0 100644
> --- a/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
> +++ b/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
> @@ -21,11 +21,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
> KIND, EITHER EXPRESS OR IMPLIED.
> 
>  #define EFI_TPM2_ACPI_TABLE_REVISION_3  3
>  #define EFI_TPM2_ACPI_TABLE_REVISION_4  4
> +#define EFI_TPM2_ACPI_TABLE_REVISION
> EFI_TPM2_ACPI_TABLE_REVISION_4
> 
>  typedef struct {
>    EFI_ACPI_DESCRIPTION_HEADER Header;
> -  UINT16                      PlatformClass;
> -  UINT16                      Reserved;
> +  // Flags field is replaced in version 4 and later
> +  //    BIT0~15:  PlatformClass
> +  //    BIT16~31: Reserved
> +  UINT32                      Flags;
>    UINT64                      AddressOfControlArea;
>    UINT32                      StartMethod;
>  //UINT8                       PlatformSpecificParameters[];
> --
> 1.9.5.msysgit.1



^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] SecurityPkg: Tcg2Smm: Fix incompatible change
  2017-01-11  8:12 ` [PATCH 2/2] SecurityPkg: Tcg2Smm: " Zhang, Chao B
@ 2017-01-11  8:17   ` Yao, Jiewen
  2017-01-11  8:28     ` Zhang, Chao B
  0 siblings, 1 reply; 5+ messages in thread
From: Yao, Jiewen @ 2017-01-11  8:17 UTC (permalink / raw)
  To: Zhang, Chao B, edk2-devel@lists.01.org; +Cc: Zhang, Chao B, Zeng, Star

Hi
I think we should add assign PlatformClass to PcdGet8 (PcdTpmPlatformClass), if version is 4, to follow TCG spec.

You may want to submit another patch to resolve.

Reviewed-by: Jiewen.yao@intel.com


Thank you
Yao Jiewen

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Zhang,
> Chao B
> Sent: Wednesday, January 11, 2017 4:13 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Zhang, Chao B
> <chao.b.zhang@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [edk2] [PATCH 2/2] SecurityPkg: Tcg2Smm: Fix incompatible change
> 
> Address incompatible change introduced in patch
> 8f07a374b1d0497b6676491de8cbe2f08f4f7e9f
> 
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Yao Jiewen <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
> ---
>  SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
> b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
> index 1df2da8..0c3b19c 100644
> --- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
> +++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
> @@ -77,14 +77,14 @@ EFI_TPM2_ACPI_TABLE  mTpm2AcpiTemplate = {
>    {
>      EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE,
>      sizeof (mTpm2AcpiTemplate),
> -    EFI_TPM2_ACPI_TABLE_REVISION_4,
> +    EFI_TPM2_ACPI_TABLE_REVISION,
>      //
>      // Compiler initializes the remaining bytes to 0
>      // These fields should be filled in in production
>      //
>    },
> -  0, // 16-bit PlatformClass
> -  0, // 16-bit Reserved
> +  0, // BIT0~15:  PlatformClass
> +     // BIT16~31: Reserved
>    0, // Control Area
>    EFI_TPM2_ACPI_TABLE_START_METHOD_TIS, // StartMethod
>  };
> --
> 1.9.5.msysgit.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] SecurityPkg: Tcg2Smm: Fix incompatible change
  2017-01-11  8:17   ` Yao, Jiewen
@ 2017-01-11  8:28     ` Zhang, Chao B
  0 siblings, 0 replies; 5+ messages in thread
From: Zhang, Chao B @ 2017-01-11  8:28 UTC (permalink / raw)
  To: Yao, Jiewen, edk2-devel@lists.01.org; +Cc: Zeng, Star

Hi Jiewen:
   I will give another patch for the PCD configuration. Thanks for your comment.

-----Original Message-----
From: Yao, Jiewen 
Sent: Wednesday, January 11, 2017 4:18 PM
To: Zhang, Chao B <chao.b.zhang@intel.com>; edk2-devel@lists.01.org
Cc: Zhang, Chao B <chao.b.zhang@intel.com>; Zeng, Star <star.zeng@intel.com>
Subject: RE: [edk2] [PATCH 2/2] SecurityPkg: Tcg2Smm: Fix incompatible change

Hi
I think we should add assign PlatformClass to PcdGet8 (PcdTpmPlatformClass), if version is 4, to follow TCG spec.

You may want to submit another patch to resolve.

Reviewed-by: Jiewen.yao@intel.com


Thank you
Yao Jiewen

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of 
> Zhang, Chao B
> Sent: Wednesday, January 11, 2017 4:13 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Zhang, Chao B 
> <chao.b.zhang@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [edk2] [PATCH 2/2] SecurityPkg: Tcg2Smm: Fix incompatible 
> change
> 
> Address incompatible change introduced in patch 
> 8f07a374b1d0497b6676491de8cbe2f08f4f7e9f
> 
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Yao Jiewen <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
> ---
>  SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
> b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
> index 1df2da8..0c3b19c 100644
> --- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
> +++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
> @@ -77,14 +77,14 @@ EFI_TPM2_ACPI_TABLE  mTpm2AcpiTemplate = {
>    {
>      EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE,
>      sizeof (mTpm2AcpiTemplate),
> -    EFI_TPM2_ACPI_TABLE_REVISION_4,
> +    EFI_TPM2_ACPI_TABLE_REVISION,
>      //
>      // Compiler initializes the remaining bytes to 0
>      // These fields should be filled in in production
>      //
>    },
> -  0, // 16-bit PlatformClass
> -  0, // 16-bit Reserved
> +  0, // BIT0~15:  PlatformClass
> +     // BIT16~31: Reserved
>    0, // Control Area
>    EFI_TPM2_ACPI_TABLE_START_METHOD_TIS, // StartMethod  };
> --
> 1.9.5.msysgit.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-11  8:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-11  8:12 [PATCH 1/2] MdePkg: Tpm2Acpi.h: Fix incompatible change Zhang, Chao B
2017-01-11  8:12 ` [PATCH 2/2] SecurityPkg: Tcg2Smm: " Zhang, Chao B
2017-01-11  8:17   ` Yao, Jiewen
2017-01-11  8:28     ` Zhang, Chao B
2017-01-11  8:15 ` [PATCH 1/2] MdePkg: Tpm2Acpi.h: " Yao, Jiewen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox