public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
To: Andy Isaacson <adi@hexapodia.org>
Cc: jmorris@namei.org, len.brown@intel.com,
	Alan Cox <alan@lxorguk.ukuu.org.uk>,
	Andy Isaacson <adi@vmware.com>,
	linux-kernel@vger.kernel.org, tpmdd-devel@lists.sourceforge.net,
	dds@google.com, Mimi Zohar <zohar@linux.vnet.ibm.com>,
	Shahbaz Khan <shaz.linux@gmail.com>,
	seiji.munetoh@gmail.com
Subject: [PATCH] tpm_tis: TPM_STS_DATA_EXPECT workaround
Date: Thu, 10 Sep 2009 16:54:31 -0300	[thread overview]
Message-ID: <1252612471.4837.107.camel@blackbox> (raw)
In-Reply-To: <1252609714.4837.87.camel@blackbox>

Some newer Lenovo models are shipped with a TPM that doesn't seem to set the TPM_STS_DATA_EXPECT status bit
when sending it a burst of data, so the code understands it as a failure and doesn't proceed sending the chip
the intended data. In this patch we bypass this bit check in case the itpm module parameter was set.

This patch is based on Andy Isaacson's one:

http://marc.info/?l=linux-kernel&m=124650185023495&w=2

It was heavily discussed how should we deal with identifying the chip in kernel space, but the required
patch to do so was NACK'd:

http://marc.info/?l=linux-kernel&m=124650186423711&w=2

This way we let the user choose using this workaround or not based on his
observations on this code behavior when trying to use the TPM.

Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
---
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index aec1931..c9990db 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -257,6 +257,10 @@ out:
 	return size;
 }
 
+static int itpm = 0;
+module_param(itpm, bool, 0444);
+MODULE_PARM_DESC(itpm, "Force iTPM workarounds (found on some Lenovo laptops)");
+
 /*
  * If interrupts are used (signaled by an irq set in the vendor structure)
  * tpm.c can skip polling for the data to be available as the interrupt is
@@ -293,7 +297,7 @@ static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len)
 		wait_for_stat(chip, TPM_STS_VALID, chip->vendor.timeout_c,
 			      &chip->vendor.int_queue);
 		status = tpm_tis_status(chip);
-		if ((status & TPM_STS_DATA_EXPECT) == 0) {
+		if (!itpm && (status & TPM_STS_DATA_EXPECT) == 0) {
 			rc = -EIO;
 			goto out_err;
 		}
@@ -467,6 +471,10 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
 		 "1.2 TPM (device-id 0x%X, rev-id %d)\n",
 		 vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
 
+	if (itpm) 
+		dev_info(dev, "Intel iTPM workaround enabled\n");
+
+
 	/* Figure out the capabilities */
 	intfcaps =
 	    ioread32(chip->vendor.iobase +



  reply	other threads:[~2009-09-10 19:54 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-01  1:04 [PATCH 0/6] tpm_tis: various cleanups, and support for Intel iTPM Andy Isaacson
2009-07-01  1:04 ` [PATCH 1/6] tpm_tis: various cleanups Andy Isaacson
2009-09-10 19:56   ` Rajiv Andrade
2009-07-01  1:04 ` [PATCH 2/6] tpm_tis: add MODULE_DEVICE_TABLE to enable autoload Andy Isaacson
2009-09-10 19:56   ` Rajiv Andrade
2009-07-01  1:04 ` [PATCH 3/6] tpm_tis: set timeouts before calling request_locality Andy Isaacson
2009-07-01  1:04 ` [PATCH 4/6] tpm_tis: print complete vendor information Andy Isaacson
2009-09-10 19:57   ` Rajiv Andrade
2009-07-01  1:04 ` [PATCH 5/6] tpm_tis: convert from pnp_driver to acpi_driver Andy Isaacson
2009-07-01 10:01   ` Alan Cox
2009-07-01 13:45     ` Rajiv Andrade
2009-07-16 17:26       ` Rajiv Andrade
2009-07-16 17:43         ` [PATCH] TPM: DATA_EXPECT bit check bypass Rajiv Andrade
2009-07-16 20:08           ` Valdis.Kletnieks
2009-07-16 20:50             ` Rajiv Andrade
2009-07-16 21:20             ` Rajiv Andrade
2009-07-20 23:28               ` Andy Isaacson
2009-07-24 17:12                 ` Rajiv Andrade
2009-07-20 18:27       ` [PATCH 5/6] tpm_tis: convert from pnp_driver to acpi_driver Andy Isaacson
2009-09-10 19:08         ` Rajiv Andrade
2009-09-10 19:54           ` Rajiv Andrade [this message]
2009-09-10 19:58             ` [PATCH] tpm_tis: TPM_STS_DATA_EXPECT workaround Daniel Walker
2009-09-10 20:06               ` Rajiv Andrade
2009-09-10 20:09               ` Rajiv Andrade
2009-09-11 23:34                 ` Seiji Munetoh
2009-09-24 18:43                   ` Rajiv Andrade
2009-10-28  2:45                     ` David Smith
2009-10-31 14:24                       ` Eric Paris
2009-11-01 22:09                         ` James Morris
2009-09-10 20:27               ` Andy Isaacson
2009-07-01  1:04 ` [PATCH 6/6] tpm_tis: add workarounds for iTPM Andy Isaacson
2009-07-03 18:18   ` [tpmdd-devel] " Marcin Obara
2009-07-03 19:33     ` Andy Isaacson
2009-07-03 20:10       ` Marcin Obara
2009-07-03 20:20         ` Andy Isaacson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1252612471.4837.107.camel@blackbox \
    --to=srajiv@linux.vnet.ibm.com \
    --cc=adi@hexapodia.org \
    --cc=adi@vmware.com \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=dds@google.com \
    --cc=jmorris@namei.org \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=seiji.munetoh@gmail.com \
    --cc=shaz.linux@gmail.com \
    --cc=tpmdd-devel@lists.sourceforge.net \
    --cc=zohar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox