diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-17 09:49:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-17 09:49:21 -0700 |
| commit | cba582631ee40772c6dbe24e945b9173572dfca0 (patch) | |
| tree | d436663978a2bc49a93cbe1a351e260ba43aebb6 /include | |
| parent | tracing: make ftrace_likely_update() declaration visible (diff) | |
| parent | tpm/tpm_tis: Disable interrupts for more Lenovo devices (diff) | |
| download | linux-cba582631ee40772c6dbe24e945b9173572dfca0.tar.gz linux-cba582631ee40772c6dbe24e945b9173572dfca0.zip | |
Merge tag 'tpmdd-v6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm fixes from Jarkko Sakkinen:
"Three bug fixes for recently discovered issues"
* tag 'tpmdd-v6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm/tpm_tis: Disable interrupts for more Lenovo devices
tpm: Prevent hwrng from activating during resume
tpm_tis: Use tpm_chip_{start,stop} decoration inside tpm_tis_resume
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tpm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 77693389c3f9..6a1e8f157255 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -282,6 +282,7 @@ enum tpm_chip_flags { TPM_CHIP_FLAG_ALWAYS_POWERED = BIT(5), TPM_CHIP_FLAG_FIRMWARE_POWER_MANAGED = BIT(6), TPM_CHIP_FLAG_FIRMWARE_UPGRADE = BIT(7), + TPM_CHIP_FLAG_SUSPENDED = BIT(8), }; #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev) |