diff options
| author |   Stefan Berger <stefanb@linux.vnet.ibm.com> | 2013-01-22 13:50:07 -0600 |
|---|---|---|
| committer |   Kent Yoder <key@linux.vnet.ibm.com> | 2013-02-05 09:38:24 -0600 |
| commit | 3e3a5e906998b090ad929010a5f5082ac0dbbdfb (patch) | |
| tree | e629d387d1b7bb771bc5c74076e3c36956c49c4a /drivers/char | |
| parent | TPM: Work around buggy TPMs that block during continue self test (diff) | |
| download | linux-dev-3e3a5e906998b090ad929010a5f5082ac0dbbdfb.tar.xz linux-dev-3e3a5e906998b090ad929010a5f5082ac0dbbdfb.zip | |
tpm: Store TPM vendor ID
Store the TPM vendor ID for later use.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm.h | 2 | ||||
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index cbee6319be75..ef4ba5fcf7d9 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -105,6 +105,8 @@ struct tpm_vendor_specific { wait_queue_head_t read_queue; wait_queue_head_t int_queue; + + u16 manufacturer_id; }; #define TPM_VPRIV(c) (c)->vendor.priv diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 74ce2d1f08b4..3615d210e603 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -534,6 +534,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, } vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0)); + chip->vendor.manufacturer_id = vendor; dev_info(dev, "1.2 TPM (device-id 0x%X, rev-id %d)\n", |