--- drivers/char/tpm/tpm_tis.c

+++ drivers/char/tpm/tpm_tis.c

@@ -257,6 +257,10 @@ out:

return size;

}

+static int itpm;

+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

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 *d

"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 +

@@ -614,7 +622,14 @@ static int tpm_tis_pnp_suspend(struct pn

static int tpm_tis_pnp_resume(struct pnp_dev *dev)

{

- return tpm_pm_resume(&dev->dev);

+ struct tpm_chip *chip = pnp_get_drvdata(dev);

+ int ret;

+

+ ret = tpm_pm_resume(&dev->dev);

+ if (!ret)

+ tpm_continue_selftest(chip);

+

+ return ret;

}

static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = {

@@ -629,6 +644,7 @@ static struct pnp_device_id tpm_pnp_tbl[

{"", 0}, /* User Specified */

{"", 0} /* Terminator */

};

+MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);

static __devexit void tpm_tis_pnp_remove(struct pnp_dev *dev)

{