SecurityPkg/Tcg2Config: Remove use of IoLib

Remove the use of the IoLib and Mmioxx() calls to detect dTPM.
This module calls the Tpm12DeviceLib to detect a TPM and the
implementation of the Tpm12DeviceLib for dTPM performs the same
Mmioxx() calls to detect a dTPM.  This change makes this module
more generic and portable by maximizing the use of the Tpm12DeviceLib
abstraction for TPM detection.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19725 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index cd6a92da1c99cd6c680f8bee0fc3fe0f8775cd1b..8dd0b63e48b112a2274b5f6f9e4c2ede7c212c1f 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
@@ -4,7 +4,7 @@
 #  This module initializes TPM device type based on variable and detection.\r
 #  NOTE: This module is only for reference only, each platform should have its own setup page.\r
 #\r
-# Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2015 - 2016, 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
@@ -49,7 +49,6 @@
   DebugLib\r
   PcdLib\r
   TimerLib\r
-  IoLib\r
   Tpm12CommandLib\r
   Tpm12DeviceLib\r
 \r

diff --git a/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c b/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c
index 33f3a21d87b6fb08dc02f9e34288cf1c2c3346ad..7e6ca44205a64b9b87a87be508e3e0228655339b 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c
+++ b/SecurityPkg/Tcg/Tcg2Config/TpmDetection.c
@@ -1,7 +1,7 @@
 /** @file\r
   TPM1.2/dTPM2.0 auto detection.\r
 \r
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2016, 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
@@ -18,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
-#include <Library/IoLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/PeiServicesLib.h>\r
 #include <Library/PcdLib.h>\r
@@ -28,29 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "Tcg2ConfigNvData.h"\r
 \r
-/**\r
-  This routine return if dTPM (1.2 or 2.0) present.\r
-\r
-  @retval TRUE  dTPM present\r
-  @retval FALSE dTPM not present\r
-**/\r
-BOOLEAN\r
-IsDtpmPresent (\r
-  VOID\r
-  )\r
-{\r
-  UINT8                             RegRead;\r
-  \r
-  RegRead = MmioRead8 ((UINTN)PcdGet64 (PcdTpmBaseAddress));\r
-  if (RegRead == 0xFF) {\r
-    DEBUG ((EFI_D_ERROR, "DetectTpmDevice: Dtpm not present\n"));\r
-    return FALSE;\r
-  } else {\r
-    DEBUG ((EFI_D_INFO, "DetectTpmDevice: Dtpm present\n"));\r
-    return TRUE;\r
-  }\r
-}\r
-\r
 /**\r
   This routine check both SetupVariable and real TPM device, and return final TpmDevice configuration.\r
 \r
@@ -100,10 +76,6 @@ DetectTpmDevice (
   }\r
 \r
   DEBUG ((EFI_D_INFO, "DetectTpmDevice:\n"));\r
-  if (!IsDtpmPresent ()) {\r
-    // dTPM not available\r
-    return TPM_DEVICE_NULL;\r
-  }\r
 \r
   // dTPM available and not disabled by setup\r
   // We need check if it is TPM1.2 or TPM2.0\r
@@ -111,7 +83,10 @@ DetectTpmDevice (
 \r
   Status = Tpm12RequestUseTpm ();\r
   if (EFI_ERROR (Status)) {\r
-    return TPM_DEVICE_2_0_DTPM;\r
+    //\r
+    // dTPM not available\r
+    //\r
+    return TPM_DEVICE_NULL;\r
   }\r
 \r
   if (BootMode == BOOT_ON_S3_RESUME) {\r