From nobody Thu Sep 03 04:03:05 2026 X-Original-To: dev-commits-src-main@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 4hb5Y62kfkz6qWYY for ; Thu, 03 Sep 2026 04:03:06 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hb5Y60FGkz3rZh for ; Thu, 03 Sep 2026 04:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788408186; 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=zN2kdHhHC2m+kWCYrIF7B/RVUihVXu71V9sqQXykIHU=; b=WEE7cyQu8s30TuzoNXlnx5GDfQnLB3StpFTD9QVutyoBO8hrXtIPj+WeDoUjL/vijEOY7v +ubcaj0ct7Dxp+dQ3ift6w8zSObJ5HhYxnG7K+eN6XXzIqDrcXAER3+adaX7IaDDQ2eD3i moj6SsFT5NitHCMD1mfJh5VGmARmWkt7wwsITzBzTY87jxLnXu1nwjQ/4HcBy4xdSX6xDv TUR1m6Oc3xq0uj6XTFeaL82w+ecwJX6a6hu/9ZfOEcz3TJ+yF6Qpnqkg/eePuwhfsxq9ve xEEDxCaoujCXtVJZYOigfv4isXWQDmaJrAZwjY3LAb6f4lel5+baiMkkefjUSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788408186; a=rsa-sha256; cv=none; b=RTYSWVOW6sdg9mHxudEGxqY/vEb09mPE4rZVuKQmjU6tLThFuXfO7Xnm+iRtlut4eYLHZa YDMjETQI9m4snJ3qNsLhLJMeS709ZHK5uTxlEGIRB/CnwGSfFnPNx/xkXfsrnMothPQ1Li hc68LyARflhz7av2kug3e1JC4I2NTvGFNLlA/UHogcMdYfabwy2Sdh0kwhxjWRKq++fy34 Cx4R5Cl0QZneQmJF0D+R4D/BQc5kLnATgsg5h/YuTn8qobPKxkQabCX6qazglYSRsPhsxG 1C8nzj/KUXxNwMAHjKAhIld22hcuQWRja7Z9K+7ZaMGv4Ed+CXe39odGjLapmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788408186; 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=zN2kdHhHC2m+kWCYrIF7B/RVUihVXu71V9sqQXykIHU=; b=wTFLbuk41e/7izbiP2PKcl+nL/BFaEJtdyIA99cP02wd7ZA0REn4FCdhDdv9oQq1iNKGn3 ScEx20dIWO8fCFzF3jL/N4vuQrqNXG3riqJ4SQjgh2tx/m1k0p9B72+N6611ueZHTuOxNv 301NbH8qFibupK2fPYj1ilK70vEVmwMj9kBVLJjGLPxx03kzjw16tpCvswOoWbR6NcK7xb KK1VX/LvZsD99J/wGrDLWqjpFMCA7Ug/bZYwI9Q5tvImaSNocZBvbLhDd35ApKeXjHlTFr aAYpUVWJ0aR1LX9pEoy/mOslhrehBDNzYiDknK7aGaX67NMivtGjqRMtyVTwuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hb5Y55zH9z1CMn for ; Thu, 03 Sep 2026 04:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a703 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 03 Sep 2026 04:03:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: f613a43c3666 - main - tpm20: Correct 32-bit register helpers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: f613a43c366600e8c388c3200f74c6dd27f8a7a2 Auto-Submitted: auto-generated Date: Thu, 03 Sep 2026 04:03:05 +0000 Message-Id: <6a98f179.3a703.3565acf3@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f613a43c366600e8c388c3200f74c6dd27f8a7a2 commit f613a43c366600e8c388c3200f74c6dd27f8a7a2 Author: Kevin Bowling AuthorDate: 2026-08-27 12:48:30 +0000 Commit: Kevin Bowling CommitDate: 2026-09-03 04:02:41 +0000 tpm20: Correct 32-bit register helpers OR4() reads only the low byte before writing the complete 32-bit register. Preserve all register bits by using a matching 32-bit read. Make BIT() produce an unsigned value so masks containing bit 31 do not rely on a signed left shift into the sign bit. OpenBSD carries the same change. Reviewed by: kevans MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59244 --- sys/dev/tpm/tpm20.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/tpm/tpm20.h b/sys/dev/tpm/tpm20.h index 36f41e6b9e0b..1d7a11265b02 100644 --- a/sys/dev/tpm/tpm20.h +++ b/sys/dev/tpm/tpm20.h @@ -62,7 +62,7 @@ #include "opt_tpm.h" #include "tpm_if.h" -#define BIT(x) (1 << (x)) +#define BIT(x) (1U << (x)) /* Timeouts in us */ #define TPM_TIMEOUT_A 750000 @@ -183,7 +183,7 @@ OR1(struct tpm_sc *sc, bus_size_t off, uint8_t val) static inline void OR4(struct tpm_sc *sc, bus_size_t off, uint32_t val) { - uint32_t v = TPM_READ_1(sc->dev, off); + uint32_t v = TPM_READ_4(sc->dev, off); TPM_WRITE_4(sc->dev, off, v | val); }