diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2020-02-01 20:38:22 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2020-02-01 20:38:22 +0000 |
| commit | 6a0086dd4d065e7763d068eae5ab83cef0b609a1 (patch) | |
| tree | eb44b3398d25ef4469115b0a7028f1886ce73bac /sys/dev | |
| parent | 921e7210f84460951db43bac5e833c362cd29343 (diff) | |
| download | src-6a0086dd4d065e7763d068eae5ab83cef0b609a1.tar.gz src-6a0086dd4d065e7763d068eae5ab83cef0b609a1.zip | |
tpm(4): Fix 'go ready' in TPM 2.0 TIS driver
tpmtis_go_ready() read the value of the TPM_STS register, ORed
TPM_STS_CMD_READY with it, and wrote it back. However, the TPM Profile
(PTP) specification states that only one bit in the write request value may
be set to 1, or else the entire write request is ignored.
Fix by just writing TPM_STS_CMD_READY.
Similarly, remove the call which clears the TPM_STS_CMD_READY flag in the
same function. It was being ignored for the same reason.
Submitted by: Darrick Lew <darrick.freebsd AT gmail.com>
Reviewed by: vangyzen, myself
MFC after: if you care about stable, you might want to do so
Sponsored by: Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D23081
Notes
Notes:
svn path=/head/; revision=357386
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/tpm/tpm_tis.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/tpm/tpm_tis.c b/sys/dev/tpm/tpm_tis.c index 6b7c5d56b497..d61339818446 100644 --- a/sys/dev/tpm/tpm_tis.c +++ b/sys/dev/tpm/tpm_tis.c @@ -386,12 +386,11 @@ tpmtis_go_ready(struct tpm_sc *sc) mask = TPM_STS_CMD_RDY; sc->intr_type = TPM_INT_STS_CMD_RDY; - OR4(sc, TPM_STS, TPM_STS_CMD_RDY); + WR4(sc, TPM_STS, TPM_STS_CMD_RDY); bus_barrier(sc->mem_res, TPM_STS, 4, BUS_SPACE_BARRIER_WRITE); if (!tpm_wait_for_u32(sc, TPM_STS, mask, mask, TPM_TIMEOUT_B)) return (false); - AND4(sc, TPM_STS, ~TPM_STS_CMD_RDY); return (true); } |