From nobody Wed Sep 16 12:06:23 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 4hlHfs1Vfvz6t6Y4 for ; Wed, 16 Sep 2026 12:06:29 +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 4hlHfr73rcz4NVy for ; Wed, 16 Sep 2026 12:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789560389; 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=6ND/KLvkUr6TvJq5T5c+40HpOALAUQyp1Xbtmoh+3qM=; b=Qr1epgxibeeHAS3lMc4wDHyYVc0bBQIsBIkvQNKgaIAS/xpJ8ZJHrzPwTB5xYGl/DY1yNL JjnNVKq5XeQgJ5DwhnucHrPcAe2MGHVqyLZlXytH7DjrKa0ZpQLuqHCQY0hq/viifCoAVo jI583ox6tCatVGSJZvjiPcGKkBOrl8Ge2qp6uucA5wTYsNm/pPgzdPc7DSeH2AGGxC2RoD 0B7nf3f/9WxcJQFE1kEPdTmm3almtyhmnt3OA8q3XsSFRZ86ySsTElofIcYvx5e1L0gXde lF+myKJG6y7Wkaf6oT0OOOX2Oq9rWGWOj6WoFMn4Dm13eHpY+S/fFWQa0tw8YQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789560389; b=ikadM9lgFvia7SHZtMY9gZEukVW7NzK/A/IfYgOWhoRrDHNKzqcn8+In1q2Lr+qg8mrr5Q EVh8zvxgSirIVeibljTFCCYrYs5awZ55qXOv9AwEKywIAWpTy+OsKqEf91yNbQgeOssXzp ehcMNKdk59vI3t+gdTh99rl37r3mEFwvXrcazbNr2dmvVvHCzruyRujWKKAwpgJMYDrr5I GHMGWifRhbPiQExsqxv/HESiI0Tzfk8QA+7Krs/YeThnhEZxeV3Dlv24MpKDAyEaw/usDA uwzhG2mI01lcBa21Q1Hui3BTjxE0yKK99bJTKR9vDBccMClknWrQ0w8FAoNKtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789560389; 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=6ND/KLvkUr6TvJq5T5c+40HpOALAUQyp1Xbtmoh+3qM=; b=V0vOW5qMAdSiNV00vQRI+Nw8Z6wlKw4MgZSFMIkqX08o4oWVE12w8XMhT8IKbMun/XU1wI wf18m4/letXvhwe6fX8mk5uOvfkE1w2VJWqcdhKUjQdkX0FpLJGQrh0hWA7bui9qtE6XyS 8FTfNOSVyDncY8uZMqcBpdadw52E095RVvlRoGUWT8fBWw85qKGgsAi6V22K+xbf+WfcRT 9vfbme7vKBdRFup7Njy1t3QtpcIPkZ8QrUA6AZgVA6KqxjTcchdlCTAqyf7iydujL2E7+e 0z4ibN6ttjmXzvv9Yc6tcepQZxmKosgi1CHNVVKD3H8PxGSb+MDrmw3v8Bsnkw== 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 4hlHfr5nLbzm4T for ; Wed, 16 Sep 2026 12:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dbb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 12:06:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 9780b67b7433 - stable/15 - tpm.4: Canonicalize SYNOPSIS and HARDWARE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9780b67b74335e54e41085e4786d37d833099e38 Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 12:06:23 +0000 Message-Id: <6aaa863f.1dbb7.74296608@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=9780b67b74335e54e41085e4786d37d833099e38 commit 9780b67b74335e54e41085e4786d37d833099e38 Author: Alexander Ziaee AuthorDate: 2026-09-13 15:49:41 +0000 Commit: Alexander Ziaee CommitDate: 2026-09-16 12:05:58 +0000 tpm.4: Canonicalize SYNOPSIS and HARDWARE (cherry picked from commit f49dc19881d853b26dd675127f579f923dc87de2) --- share/man/man4/tpm.4 | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/share/man/man4/tpm.4 b/share/man/man4/tpm.4 index 8736d24d1ee1..c11ba371d8e3 100644 --- a/share/man/man4/tpm.4 +++ b/share/man/man4/tpm.4 @@ -20,35 +20,33 @@ .Nm tpm .Nd Trusted Platform Module .Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device tpm" -.Ed -.Pp -Alternatively, to load the driver as a -module at boot time, place the following line in -.Xr loader.conf 5 : -.Bd -literal -offset indent -tpm_load="YES" -.Ed +.Cd device tpm .Pp In -.Pa /boot/device.hints : +.Xr device.hints 5 : .Cd hint.tpm.0.at="isa" .Cd hint.tpm.0.maddr="0xfed40000" .Cd hint.tpm.0.msize="0x5000" .Cd hint.tpm.1.at="isa" .Cd hint.tpm.1.maddr="0xfed40000" .Cd hint.tpm.1.msize="0x1000" +.Pp +In +.Xr loader.conf 5 : +.Cd tpm_load="YES" .Sh DESCRIPTION The .Nm driver provides support for various trusted platform modules (TPM) that can store cryptographic keys. .Pp -Supported modules: +The driver can be configured to use an IRQ by providing a free ISA +interrupt vector in +.Pa /boot/device.hints . +.Sh HARDWARE +The +.Nm +driver supports the following trusted platform modules: .Pp .Bl -bullet -compact -offset indent .It @@ -66,10 +64,6 @@ STM ST19WP18 .It Winbond WEC WPCT200 .El -.Pp -The driver can be configured to use an IRQ by providing a free ISA -interrupt vector in -.Pa /boot/device.hints . .Sh SEE ALSO .Xr intro 4 , .Xr device.hints 5 ,