From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965153AbdDSPNg (ORCPT ); Wed, 19 Apr 2017 11:13:36 -0400 Received: from mga02.intel.com ([134.134.136.20]:54265 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936882AbdDSPMg (ORCPT ); Wed, 19 Apr 2017 11:12:36 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,221,1488873600"; d="scan'208";a="91385594" Date: Wed, 19 Apr 2017 18:12:02 +0300 From: Jarkko Sakkinen To: "Maciej S. Szmigiero" Cc: tpmdd-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org, stable@vger.kernel.org, Peter Huewe , Marcel Selhorst , Jason Gunthorpe , open list Subject: Re: [backport v4.9] tpm_tis: use default timeout value if chip reports it as zero Message-ID: <20170419151202.kgx73gepo7zqgv2p@intel.com> References: <20170415152622.14451-1-user@jsakkine-mobl1> <420a825b-9845-7029-482c-aec297265107@maciej.szmigiero.name> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <420a825b-9845-7029-482c-aec297265107@maciej.szmigiero.name> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Apr 15, 2017 at 06:04:05PM +0200, Maciej S. Szmigiero wrote: > Hi Jarkko, > > On 15.04.2017 17:26, Jarkko Sakkinen wrote: > > From: "Maciej S. Szmigiero" > > > > Since commit 1107d065fdf1 ("tpm_tis: Introduce intermediate layer for > > TPM access") Atmel 3203 TPM on ThinkPad X61S (TPM firmware version 13.9) > > no longer works. The initialization proceeds fine until we get and > > start using chip-reported timeouts - and the chip reports C and D > > timeouts of zero. > > > > It turns out that until commit 8e54caf407b98e ("tpm: Provide a generic > > means to override the chip returned timeouts") we had actually let > > default timeout values remain in this case, so let's bring back this > > behavior to make chips like Atmel 3203 work again. > > > > Use a common code that was introduced by that commit so a warning is > > printed in this case and /sys/class/tpm/tpm*/timeouts correctly says the > > timeouts aren't chip-original. > > > > Fixes: 1107d065fdf1 ("tpm_tis: Introduce intermediate layer for TPM access") > > Cc: stable@vger.kernel.org > > Signed-off-by: Maciej S. Szmigiero > > Reviewed-by: Jarkko Sakkinen > > Signed-off-by: Jarkko Sakkinen > > --- > > Backport v4.9. Can you test it? > > drivers/char/tpm/tpm-interface.c | 59 ++++++++++++++++++++++------------------ > > drivers/char/tpm/tpm_tis.c | 2 +- > > drivers/char/tpm/tpm_tis_core.c | 6 ++-- > > drivers/char/tpm/tpm_tis_core.h | 2 +- > > 4 files changed, 38 insertions(+), 31 deletions(-) > > > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > > index 3a9149cf0110..4c914fe25802 100644 > > --- a/drivers/char/tpm/tpm-interface.c > > +++ b/drivers/char/tpm/tpm-interface.c > (..) > > @@ -537,16 +537,15 @@ int tpm_get_timeouts(struct tpm_chip *chip) > > goto duration; > > } > > > > - if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || > > - be32_to_cpu(tpm_cmd.header.out.length) > > - != sizeof(tpm_cmd.header.out) + sizeof(u32) + 4 * sizeof(u32)) > > - return -EINVAL; > > - > > Is this part right? > These tests weren't removed by this commit as present in the mainline kernel. > > Maciej No it is not right. It is my bad. Sorry about this. My only excuse is that I was rushing to the Easter holiday and that is not really a good excuse. /Jarkko