From nobody Tue Nov 10 18:29:19 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 4jPFYC3rJ8z4wQw2 for ; Tue, 10 Nov 2026 18:29:19 +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 4jPFYC32F7z51bC for ; Tue, 10 Nov 2026 18:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794335359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VBKALjEZwqRGKBUlsxLRCM2raBXOXfsYYlnTrPgRGEQ=; b=bGg3XDcVHjAomM08d8/8tFDf51v13i2dzEKY0MZKqFY6cSBwbDCh8Q5msLMsEUQ+NK6159 +7fANtxmWkh72eQa8iKXiQfcLNbKwD0xJ+6oFq6oRBnca1BqIqNwqRX+9rR6ZpQsE1GTJY 20cDuU/96y1Lr2M6CsFL/OGDYOi6M6+pGaE4NSty4w3MDswNJpOCkxi9VJkypj4vecjrMv 7xDBZf1BRYWp9tKLcuSz3wGCYuXRc/cyCHHUXzatWyeeZhXa1rFbUkWjDSYBkfC3wW0Zri XVfSonsmcHwArN8HEWX2DcBd5cb6jP/5LR6KWZHAx/K7nTaPi/9leCQ0za6aIg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794335359; b=wraqu0emxjY/4WVDgU5NJUkoUKCWd3n3D06s8hxKhEGtrbmx7uIjp5LWQgKoQq9GUWraJU UvoiaksRnQqV/ePi/baI6pZLXcygaAgMZ2h6GdMeuzBYPr/3AtLFyZ4I7R5NPrAsK/uaF7 IdsCf/Xdv3PvIEAn8UR3hb47Yo6iUwW4IfcbGWvOcPq9KvxvLy/iFEVsOrVYb9uAGOmBOE KkzrB0XiCZvLbi+cVhTN1tDH3QVU3q5qLTpwxMtZ9iK7tnZ/ldIZZDwPONSM6rxwJYhIhV Vi8v5il4bxi9o7oY0A5yBg7TuN5a2nbPdWgf227yhYq9WQFKiz2g+WvRXBrQkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794335359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VBKALjEZwqRGKBUlsxLRCM2raBXOXfsYYlnTrPgRGEQ=; b=mqI99Lf/mJt8/PR3PFngPtALGNgSh1St4NMSK7AKzWqJ9zWzl2Dt6fRqJ+paoVDy+b9ako dNHuz6WqRArlDZvI7Gv0QOE+HwsENyc6K18N96ftoKEJiMRmftfBnPWainS3uxxY9Ul2FJ y1GXkYkIxojsUSUIeCX0dzV5g69W5LwclmpJ+rLkQEUzgLRwHC+otIcZZ5kjoZVS7iWPfT 4cheO8Utj8xS6b3vkza/f/1Qf+5NYlJDLCuX59e0D/eOxx3kQXG0MEk2bDPc+WjcxL4GrW SZuIh8xbUjLID6lBJqAok6GpGcS0O3H57oNq/5VY02pwmPhwatOlJaAxEWRJzA== 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 4jPFYC2PMmzghd for ; Tue, 10 Nov 2026 18:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18e1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 18:29:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 1dade7024457 - main - 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dade7024457ee10df1ccae22e3c454e80f82b76 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 18:29:19 +0000 Message-Id: <6af3627f.18e1c.338f6de@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=1dade7024457ee10df1ccae22e3c454e80f82b76 commit 1dade7024457ee10df1ccae22e3c454e80f82b76 Author: Olivier Cochard AuthorDate: 2026-11-10 07:25:06 +0000 Commit: Olivier Cochard 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