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>

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index cbee6319be7519188277e441906bb106b1f33ee0..ef4ba5fcf7d9e0c4aac059de8c3c2c1823146069 100644 (file)
--- 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 74ce2d1f08b4d7c8e7ac5919cd6ff46076009e67..3615d210e60394ae0e6dff7e198c384c0d83ad07 100644 (file)
--- 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",