From nobody Fri Nov 13 01:19:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jQfZ2017Vz6y0n9 for ; Fri, 13 Nov 2026 01:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQfZ16CqHz4nkR for ; Fri, 13 Nov 2026 01:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794532793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtgyGaa/nOaqAkOKNi1zejrfQT7Kwo5ZDHzjijkvwL4=; b=ah1QIkdBCEEw9j6jTDsEUz5XKw8lDxYjHzLctaThEgPHYapW7J0bgixgxwohXjUBlL9oGn rcKDGgfGg5tIEri9kOVOY7FowdwPTibhq4RsGPWUrpO9FhewZY7c8OtMpkpQbnG2q9Ybud O64r0wsQAU2N4bmNUTbSI2fDX0+KACotghupJSEPWfh3F+J2Zi3ITwmbP1Str/kij2uXcO sOFHHymB6CNV/qfuuM/XsifFZqMEyjYPklxvnClbUHrpK5AgI4V4AYQ+xjyv1N5CaHq6j+ qNd+GLl5Dl5JQ10NQTPjzkXRdr+8cx54xXM2Wd6NpW0yk90PCLRtLf1IGhMU8Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794532793; b=mXzU7xevstvPTl+oj7D0pF1GALyem0bhu/CEmf4Tdv2aF/ZG6RCyzqhn/ifq+0Gr2K2jMN r3ivXz8qS4MxqdMgWyr1y/uD1yTGy9yH42jBexWV+PrNChKd/5bXY+ywAzWQKO3+n4SRm+ sQ666gFqGSI5qb4UmEl1el9lDe+Qu3hhdhPCkqT4xRUZXH164GWDoEbBgEmE5Zzzay6GZz 6mxBE0DrJhr58pG10kkRvDG89RAMSLPLqDpT3mqO9d3GxYjiRsaCpyT6Tvfn9iY0yzo93a 34rOxvU9vPTdvUAxlIPN+a+PQF0IZOuW+rX4EHi36i6ID1Ts7l2ymsD0eE166g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794532793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtgyGaa/nOaqAkOKNi1zejrfQT7Kwo5ZDHzjijkvwL4=; b=G1xVHS+8lEoLBm0Je1kzIjzvKrncdMtswsgfm1FtxGIwW7h6o/vs60TD1Hymc1ITeGerXU 1+Fjis3Xc/kUf96JZzZFEcxDw8IdEqGEAKjCQk+LnwBqixwQkm+E75I+PHNuH1TOI+rX2t UATqfbxNarhYIZHDgD89/2nmZhzdVHxKS5mRTSx2ZayFfb2M2yUyCXmr5j8S1bIqgBggme F6alRiVe7XlzcC0tgiuW1gRGZLd2zQAWDh1ylE61AqV9hO8idN/Y8HybRCvq9rdQ1T1Mu8 uY8nCXlk/qw0pVgtN3jZ9bywoVPOQ18N7NG9rgUvPtVCRhjKHpLA9A/wo+YVfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQfZ15tYnz1Qst for ; Fri, 13 Nov 2026 01:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1950b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 01:19:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Cochard From: Kevin Bowling Subject: git: 9a31307f3d5c - stable/15 - tpm_crb: Use locality registers only with plain CRB List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9a31307f3d5ce28e62cb57019afabc7ffa37071f Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 01:19:53 +0000 Message-Id: <6af665b9.1950b.237c7f94@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=9a31307f3d5ce28e62cb57019afabc7ffa37071f commit 9a31307f3d5ce28e62cb57019afabc7ffa37071f Author: Olivier Cochard AuthorDate: 2026-11-10 07:25:06 +0000 Commit: Kevin Bowling CommitDate: 2026-11-13 01:19:44 +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") (cherry picked from commit 1dade7024457ee10df1ccae22e3c454e80f82b76) --- 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