summaryrefslogtreecommitdiff
path: root/sys/dev/tpm
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2020-02-01 21:43:45 +0000
committerDimitry Andric <dim@FreeBSD.org>2020-02-01 21:43:45 +0000
commit5cc422a2221f3dd5e1531943f7ef6fbb17df6389 (patch)
tree2f2b0b3c61bc257b40b13006acf4b37763df6c63 /sys/dev/tpm
parent7739d927664b408494c3793c1b07db01b16122d4 (diff)
Notes
Diffstat (limited to 'sys/dev/tpm')
-rw-r--r--sys/dev/tpm/tpm_crb.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c
index 16e5c314c227..a3e04312e64f 100644
--- a/sys/dev/tpm/tpm_crb.c
+++ b/sys/dev/tpm/tpm_crb.c
@@ -70,7 +70,8 @@ __FBSDID("$FreeBSD$");
#define TPM_CRB_CTRL_STS_ERR_BIT BIT(0)
#define TPM_CRB_CTRL_STS_IDLE_BIT BIT(1)
-#define TPM_CRB_CTRL_CANCEL_CMD BIT(0)
+#define TPM_CRB_CTRL_CANCEL_CMD 0x1
+#define TPM_CRB_CTRL_CANCEL_CLEAR 0x0
#define TPM_CRB_CTRL_START_CMD BIT(0)
@@ -298,7 +299,7 @@ tpmcrb_cancel_cmd(struct tpm_sc *sc)
return (false);
}
- WR4(sc, TPM_CRB_CTRL_CANCEL, ~TPM_CRB_CTRL_CANCEL_CMD);
+ WR4(sc, TPM_CRB_CTRL_CANCEL, TPM_CRB_CTRL_CANCEL_CLEAR;
return (true);
}
@@ -330,7 +331,7 @@ tpmcrb_transmit(struct tpm_sc *sc, size_t length)
return (EIO);
}
/* Clear cancellation bit */
- WR4(sc, TPM_CRB_CTRL_CANCEL, ~TPM_CRB_CTRL_CANCEL_CMD);
+ WR4(sc, TPM_CRB_CTRL_CANCEL, TPM_CRB_CTRL_CANCEL_CLEAR;
/* Switch device to idle state if necessary */
if (!(RD4(sc, TPM_CRB_CTRL_STS) & TPM_CRB_CTRL_STS_IDLE_BIT)) {