From nobody Sun Oct 11 01:10:15 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 4j2Mw73PqWz6w8RB for ; Sun, 11 Oct 2026 01:10:15 +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 4j2Mw72fglz3KJc for ; Sun, 11 Oct 2026 01:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791681015; 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=drinqzRKLv7j0rVjd1Yw+TNr+flKrfMpJFHZlBD/3Bk=; b=puHH1q1rXC7eK3t+bdn32eYSIDkNZ+MYcKFQvamb0fgGngaM55b5PVk9MUOtfCfmSOkZch pxosuGlk+DFehmu2THEZsVzA8UipQHhyI7AFplCRb2wzikmhtR7j61GKpWKyncdbzrdq+G ogDjPqbR1pkah7ECARixdVk+CSktk0gRN+BjkHcNzBl26uYNYmzkGGCTzsc6JyU9lyvv8u AjG5mZqrZknxJVp153QPaQ5o0S5IMvZs9qF2hi6j6gN5J225BxWedyvbQqpiUJT0BhpoZ4 KBE7mC4WIok4YiAIBPlSJnYyScbXWKybyaXHNxT7S1ldhvsS8BGw5BQhkjYsIA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791681015; b=M6DMu65U2LBgcsnD/dTMoMuAJtivMY9lIp9V173vZD0Y0fCFsz2vBObJ4kXuiOZg9/uPCY v4olM/5EluQr+W+TdxUpIu46siTC88ZEIzgQpX6QMMpZAoDa6HCIhltIpcARp3ec9hbJw0 gR6Tge3KhGIE1IScWak+aSoFPNubur/vAFCSAlAjJnfOS7YgP0fQQZDHF9DXHWO4gzLDoc Xu8yUvMpTuDbeZ/YOlLhGPy+Zs5VTZYciyRHwvON9ogcqD125scPp2VmCoLao5GA/LPVz7 O3NKFdaIkX8pHdlFephcxUtc6AelhaDuVnLAbaSORjJLXnuOMubC/HUcVuQA4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791681015; 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=drinqzRKLv7j0rVjd1Yw+TNr+flKrfMpJFHZlBD/3Bk=; b=ivtXixS4WfthzPzOatwQX2YqjUB+DcrJbKRTaSaEtzr7/m7lX1Xnz1NK4uqwvnJyxnPpPP aXm9iLweRhsQcSc1MyrHWEtZdDlc4sN0cLOZ1/tLYyAL8uy/805NcGQsXEw6xWGEQzklSw 3ooWONRvJrzMVotsqv23UEPxgmz5Dikj544FugDj5pBLYflFXbypjHsV/9fJ/KeziYWoXM ubi50DctlrmEhHwMQl2Oorp5BSu1QeOhh1t9qJP4ceABFmnXHBlVDZJ0vxzTyp4FSzqfch wlNG7bmX6jxM+P0Ag8XVDbQbnqbL6UK+k4Gh9xVUjNyJIw3Un44YYxqxcAPghg== 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 4j2Mw71kyKzJcw for ; Sun, 11 Oct 2026 01:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34418 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 01:10:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: ef68bf61d8db - stable/15 - tpm20: Correct 32-bit register helpers List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ef68bf61d8db343a812a37016d7f12b6f6e291ef Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 01:10:15 +0000 Message-Id: <6acae1f7.34418.4a94b025@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ef68bf61d8db343a812a37016d7f12b6f6e291ef commit ef68bf61d8db343a812a37016d7f12b6f6e291ef Author: Kevin Bowling AuthorDate: 2026-08-27 12:48:30 +0000 Commit: Kevin Bowling CommitDate: 2026-10-11 01:10:06 +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 Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59244 (cherry picked from commit f613a43c366600e8c388c3200f74c6dd27f8a7a2) --- 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); }