Commit 484de085 authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

arm64: Factor out cpucap definitions 



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: default avatarMark 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>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 20f3b8ea

arch/arm64/include/asm/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ generic-y += qspinlock.h 
generic-y += parport.h

generic-y += user.h



generated-y += cpucaps.h

generated-y += cpucap-defs.h

generated-y += sysreg-defs.h

arch/arm64/include/asm/cpucaps.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */



#ifndef __ASM_CPUCAPS_H

#define __ASM_CPUCAPS_H



#include <asm/cpucap-defs.h>



#endif /* __ASM_CPUCAPS_H */

arch/arm64/tools/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/arm64/tools/gen-cpucaps.awk

+3 −3
Original line number Diff line number Diff line
@@ -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