From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4C593817B4 for ; Tue, 10 Jan 2017 10:16:46 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP; 10 Jan 2017 10:16:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,344,1477983600"; d="scan'208";a="51452765" Received: from mdkinney-mobl.amr.corp.intel.com ([10.254.91.144]) by orsmga005.jf.intel.com with ESMTP; 10 Jan 2017 10:16:45 -0800 From: Michael Kinney To: edk2-devel@lists.01.org Date: Tue, 10 Jan 2017 10:16:42 -0800 Message-Id: <1484072204-35608-2-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 In-Reply-To: <1484072204-35608-1-git-send-email-michael.d.kinney@intel.com> References: <1484072204-35608-1-git-send-email-michael.d.kinney@intel.com> Subject: [Patch 1/3] QuarkPlatformPkg/Tpm12DeviceLibAtmelI2c: Remove PP Check X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 18:16:46 -0000 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 Cc: Lee Leahy Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney --- QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c | 12 +----------- .../Tpm12DeviceLibAtmelI2c/Tpm12DeviceLibAtmelI2c.inf | 3 +-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c b/QuarkPlatformPkg/Library/Tpm12DeviceLibAtmelI2c/TisPc.c index 4e5aa41..08a005f 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.
+ Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
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 #include #include -#include // // 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 5a8734f..1f7e4be 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.
+# Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
# 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 -- 2.6.3.windows.1