From: Stefan Berger Date: Tue, 22 Jan 2013 19:50:07 +0000 (-0600) Subject: tpm: Store TPM vendor ID X-Git-Tag: v3.9-rc1~137^2~15 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3e3a5e906998b090ad929010a5f5082ac0dbbdfb;p=linux.git tpm: Store TPM vendor ID Store the TPM vendor ID for later use. Signed-off-by: Stefan Berger Signed-off-by: Kent Yoder --- 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",