From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754131Ab1JJNEr (ORCPT ); Mon, 10 Oct 2011 09:04:47 -0400 Received: from e24smtp03.br.ibm.com ([32.104.18.24]:46839 "EHLO e24smtp03.br.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753016Ab1JJNEq (ORCPT ); Mon, 10 Oct 2011 09:04:46 -0400 Message-ID: <4E92ED60.8080909@linux.vnet.ibm.com> Date: Mon, 10 Oct 2011 10:04:32 -0300 From: Rajiv Andrade User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: Stefan Berger CC: "tpmdd-devel@lists.sourceforge.net" , James Morris , "linux-kernel@vger.kernel.org" , m.selhorst@sirrix.com, a.miskiewicz@gmail.com Subject: Re: [PATCH] Refuse activation of tpm_tis driver if TPM is not working correctly References: <1318249005.5482.5.camel@d941e-10> In-Reply-To: <1318249005.5482.5.camel@d941e-10> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit x-cbid: 11101013-9254-0000-0000-000006D0560A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/10/11 09:16, Stefan Berger wrote: > Refuse activation of tpm_tis driver if the TPM is found not to be > working correctly. This prevents suspend/resume problems for me on > Lenovo W500 and T61p. > > Signed-off-by: Stefan Berger Testing and trying to reproduce it here. Rajiv > > --- > drivers/char/tpm/tpm_tis.c | 13 +++++++++++++ > 1 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > index 3f4051a..7f2761d 100644 > --- a/drivers/char/tpm/tpm_tis.c > +++ b/drivers/char/tpm/tpm_tis.c > @@ -549,6 +549,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, > u32 vendor, intfcaps, intmask; > int rc, i, irq_s, irq_e; > struct tpm_chip *chip; > + u8 digest[TPM_DIGEST_SIZE]; > > if (!(chip = tpm_register_hardware(dev,&tpm_tis))) > return -ENODEV; > @@ -616,6 +617,18 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, > /* get the timeouts before testing for irqs */ > tpm_get_timeouts(chip); > > + /* test for correctly working TPM; refuse driver if not working > + to prevent suspend/resume problems */ > + rc = tpm_pcr_read(chip->dev_num, 0, digest); > + if (rc != 0) { > + dev_err(dev, "Could not read PCR 0. " > + "TPM is not working correctly.\n"); > + dev_err(dev, "Was machine previously suspended without TPM " > + "driver present?\n"); > + rc = -ENODEV; > + goto out_err; > + } > + > /* INTERRUPT Setup */ > init_waitqueue_head(&chip->vendor.read_queue); > init_waitqueue_head(&chip->vendor.int_queue);