From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755760Ab1ATOqN (ORCPT ); Thu, 20 Jan 2011 09:46:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16413 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755677Ab1ATOqL (ORCPT ); Thu, 20 Jan 2011 09:46:11 -0500 Date: Thu, 20 Jan 2011 15:46:03 +0100 From: Michal Schmidt To: jmorris@namei.org Cc: Rajiv Andrade , linux-kernel@vger.kernel.org, eparis@redhat.com Subject: Re: [PATCH] TPM: Long default timeout fix Message-ID: <20110120154603.2bdf5d9b@alice> In-Reply-To: <1289596730-28966-1-git-send-email-srajiv@linux.vnet.ibm.com> References: <1289596730-28966-1-git-send-email-srajiv@linux.vnet.ibm.com> Organization: Red Hat Czech Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org James, what is the status of this patch from Rajiv? It has been in Fedora kernels for some time, but I do not see it applied upstream: On Fri, 12 Nov 2010 19:18:50 -0200 Rajiv Andrade wrote: > If duration variable value is 0 at this point, it's because > chip->vendor.duration wasn't filled by tpm_get_timeouts() yet. > This patch sets then the lowest timeout just to give enough > time for tpm_get_timeouts() to further succeed. > > This fix avoids long boot times in case another entity attempts > to send commands to the TPM when the TPM isn't accessible. > > Signed-off-by: Rajiv Andrade > --- > drivers/char/tpm/tpm.c | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c > index 7c41335..5635ac0 100644 > --- a/drivers/char/tpm/tpm.c > +++ b/drivers/char/tpm/tpm.c > @@ -364,12 +364,14 @@ unsigned long tpm_calc_ordinal_duration(struct > tpm_chip *chip, tpm_protected_ordinal_duration[ordinal & > TPM_PROTECTED_ORDINAL_MASK]; > > - if (duration_idx != TPM_UNDEFINED) > + if (duration_idx != TPM_UNDEFINED) { > duration = chip->vendor.duration[duration_idx]; > - if (duration <= 0) > + /* if duration is 0, it's because > chip->vendor.duration wasn't */ > + /* filled yet, so we set the lowest timeout just to > give enough */ > + /* time for tpm_get_timeouts() to succeed */ > + return (duration <= 0 ? HZ : duration); > + } else > return 2 * 60 * HZ; > - else > - return duration; > } > EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration); >