diff options
| author | Stefan Berger | 2017-05-24 23:39:39 +0200 |
|---|---|---|
| committer | Jarkko Sakkinen | 2017-06-13 21:02:09 +0200 |
| commit | 85ab3bf305b96e5f4c83b23a0b7e11d90144eb18 (patch) | |
| tree | f5cf55bfe1773613f11aa3dabdba5beb334f01ca /drivers/char/tpm | |
| parent | tpm: vtpm_proxy: Suppress error logging when in closed state (diff) | |
| download | kernel-qcow2-linux-85ab3bf305b96e5f4c83b23a0b7e11d90144eb18.tar.gz kernel-qcow2-linux-85ab3bf305b96e5f4c83b23a0b7e11d90144eb18.tar.xz kernel-qcow2-linux-85ab3bf305b96e5f4c83b23a0b7e11d90144eb18.zip | |
tpm: Introduce flag TPM_TRANSMIT_RAW
Introduce the flag TPM_TRANSMIT_RAW that allows us to transmit
a command without recursing into the requesting of locality.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char/tpm')
| -rw-r--r-- | drivers/char/tpm/tpm-interface.c | 3 | ||||
| -rw-r--r-- | drivers/char/tpm/tpm.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index a965a9f0e5d2..8ef5e1723efb 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -416,7 +416,8 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, /* Store the decision as chip->locality will be changed. */ need_locality = chip->locality == -1; - if (need_locality && chip->ops->request_locality) { + if (!(flags & TPM_TRANSMIT_RAW) && + need_locality && chip->ops->request_locality) { rc = chip->ops->request_locality(chip, 0); if (rc < 0) goto out_no_locality; diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index af05c1403c6e..1df0521138d3 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -506,6 +506,7 @@ extern struct idr dev_nums_idr; enum tpm_transmit_flags { TPM_TRANSMIT_UNLOCKED = BIT(0), + TPM_TRANSMIT_RAW = BIT(1), }; ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, |