From nobody Thu Sep 4 16:28:46 2025 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 4cHlKV6hlCz66NBk; Thu, 04 Sep 2025 16:28:46 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHlKV66cSz40fS; Thu, 04 Sep 2025 16:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757003326; 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=Wf6KIeIu2ilkDWTSffn+jfEfdMmRh//Cqe+MMaJoj0o=; b=tpBY1sTEUS+w59vBrekMHrTuLU2Txjcrd7JxoOhHFa+w65CIlv3djmMxNQ6ih5ekSsegKe xKDBHuqgrRnHje+2OwQj6s8QZO3756NemubKnWwIEaGYLG8VGve/CVbOG1aYDCIYQxiIdD R1y1owcxzOGSF2nXKg4zNP5gVBm/Mpcd41/eoGsba9dT6khaQoPcuJre8uLebLkLp08Zza n3dKqTDPxDw+2q82p6iED4OGzXEwYP68Gaj9mnw6wk2pNzJPcemJdMIhs8dN/Y7CwUgO/F JBkq2IQ9Ubtvfx/zdeuJCNhwKlrY60maPQbO0hC5Guqhyg2qQyi92N6pRqpgCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757003326; 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=Wf6KIeIu2ilkDWTSffn+jfEfdMmRh//Cqe+MMaJoj0o=; b=oBcrN48KwNY/CZ8D7l1dbZko7I5fKvGgP/owUu4u+xg4u5eG9vKtZ0DVNot8XaKbzdoK7p qdjYMczP9VpqRqwn6tz+Y8QtzPH0OptHB4MR46irhDkvYqitNaiMaaAt/bEgD+bxrrXFl9 Z8r+OXor6ia8zI+7cv8z/W0UbL3/NgNc/d2xzsMp6YwYWaOUckKuzjPtVj0AwFZQTCFRSY 92xCBUiXshE6hQyYE2wau7KWBr7ifyFDm5/37yPCNP6cNAwK1r2XDYwE5+8TC33xVvRjJH sC6BTi2z+0Ck1zvH9l+tr4S26HhXVgL+uAcI0ff9Ji27BOVHW7ldUdz8VTitJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757003326; a=rsa-sha256; cv=none; b=Y3JO1clc0JZsFu3vl7Q4pBY26vQo/gM74EhkASXENMX3lpohD/e3mQaKM0UxP4dyW6qQj2 FD2xlFc7TPXcpg/4l+fm1QEzv2hrIr+mJCoBsGACh23H37e7mVPKAZdpchOY221tZK3/OB xrXKz2XP3ipi3uBV7PqPZlHCnWa/Wn6bCFXsWz0olcqpE5bs2QceS9gy5UazaJwIWOpr+x 1ZolMS0cFrS3258cMdiFTNHdekRgPUfH72WPaBovh/Ykj+Mfr1sLP08bohPvgrCItcs286 AwHfGthmwYiGx7UZBQDao4l7+wcMssCg0K0ZS/ufwXws+lz5Y6nLDPOKk+liBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cHlKV5d2xz18xW; Thu, 04 Sep 2025 16:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584GSk5h033038; Thu, 4 Sep 2025 16:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584GSkpV033035; Thu, 4 Sep 2025 16:28:46 GMT (envelope-from git) Date: Thu, 4 Sep 2025 16:28:46 GMT Message-Id: <202509041628.584GSkpV033035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b3605a7bb6f8 - main - arm64: Add a macro to create cpu_feat 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3605a7bb6f8c58d939e642671ce70b0ce39b95e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b3605a7bb6f8c58d939e642671ce70b0ce39b95e commit b3605a7bb6f8c58d939e642671ce70b0ce39b95e Author: Andrew Turner AuthorDate: 2025-09-04 14:23:23 +0000 Commit: Andrew Turner CommitDate: 2025-09-04 14:25:41 +0000 arm64: Add a macro to create cpu_feat This will be used later to extend cpu feature detection Reviewed by: imp (earlier version) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52356 --- sys/arm/arm/generic_timer.c | 10 +++------- sys/arm64/arm64/identcpu.c | 11 +++-------- sys/arm64/arm64/machdep.c | 10 +++------- sys/arm64/arm64/pmap.c | 11 +++-------- sys/arm64/arm64/ptrauth.c | 11 +++-------- sys/arm64/include/cpu_feat.h | 10 ++++++++++ 6 files changed, 25 insertions(+), 38 deletions(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index a8c779dcba6d..841e5f9e96aa 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -901,13 +901,9 @@ wfxt_enable(const struct cpu_feat *feat __unused, enable_wfxt = true; } -static struct cpu_feat feat_wfxt = { - .feat_name = "FEAT_WFXT", - .feat_check = wfxt_check, - .feat_enable = wfxt_enable, - .feat_flags = CPU_FEAT_AFTER_DEV | CPU_FEAT_SYSTEM, -}; -DATA_SET(cpu_feat_set, feat_wfxt); +CPU_FEAT(feat_wfxt, + wfxt_check, NULL, wfxt_enable, + CPU_FEAT_AFTER_DEV | CPU_FEAT_SYSTEM); #endif static uint32_t diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index bcacea43ad2f..f823cbce37ed 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2358,14 +2358,9 @@ user_ctr_enable(const struct cpu_feat *feat __unused, isb(); } -static struct cpu_feat user_ctr = { - .feat_name = "Trap CTR_EL0", - .feat_check = user_ctr_check, - .feat_has_errata = user_ctr_has_errata, - .feat_enable = user_ctr_enable, - .feat_flags = CPU_FEAT_AFTER_DEV | CPU_FEAT_PER_CPU, -}; -DATA_SET(cpu_feat_set, user_ctr); +CPU_FEAT(trap_ctr, + user_ctr_check, user_ctr_has_errata, user_ctr_enable, + CPU_FEAT_AFTER_DEV | CPU_FEAT_PER_CPU); static bool user_ctr_handler(uint64_t esr, struct trapframe *frame) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 53856dd90cae..8a83185df9b1 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -202,13 +202,9 @@ pan_enable(const struct cpu_feat *feat __unused, ".arch_extension nopan \n"); } -static struct cpu_feat feat_pan = { - .feat_name = "FEAT_PAN", - .feat_check = pan_check, - .feat_enable = pan_enable, - .feat_flags = CPU_FEAT_EARLY_BOOT | CPU_FEAT_PER_CPU, -}; -DATA_SET(cpu_feat_set, feat_pan); +CPU_FEAT(feat_pan, + pan_check, NULL, pan_enable, + CPU_FEAT_EARLY_BOOT | CPU_FEAT_PER_CPU); bool has_hyp(void) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index ec89c4573799..77169e122106 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1716,14 +1716,9 @@ pmap_dbm_enable(const struct cpu_feat *feat __unused, isb(); } -static struct cpu_feat feat_dbm = { - .feat_name = "FEAT_HAFDBS (DBM)", - .feat_check = pmap_dbm_check, - .feat_has_errata = pmap_dbm_has_errata, - .feat_enable = pmap_dbm_enable, - .feat_flags = CPU_FEAT_AFTER_DEV | CPU_FEAT_PER_CPU, -}; -DATA_SET(cpu_feat_set, feat_dbm); +CPU_FEAT(feat_hafdbs, + pmap_dbm_check, pmap_dbm_has_errata, pmap_dbm_enable, + CPU_FEAT_AFTER_DEV | CPU_FEAT_PER_CPU); /* * Initialize the pmap module. diff --git a/sys/arm64/arm64/ptrauth.c b/sys/arm64/arm64/ptrauth.c index dbe0c69b8d60..7f7a1dd41d8d 100644 --- a/sys/arm64/arm64/ptrauth.c +++ b/sys/arm64/arm64/ptrauth.c @@ -155,14 +155,9 @@ ptrauth_enable(const struct cpu_feat *feat __unused, #endif } - -static struct cpu_feat feat_pauth = { - .feat_name = "FEAT_PAuth", - .feat_check = ptrauth_check, - .feat_enable = ptrauth_enable, - .feat_flags = CPU_FEAT_EARLY_BOOT | CPU_FEAT_SYSTEM, -}; -DATA_SET(cpu_feat_set, feat_pauth); +CPU_FEAT(feat_pauth, + ptrauth_check, NULL, ptrauth_enable, + CPU_FEAT_EARLY_BOOT | CPU_FEAT_SYSTEM); /* Copy the keys when forking a new process */ void diff --git a/sys/arm64/include/cpu_feat.h b/sys/arm64/include/cpu_feat.h index 9fe6a9dd95d9..6a0b2d78f526 100644 --- a/sys/arm64/include/cpu_feat.h +++ b/sys/arm64/include/cpu_feat.h @@ -64,6 +64,16 @@ struct cpu_feat { }; SET_DECLARE(cpu_feat_set, struct cpu_feat); +#define CPU_FEAT(name, check, has_errata, enable, flags) \ +static struct cpu_feat name = { \ + .feat_name = #name, \ + .feat_check = check, \ + .feat_has_errata = has_errata, \ + .feat_enable = enable, \ + .feat_flags = flags, \ +}; \ +DATA_SET(cpu_feat_set, name) + /* * Allow drivers to mark an erratum as worked around, e.g. the Errata * Management ABI may know the workaround isn't needed on a given system.