Bug 295517 - padlock_rng: missing from amd64 builds in 15.1+
Summary: padlock_rng: missing from amd64 builds in 15.1+
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: kern (show other bugs)
Version: 15.1-RELEASE
Hardware: Any Any
: --- Affects Only Me
Assignee: Alan Somers
URL: https://reviews.freebsd.org/D57215
Keywords: regression
Depends on:
Blocks:
 
Reported: 2026-05-23 13:22 UTC by Alan Somers
Modified: 2026-06-28 21:29 UTC (History)
3 users (show)

See Also:
asomers: mfc-stable15+
asomers: mfc-stable14-


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Alan Somers freebsd_committer freebsd_triage 2026-05-23 13:22:46 UTC
Commit d1ca01059d5 removed padlock_rng from amd64 builds, apparently under the assumption that such hardware was only ever included on 32-bit CPUs.  But that assumption is mistaken; the 64-bit Via Nano and Via Nano X2 also include it.  I have a Via Nano X2, and I can confirm that padlock_rng works on 15.0-RELEASE, but not 15.1-RC1.

https://cgit.freebsd.org/src/commit/?id=d1ca01059d5d756a4aef09d955e98aa59a284344
Comment 1 commit-hook freebsd_committer freebsd_triage 2026-05-26 21:49:08 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=14b8531c4ccb836d755ce8a4f1b384164b5d9d94

commit 14b8531c4ccb836d755ce8a4f1b384164b5d9d94
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2026-05-24 00:19:13 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2026-05-26 21:43:57 +0000

    padlock: Restore padlock_rng to the amd64 build

    Revert 88a53301e19 and d1ca01059d5 .  They removed padlock_rng from the
    amd64 build under the mistaken belief that this device was available on
    32-bit processors only.  But it's also available on the 64-bit Via Nano,
    Nano X2, and some Zhaoxin CPUs.

    PR:             295517
    Fixes:          88a53301e19 ("padlock.4: only install on i386")
    Fixes:          d1ca01059d5 ("padlock(4)/nehemiah: move i386-only entropy")
    MFC after:      1 week
    Reviewed by:    kib
    Differential Revision: https://reviews.freebsd.org/D57215

 share/man/man4/Makefile | 5 +----
 sys/amd64/conf/GENERIC  | 1 +
 sys/amd64/conf/MINIMAL  | 1 +
 sys/conf/files.i386     | 1 -
 sys/conf/files.x86      | 1 +
 sys/i386/conf/NOTES     | 7 -------
 sys/modules/Makefile    | 4 +---
 sys/x86/conf/NOTES      | 1 +
 8 files changed, 6 insertions(+), 15 deletions(-)
Comment 2 commit-hook freebsd_committer freebsd_triage 2026-05-28 14:13:16 UTC
A commit in branch stable/15 references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=71ec93ff69f0b724a1c51e9fa772b08a10506112

commit 71ec93ff69f0b724a1c51e9fa772b08a10506112
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2026-05-24 00:19:13 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2026-05-28 11:41:24 +0000

    padlock: Restore padlock_rng to the amd64 build

    Revert 88a53301e19 and d1ca01059d5 .  They removed padlock_rng from the
    amd64 build under the mistaken belief that this device was available on
    32-bit processors only.  But it's also available on the 64-bit Via Nano,
    Nano X2, and some Zhaoxin CPUs.

    PR:             295517
    Fixes:          88a53301e19 ("padlock.4: only install on i386")
    Fixes:          d1ca01059d5 ("padlock(4)/nehemiah: move i386-only entropy")
    Reviewed by:    kib
    Differential Revision: https://reviews.freebsd.org/D57215

    (cherry picked from commit 14b8531c4ccb836d755ce8a4f1b384164b5d9d94)

 share/man/man4/Makefile | 5 +----
 sys/amd64/conf/GENERIC  | 1 +
 sys/amd64/conf/MINIMAL  | 1 +
 sys/conf/files.i386     | 1 -
 sys/conf/files.x86      | 1 +
 sys/i386/conf/NOTES     | 7 -------
 sys/modules/Makefile    | 4 +---
 sys/x86/conf/NOTES      | 1 +
 8 files changed, 6 insertions(+), 15 deletions(-)
Comment 3 commit-hook freebsd_committer freebsd_triage 2026-05-28 22:16:24 UTC
A commit in branch releng/15.1 references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=191573ce0bfd44189ef6f34f22108e59da1cc65a

commit 191573ce0bfd44189ef6f34f22108e59da1cc65a
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2026-05-24 00:19:13 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-05-28 22:15:46 +0000

    padlock: Restore padlock_rng to the amd64 build

    Revert 88a53301e19 and d1ca01059d5 .  They removed padlock_rng from the
    amd64 build under the mistaken belief that this device was available on
    32-bit processors only.  But it's also available on the 64-bit Via Nano,
    Nano X2, and some Zhaoxin CPUs.

    Approved by:    re (cperciva)
    PR:             295517
    Fixes:          88a53301e19 ("padlock.4: only install on i386")
    Fixes:          d1ca01059d5 ("padlock(4)/nehemiah: move i386-only entropy")
    Reviewed by:    kib
    Differential Revision: https://reviews.freebsd.org/D57215

    (cherry picked from commit 14b8531c4ccb836d755ce8a4f1b384164b5d9d94)
    (cherry picked from commit 71ec93ff69f0b724a1c51e9fa772b08a10506112)

 share/man/man4/Makefile | 5 +----
 sys/amd64/conf/GENERIC  | 1 +
 sys/amd64/conf/MINIMAL  | 1 +
 sys/conf/files.i386     | 1 -
 sys/conf/files.x86      | 1 +
 sys/i386/conf/NOTES     | 7 -------
 sys/modules/Makefile    | 4 +---
 sys/x86/conf/NOTES      | 1 +
 8 files changed, 6 insertions(+), 15 deletions(-)
Comment 4 Alan Somers freebsd_committer freebsd_triage 2026-06-11 21:01:55 UTC
I've already MFCed to stable/15 and re@ merged to releng/15.1.  There is no need to merge to stable/14, because padlock was never removed on that branch.  So this bug is complete.
Comment 5 commit-hook freebsd_committer freebsd_triage 2026-06-28 21:29:20 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=380c6f59c4f87dbc45a67983d927700ca7e22be2

commit 380c6f59c4f87dbc45a67983d927700ca7e22be2
Author:     Alexander Ziaee <ziaee@FreeBSD.org>
AuthorDate: 2026-06-28 21:27:35 +0000
Commit:     Alexander Ziaee <ziaee@FreeBSD.org>
CommitDate: 2026-06-28 21:27:47 +0000

    padlock.4: Update slightly for 64-bit hardware

    - Change the document description to "Via and Zhaoxin CPU crypto driver"
    - Add a HARDWARE section mentioning these in the hardware release note

    This manual still needs desperate help, but just this little bit could
    have saved a lot of confusion. I'd write more if I had information.

    PR:             295517
    Fixes:          14b8531c4ccb8 (Restore padlock_rng the the amd64 build)
    MFC after:      3 days (to 15 only)
    Reviewed by:    bcr, asomers
    Differential Revision:  https://reviews.freebsd.org/D57920

 share/man/man4/padlock.4 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)