summaryrefslogtreecommitdiffstats
path: root/QuarkPlatformPkg
diff options
context:
space:
mode:
authorMichael Kinney <michael.d.kinney@intel.com>2017-01-10 09:02:30 -0800
committerMichael Kinney <michael.d.kinney@intel.com>2017-01-11 11:11:19 -0800
commita0f26e276c71eeb7b2e16e242d4a978652798fb3 (patch)
tree226a4bc8cfbfa493f98ef67127ec4ffd186fc465 /QuarkPlatformPkg
parente044364b82e63047980606c388f4854b7c41e947 (diff)
downloadedk2-a0f26e276c71eeb7b2e16e242d4a978652798fb3.tar.gz
edk2-a0f26e276c71eeb7b2e16e242d4a978652798fb3.tar.bz2
edk2-a0f26e276c71eeb7b2e16e242d4a978652798fb3.zip
QuarkPlatformPkg/Tpm12DeviceLibAtmelI2c: Remove PP Check
https://bugzilla.tianocore.org/show_bug.cgi?id=337 The Tpm12CommandLib in the SecurityPkg was updated to check the returnCode in the response packet in the following commit: https://github.com/tianocore/edk2/commit/950a3bc788b5b101729b26aed3ff75fd2a64a570 The Tpm12DeviceLibAtmelI2C uses the Tpm12PhysicalPresence() function from the Tpm12CommandLib to verify that the I2C device is responding to TPM command packets. However, at this point the TPM device has not been started, and the TPM properly responds with an error in the returnCode field of the response packet. Before the commit above, the check worked, but the additional error checking in the commit above now returns an error and an Atmel I2C is returned as not present. The fix is to remove the call to the Tpm12PhysicalPresence() API in the Tpm12CommandLib from the Tpm12RequestUseTpm() API. The Atmel I2C TPM device is detected if a byte can be read from the slave address assigned to the Atmel I2C device. When the startup command is sent to the TPM later, the command and response packet processing will be verified, and if the I2C device is not an Atmel TPM, it will be detected at that point. Cc: Kelly Steele <kelly.steele@intel.com> Cc: Lee Leahy <leroy.p.leahy@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney <michael.d.kinney@intel.com> Reviewed-by: Lee Leahy <leroy.p.leahy@intel.com>
Diffstat (limited to 'QuarkPlatformPkg')
-rw-r--r--QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c12
-rw-r--r--QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/Tpm12DeviceLibAtmelI2c.inf3
2 files changed, 2 insertions, 13 deletions
diff --git a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c
index 4e5aa41370..08a005f1fd 100644
--- a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c
+++ b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c
@@ -1,7 +1,7 @@
/** @file
Basic TIS (TPM Interface Specification) functions for Atmel I2C TPM.
- Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -18,7 +18,6 @@
#include <Library/TimerLib.h>
#include <Library/DebugLib.h>
#include <Library/I2cLib.h>
-#include <Library/Tpm12CommandLib.h>
//
// Atmel I2C TPM slave address
@@ -224,15 +223,6 @@ Tpm12RequestUseTpm (
}
} while (EFI_ERROR (Status));
- //
- // Send Physical Presence Command to Atmel I2C TPM
- //
- Status = Tpm12PhysicalPresence (TPM_PHYSICAL_PRESENCE_PRESENT);
- if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Atmel I2C TPM failed to submit physical presence command: %r\n", Status));
- return Status;
- }
-
return EFI_SUCCESS;
}
diff --git a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/Tpm12DeviceLibAtmelI2c.inf b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/Tpm12DeviceLibAtmelI2c.inf
index 5a8734f4c6..1f7e4bee6a 100644
--- a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/Tpm12DeviceLibAtmelI2c.inf
+++ b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/Tpm12DeviceLibAtmelI2c.inf
@@ -4,7 +4,7 @@
# This instance provides basic TPM Interface Specification (TIS) functions
# or Atmel I2C TPM.
#
-# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
@@ -42,4 +42,3 @@
TimerLib
DebugLib
I2cLib
- Tpm12CommandLib