[03/37] arm64: Factor out cpucap definitions

Message ID	20230919092850.1940729-4-mark.rutland@arm.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> From: Mark Rutland <mark.rutland@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: ardb@kernel.org, bertrand.marquis@arm.com, boris.ostrovsky@oracle.com, broonie@kernel.org, catalin.marinas@arm.com, daniel.lezcano@linaro.org, james.morse@arm.com, jgross@suse.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, pcc@google.com, sstabellini@kernel.org, suzuki.poulose@arm.com, tglx@linutronix.de, vladimir.murzin@arm.com, will@kernel.org Subject: [PATCH 03/37] arm64: Factor out cpucap definitions Date: Tue, 19 Sep 2023 10:28:16 +0100 Message-Id: <20230919092850.1940729-4-mark.rutland@arm.com> In-Reply-To: <20230919092850.1940729-1-mark.rutland@arm.com> References: <20230919092850.1940729-1-mark.rutland@arm.com> MIME-Version: 1.0 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org
Series	arm64: Remove cpus_have_const_cap() \| expand [00/37] arm64: Remove cpus_have_const_cap() [01/37] clocksource/drivers/arm_arch_timer: Initialize evtstrm after finalizing cpucaps [02/37] arm64/arm: xen: enlighten: Fix KPTI checks [03/37] arm64: Factor out cpucap definitions [04/37] arm64: Add cpucap_is_possible() [05/37] arm64: Add cpus_have_final_boot_cap() [06/37] arm64: Rework setup_cpu_features() [07/37] arm64: Fixup user features at boot time [08/37] arm64: Split kpti_install_ng_mappings() [09/37] arm64: kvm: Use cpus_have_final_cap() explicitly [10/37] arm64: Explicitly save/restore CPACR when probing SVE and SME [11/37] arm64: Rename SVE/SME cpu_enable functions [12/37] arm64: Use a positive cpucap for FP/SIMD [13/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_{ADDRESS,GENERIC}_AUTH [14/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_ARMv8_4_TTL [15/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_BTI [16/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_CACHE_DIC [17/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_CNP [18/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_DIT [19/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_GIC_PRIO_MASKING [20/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_PAN [21/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_EPAN [22/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_RNG [23/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_WFXT [24/37] arm64: Avoid cpus_have_const_cap() for ARM64_HAS_TLB_RANGE [25/37] arm64: Avoid cpus_have_const_cap() for ARM64_MTE [26/37] arm64: Avoid cpus_have_const_cap() for ARM64_SSBS [27/37] arm64: Avoid cpus_have_const_cap() for ARM64_SPECTRE_V2 [28/37] arm64: Avoid cpus_have_const_cap() for ARM64_{SVE,SME,SME2,FA64} [29/37] arm64: Avoid cpus_have_const_cap() for ARM64_UNMAP_KERNEL_AT_EL0 [30/37] arm64: Avoid cpus_have_const_cap() for ARM64_WORKAROUND_843419 [31/37] arm64: Avoid cpus_have_const_cap() for ARM64_WORKAROUND_1542419 [32/37] arm64: Avoid cpus_have_const_cap() for ARM64_WORKAROUND_1742098 [33/37] arm64: Avoid cpus_have_const_cap() for ARM64_WORKAROUND_2645198 [34/37] arm64: Avoid cpus_have_const_cap() for ARM64_WORKAROUND_CAVIUM_23154 [35/37] arm64: Avoid cpus_have_const_cap() for ARM64_WORKAROUND_NVIDIA_CARMEL_CNP [36/37] arm64: Avoid cpus_have_const_cap() for ARM64_WORKAROUND_REPEAT_TLBI [37/37] arm64: Remove cpus_have_const_cap()

Message ID

20230919092850.1940729-4-mark.rutland@arm.com (mailing list archive)

State

New, archived

Headers

From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: ardb@kernel.org,
	bertrand.marquis@arm.com,
	boris.ostrovsky@oracle.com,
	broonie@kernel.org,
	catalin.marinas@arm.com,
	daniel.lezcano@linaro.org,
	james.morse@arm.com,
	jgross@suse.com,
	mark.rutland@arm.com,
	maz@kernel.org,
	oliver.upton@linux.dev,
	pcc@google.com,
	sstabellini@kernel.org,
	suzuki.poulose@arm.com,
	tglx@linutronix.de,
	vladimir.murzin@arm.com,
	will@kernel.org
Subject: [PATCH 03/37] arm64: Factor out cpucap definitions
Date: Tue, 19 Sep 2023 10:28:16 +0100
Message-Id: <20230919092850.1940729-4-mark.rutland@arm.com>
In-Reply-To: <20230919092850.1940729-1-mark.rutland@arm.com>
References: <20230919092850.1940729-1-mark.rutland@arm.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
Errors-To: 
 linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org

Series

arm64: Remove cpus_have_const_cap() | expand

Commit Message

Mark Rutland Sept. 19, 2023, 9:28 a.m. UTC

For clarity it would be nice to factor cpucap manipulation out of
<asm/cpufeature.h>, and the obvious place would be <asm/cpucap.h>, but
this will clash somewhat with <generated/asm/cpucaps.h>.

Rename <generated/asm/cpucaps.h> to <generated/asm/cpucap-defs.h>,
matching what we do for <generated/asm/sysreg-defs.h>, and introduce a
new <asm/cpucaps.h> which includes the generated header.

Subsequent patches will fill out <asm/cpucaps.h>.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Will Deacon <will@kernel.org>
---
 arch/arm64/include/asm/cpucaps.h | 8 ++++++++
 arch/arm64/tools/Makefile        | 4 ++--
 arch/arm64/tools/gen-cpucaps.awk | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm64/include/asm/cpucaps.h

diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h
new file mode 100644
index 0000000000000..7333b5bbf4488
--- /dev/null
+++ b/arch/arm64/include/asm/cpucaps.h
@@ -0,0 +1,8 @@ 
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_CPUCAPS_H
+#define __ASM_CPUCAPS_H
+
+#include <asm/cpucap-defs.h>
+
+#endif /* __ASM_CPUCAPS_H */
diff --git a/arch/arm64/tools/Makefile b/arch/arm64/tools/Makefile
index 07a93ab21a62b..fa2251d9762d9 100644
--- a/arch/arm64/tools/Makefile
+++ b/arch/arm64/tools/Makefile
@@ -3,7 +3,7 @@ 
 gen := arch/$(ARCH)/include/generated
 kapi := $(gen)/asm
 
-kapi-hdrs-y := $(kapi)/cpucaps.h $(kapi)/sysreg-defs.h
+kapi-hdrs-y := $(kapi)/cpucap-defs.h $(kapi)/sysreg-defs.h
 
 targets += $(addprefix ../../../, $(kapi-hdrs-y))
 
@@ -17,7 +17,7 @@  quiet_cmd_gen_cpucaps = GEN     $@
 quiet_cmd_gen_sysreg = GEN     $@
       cmd_gen_sysreg = mkdir -p $(dir $@); $(AWK) -f $(real-prereqs) > $@
 
-$(kapi)/cpucaps.h: $(src)/gen-cpucaps.awk $(src)/cpucaps FORCE
+$(kapi)/cpucap-defs.h: $(src)/gen-cpucaps.awk $(src)/cpucaps FORCE
 	$(call if_changed,gen_cpucaps)
 
 $(kapi)/sysreg-defs.h: $(src)/gen-sysreg.awk $(src)/sysreg FORCE
diff --git a/arch/arm64/tools/gen-cpucaps.awk b/arch/arm64/tools/gen-cpucaps.awk
index 8525980379d71..2f4f61a0af17e 100755
--- a/arch/arm64/tools/gen-cpucaps.awk
+++ b/arch/arm64/tools/gen-cpucaps.awk
@@ -15,8 +15,8 @@  function fatal(msg) {
 /^#/ { next }
 
 BEGIN {
-	print "#ifndef __ASM_CPUCAPS_H"
-	print "#define __ASM_CPUCAPS_H"
+	print "#ifndef __ASM_CPUCAP_DEFS_H"
+	print "#define __ASM_CPUCAP_DEFS_H"
 	print ""
 	print "/* Generated file - do not edit */"
 	cap_num = 0
@@ -31,7 +31,7 @@  BEGIN {
 END {
 	printf("#define ARM64_NCAPS\t\t\t\t\t%d\n", cap_num)
 	print ""
-	print "#endif /* __ASM_CPUCAPS_H */"
+	print "#endif /* __ASM_CPUCAP_DEFS_H */"
 }
 
 # Any lines not handled by previous rules are unexpected

[03/37] arm64: Factor out cpucap definitions

Commit Message

Patch