git: 1dade7024457 - main - tpm_crb: Use locality registers only with plain CRB
Date: Tue, 10 Nov 2026 18:29:19 UTC
The branch main has been updated by olivier:
URL: https://cgit.FreeBSD.org/src/commit/?id=1dade7024457ee10df1ccae22e3c454e80f82b76
commit 1dade7024457ee10df1ccae22e3c454e80f82b76
Author: Olivier Cochard <olivier@FreeBSD.org>
AuthorDate: 2026-11-10 07:25:06 +0000
Commit: Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2026-11-10 18:08:17 +0000
tpm_crb: Use locality registers only with plain CRB
The locality release wait times out on every command on a Framework 13
(Pluton start method), logging every 10 seconds.
Reported by: emaste, tuexen
Reviewed by: kbowling
Approved by: kbowling
Fixes: bfe4be85a935 ("tpm_crb: wait for idle and locality release after each command")
---
sys/dev/tpm/tpm_crb.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c
index 4e6f550e473c..e191699e4e4c 100644
--- a/sys/dev/tpm/tpm_crb.c
+++ b/sys/dev/tpm/tpm_crb.c
@@ -359,7 +359,12 @@ tpmcrb_attach_acpi(struct tpmcrb_sc *crb_sc)
AcpiPutTable((ACPI_TABLE_HEADER *)tbl);
return (false);
}
- crb_sc->has_locality = tbl->ControlAddress >= TPM_CRB_LOCALITY_SIZE &&
+ /*
+ * Only the plain CRB start method uses the locality registers: Pluton
+ * firmware keeps LOC_STATE assigned after a release.
+ */
+ crb_sc->has_locality = tbl->StartMethod == TPM2_START_METHOD_CRB &&
+ tbl->ControlAddress >= TPM_CRB_LOCALITY_SIZE &&
tbl->ControlAddress - TPM_CRB_LOCALITY_SIZE ==
rman_get_start(crb_sc->base.mem_res);
@@ -553,7 +558,7 @@ static void
tpmcrb_relinquish_locality(struct tpmcrb_sc *crb_sc)
{
struct resource *res = crb_sc->base.mem_res;
- uint32_t mask;
+ uint32_t mask, state;
int timeout;
if (!crb_sc->has_locality)
@@ -571,14 +576,15 @@ tpmcrb_relinquish_locality(struct tpmcrb_sc *crb_sc)
* pause so a release during it is not reported as a failure.
*/
for (timeout = TPM_TIMEOUT_C;; timeout -= tick) {
- if ((bus_read_4(res, TPM_LOC_STATE) & mask) ==
- TPM_LOC_STATE_VALID)
+ state = bus_read_4(res, TPM_LOC_STATE);
+ if ((state & mask) == TPM_LOC_STATE_VALID)
return;
if (timeout <= 0)
break;
pause("TPM locality", 1);
}
- device_printf(crb_sc->base.dev, "Failed to relinquish locality\n");
+ device_printf(crb_sc->base.dev,
+ "Failed to relinquish locality (loc_state=%#x)\n", state);
}
static bool