leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tpm_tis: Only probe iTPMs

Browse Source 
Detect iTPMs through the vendor ID on the hardware interface and only
probe the device if the manufacturer is found to be Intel. This
obsoletes a previously added delay necessary for some TPMs but not iTPMs.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger
2012-01-20 12:58:49 -05:00
committed by Rajiv Andrade
parent 4040153087
commit 4e401fb028
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/tpm/tpm.h
View File

@@ -99,6 +99,8 @@ struct tpm_vendor_specific {
wait_queue_head_t int_queue; wait_queue_head_t int_queue;
}; };
#define TPM_VID_INTEL 0x8086
struct tpm_chip { struct tpm_chip {
struct device *dev; /* Device stuff */ struct device *dev; /* Device stuff */

8
drivers/char/tpm/tpm_tis.c
View File

@@ -368,6 +368,11 @@ static int probe_itpm(struct tpm_chip *chip)
}; };
size_t len = sizeof(cmd_getticks); size_t len = sizeof(cmd_getticks);
int rem_itpm = itpm; int rem_itpm = itpm;
u16 vendor = ioread16(chip->vendor.iobase + TPM_DID_VID(0));
/* probe only iTPMS */
if (vendor != TPM_VID_INTEL)
return 0;
itpm = 0; itpm = 0;
@@ -390,9 +395,6 @@ static int probe_itpm(struct tpm_chip *chip)
out: out:
itpm = rem_itpm; itpm = rem_itpm;
tpm_tis_ready(chip); tpm_tis_ready(chip);
/* some TPMs need a break here otherwise they will not work
* correctly on the immediately subsequent command */
msleep(chip->vendor.timeout_b);
release_locality(chip, chip->vendor.locality, 0); release_locality(chip, chip->vendor.locality, 0);
return rc; return rc;