SecurityPkg/TCG: Upgrade UEFI supporting TCG spec info

Update "TCG ACPI Specification Level 00 Revision 00.37" to "TCG ACPI Specification 1.2 Revision 8"
https://trustedcomputinggroup.org/wp-content/uploads/TCG_ACPIGeneralSpecification_v1.20_r8.pdf

Upgrade TCG PC Client Platform Physical Presence Interface Specification Version 1.3 Revision 0.52" to Errata Version 0.4
https://trustedcomputinggroup.org/wp-content/uploads/Errata-Version-0.4-for-TCG-PC-Client-Platform-Physical-Presence-Interface-Version-1.30-Revision-0.52.pdf

Upgrade "TCG EFI Protocol Specification for Family 2.0 Level 00" to Errata 0.5
https://trustedcomputinggroup.org/wp-content/uploads/EFI-Protocol-Specification-Errata-v.5.pdf

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yao Jiewen <jiewen.yao@intel.com>
Signed-off-by: Zhang, Chao B <chao.b.zhang@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 2708e7953c9cc7cf8a7bb296760089ef05dda851..7ae42ea150c2c23ad838087c7d983c033020045c 100644 (file)
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -405,7 +405,7 @@
   # @Prompt A physical presence user status\r
   gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|FALSE|BOOLEAN|0x00010019\r
 \r
-  ## Indicate the TPM2 ACPI table revision. Rev 4 is defined in TCG ACPI Specification Rev 00.37.<BR><BR>\r
+  ## Indicate the TPM2 ACPI table revision. Rev 4 has been defined since TCG ACPI Specification Rev 00.37.<BR><BR>\r
   # To support configuring from setup page, this PCD can be DynamicHii type and map to a setup option.<BR>\r
   # For example, map to TCG2_VERSION.Tpm2AcpiTableRev to be configured by Tcg2ConfigDxe driver.<BR>\r
   # gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS<BR>\r

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
index 87f0492750670ae9961ce1a629671fb0e97e416b..49402d902c835c5c9f6db03c86555037ebccc4c4 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
@@ -6,6 +6,8 @@
 #      along with\r
 #    "Errata for PC Client Specific Platform Firmware Profile Specification Version 1.0 Revision 1.03"\r
 #    "TCG EFI Protocol Specification" "Family 2.0" "Level 00 Revision 00.13"\r
+#      along with\r
+#    "Errata Version 0.5 for TCG EFI Protocol Specification"\r
 #\r
 #  This module will produce Tcg2 protocol and measure boot environment.\r
 #\r
@@ -14,7 +16,7 @@
 #  This external input must be validated carefully to avoid security issue like\r
 #  buffer overflow, integer overflow.\r
 #\r
-# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution. The full text of the license may be found at\r

diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
index 97cec443e4448ccee0ed10a0f10c68f184204c32..cc5768294d0126ea4320be0ac1460bd1fc09a62a 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
@@ -2,8 +2,10 @@
 #  Provides ACPI methods for TPM 2.0 support\r
 #\r
 #  Spec Compliance Info:\r
-#     "TCG ACPI Specification Level 00 Revision 00.37"\r
+#     "TCG ACPI Specification Version 1.2 Revision 8"\r
 #     "Physical Presence Interface Specification Version 1.30 Revision 00.52"\r
+#       along with\r
+#     "Errata Version 0.4 for TCG PC Client Platform Physical Presence Interface Specification"\r
 #     "Platform Reset Attack Mitigation Specification Version 1.00"\r
 #    TPM2.0 ACPI device object\r
 #     "TCG PC Client Platform Firmware Profile Specification for TPM Family 2.0 Level 00 Revision 1.03 v51"\r
@@ -18,7 +20,7 @@
 #  This driver will have external input - variable and ACPINvs data in SMM mode.\r
 #  This external input must be validated carefully to avoid security issue.\r
 #\r
-# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution. The full text of the license may be found at\r