diff options
| author |  Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
| 2018-06-29 15:24:50 +0300 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
| 2018-07-28 17:03:11 +0300 |
| commit | 58bac8cc3010ccb845572a3512fc16c9aaa5e50e (patch) | |
| tree | 5ccd8ecaaae93054e587293bf2ac33244f922a02 /drivers/char/tpm/tpm.h | |
| parent | tpm: Convert tpm_find_get_ops() to use tpm_default_chip() (diff) | |
| download | linux-58bac8cc3010ccb845572a3512fc16c9aaa5e50e.tar.gz linux-58bac8cc3010ccb845572a3512fc16c9aaa5e50e.tar.bz2 linux-58bac8cc3010ccb845572a3512fc16c9aaa5e50e.zip | |
tpm: replace TPM_TRANSMIT_RAW with TPM_TRANSMIT_NESTED
As TPM_TRANSMIT_RAW always requires also not to take locks for obvious
reasons (deadlock), this commit renames the flag as TPM_TRANSMIT_NESTED
and prevents taking tpm_mutex when the flag is given to tpm_transmit().
Suggested-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char/tpm/tpm.h')
| -rw-r--r-- | drivers/char/tpm/tpm.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index ba01488cd029..f3501d05264f 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -513,16 +513,16 @@ extern const struct file_operations tpmrm_fops; extern struct idr dev_nums_idr; /** - * enum tpm_transmit_flags + * enum tpm_transmit_flags - flags for tpm_transmit() * - * @TPM_TRANSMIT_UNLOCKED: used to lock sequence of tpm_transmit calls. - * @TPM_TRANSMIT_RAW: prevent recursive calls into setup steps - * (go idle, locality,..). Always use with UNLOCKED - * as it will fail on double locking. + * @TPM_TRANSMIT_UNLOCKED: do not lock the chip + * @TPM_TRANSMIT_NESTED: discard setup steps (power management, + * locality) including locking (i.e. implicit + * UNLOCKED) */ enum tpm_transmit_flags { - TPM_TRANSMIT_UNLOCKED = BIT(0), - TPM_TRANSMIT_RAW = BIT(1), + TPM_TRANSMIT_UNLOCKED = BIT(0), + TPM_TRANSMIT_NESTED = BIT(1), }; ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space, |