Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e0f2478 authored by Dave Martin's avatar Dave Martin Committed by Will Deacon
Browse files

arm64/sve: Probe SVE capabilities and usable vector lengths 



This patch uses the cpufeatures framework to determine common SVE
capabilities and vector lengths, and configures the runtime SVE
support code appropriately.

ZCR_ELx is not really a feature register, but it is convenient to
use it as a template for recording the maximum vector length
supported by a CPU, using the LEN field.  This field is similar to
a feature field in that it is a contiguous bitfield for which we
want to determine the minimum system-wide value.  This patch adds
ZCR as a pseudo-register in cpuinfo/cpufeatures, with appropriate
custom code to populate it.  Finding the minimum supported value of
the LEN field is left to the cpufeatures framework in the usual
way.

The meaning of ID_AA64ZFR0_EL1 is not architecturally defined yet,
so for now we just require it to be zero.

Note that much of this code is dormant and SVE still won't be used
yet, since system_supports_sve() remains hardwired to false.

Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 8f1eec57

arch/arm64/include/asm/cpu.h

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct cpuinfo_arm64 { 
	u64		reg_id_aa64mmfr2;

	u64		reg_id_aa64pfr0;

	u64		reg_id_aa64pfr1;

	u64		reg_id_aa64zfr0;



	u32		reg_id_dfr0;

	u32		reg_id_isar0;
@@ -59,6 +60,9 @@ struct cpuinfo_arm64 { 
	u32		reg_mvfr0;

	u32		reg_mvfr1;

	u32		reg_mvfr2;



	/* pseudo-ZCR for recording maximum ZCR_EL1 LEN value: */

	u64		reg_zcr;

};



DECLARE_PER_CPU(struct cpuinfo_arm64, cpu_data);

arch/arm64/include/asm/cpufeature.h

+36 −0
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ 
#define __ASM_CPUFEATURE_H



#include <asm/cpucaps.h>

#include <asm/fpsimd.h>

#include <asm/hwcap.h>

#include <asm/sigcontext.h>

#include <asm/sysreg.h>



/*
@@ -223,6 +225,13 @@ static inline bool id_aa64pfr0_32bit_el0(u64 pfr0) 
	return val == ID_AA64PFR0_EL0_32BIT_64BIT;

}



static inline bool id_aa64pfr0_sve(u64 pfr0)

{

	u32 val = cpuid_feature_extract_unsigned_field(pfr0, ID_AA64PFR0_SVE_SHIFT);



	return val > 0;

}



void __init setup_cpu_features(void);



void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,
@@ -267,6 +276,33 @@ static inline bool system_supports_sve(void) 
	return false;

}



/*

 * Read the pseudo-ZCR used by cpufeatures to identify the supported SVE

 * vector length.

 *

 * Use only if SVE is present.

 * This function clobbers the SVE vector length.

 */

static inline u64 read_zcr_features(void)

{

	u64 zcr;

	unsigned int vq_max;



	/*

	 * Set the maximum possible VL, and write zeroes to all other

	 * bits to see if they stick.

	 */

	sve_kernel_enable(NULL);

	write_sysreg_s(ZCR_ELx_LEN_MASK, SYS_ZCR_EL1);



	zcr = read_sysreg_s(SYS_ZCR_EL1);

	zcr &= ~(u64)ZCR_ELx_LEN_MASK; /* find sticky 1s outside LEN field */

	vq_max = sve_vq_from_vl(sve_get_vl());

	zcr |= vq_max - 1; /* set LEN field to maximum effective value */



	return zcr;

}



#endif /* __ASSEMBLY__ */



#endif

arch/arm64/include/asm/fpsimd.h

+14 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ extern void sve_save_state(void *state, u32 *pfpsr); 
extern void sve_load_state(void const *state, u32 const *pfpsr,

			   unsigned long vq_minus_1);

extern unsigned int sve_get_vl(void);

extern int sve_kernel_enable(void *);



extern int __ro_after_init sve_max_vl;
@@ -90,10 +91,23 @@ extern void fpsimd_release_task(struct task_struct *task); 
extern int sve_set_vector_length(struct task_struct *task,

				 unsigned long vl, unsigned long flags);



/*

 * Probing and setup functions.

 * Calls to these functions must be serialised with one another.

 */

extern void __init sve_init_vq_map(void);

extern void sve_update_vq_map(void);

extern int sve_verify_vq_map(void);

extern void __init sve_setup(void);



#else /* ! CONFIG_ARM64_SVE */



static inline void sve_alloc(struct task_struct *task) { }

static inline void fpsimd_release_task(struct task_struct *task) { }

static inline void sve_init_vq_map(void) { }

static inline void sve_update_vq_map(void) { }

static inline int sve_verify_vq_map(void) { return 0; }

static inline void sve_setup(void) { }



#endif /* ! CONFIG_ARM64_SVE */

arch/arm64/kernel/cpufeature.c

+52 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/cpu.h>

#include <asm/cpufeature.h>

#include <asm/cpu_ops.h>

#include <asm/fpsimd.h>

#include <asm/mmu_context.h>

#include <asm/processor.h>

#include <asm/sysreg.h>
@@ -287,6 +288,12 @@ static const struct arm64_ftr_bits ftr_id_dfr0[] = { 
	ARM64_FTR_END,

};



static const struct arm64_ftr_bits ftr_zcr[] = {

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE,

		ZCR_ELx_LEN_SHIFT, ZCR_ELx_LEN_SIZE, 0),	/* LEN */

	ARM64_FTR_END,

};



/*

 * Common ftr bits for a 32bit register with all hidden, strict

 * attributes, with 4bit feature fields and a default safe value of
@@ -353,6 +360,7 @@ static const struct __ftr_reg_entry { 
	/* Op1 = 0, CRn = 0, CRm = 4 */

	ARM64_FTR_REG(SYS_ID_AA64PFR0_EL1, ftr_id_aa64pfr0),

	ARM64_FTR_REG(SYS_ID_AA64PFR1_EL1, ftr_raz),

	ARM64_FTR_REG(SYS_ID_AA64ZFR0_EL1, ftr_raz),



	/* Op1 = 0, CRn = 0, CRm = 5 */

	ARM64_FTR_REG(SYS_ID_AA64DFR0_EL1, ftr_id_aa64dfr0),
@@ -367,6 +375,9 @@ static const struct __ftr_reg_entry { 
	ARM64_FTR_REG(SYS_ID_AA64MMFR1_EL1, ftr_id_aa64mmfr1),

	ARM64_FTR_REG(SYS_ID_AA64MMFR2_EL1, ftr_id_aa64mmfr2),



	/* Op1 = 0, CRn = 1, CRm = 2 */

	ARM64_FTR_REG(SYS_ZCR_EL1, ftr_zcr),



	/* Op1 = 3, CRn = 0, CRm = 0 */

	{ SYS_CTR_EL0, &arm64_ftr_reg_ctrel0 },

	ARM64_FTR_REG(SYS_DCZID_EL0, ftr_dczid),
@@ -504,6 +515,7 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info) 
	init_cpu_ftr_reg(SYS_ID_AA64MMFR2_EL1, info->reg_id_aa64mmfr2);

	init_cpu_ftr_reg(SYS_ID_AA64PFR0_EL1, info->reg_id_aa64pfr0);

	init_cpu_ftr_reg(SYS_ID_AA64PFR1_EL1, info->reg_id_aa64pfr1);

	init_cpu_ftr_reg(SYS_ID_AA64ZFR0_EL1, info->reg_id_aa64zfr0);



	if (id_aa64pfr0_32bit_el0(info->reg_id_aa64pfr0)) {

		init_cpu_ftr_reg(SYS_ID_DFR0_EL1, info->reg_id_dfr0);
@@ -524,6 +536,10 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info) 
		init_cpu_ftr_reg(SYS_MVFR2_EL1, info->reg_mvfr2);

	}



	if (id_aa64pfr0_sve(info->reg_id_aa64pfr0)) {

		init_cpu_ftr_reg(SYS_ZCR_EL1, info->reg_zcr);

		sve_init_vq_map();

	}

}



static void update_cpu_ftr_reg(struct arm64_ftr_reg *reg, u64 new)
@@ -627,6 +643,9 @@ void update_cpu_features(int cpu, 
	taint |= check_update_ftr_reg(SYS_ID_AA64PFR1_EL1, cpu,

				      info->reg_id_aa64pfr1, boot->reg_id_aa64pfr1);



	taint |= check_update_ftr_reg(SYS_ID_AA64ZFR0_EL1, cpu,

				      info->reg_id_aa64zfr0, boot->reg_id_aa64zfr0);



	/*

	 * If we have AArch32, we care about 32-bit features for compat.

	 * If the system doesn't support AArch32, don't update them.
@@ -674,6 +693,16 @@ void update_cpu_features(int cpu, 
					info->reg_mvfr2, boot->reg_mvfr2);

	}



	if (id_aa64pfr0_sve(info->reg_id_aa64pfr0)) {

		taint |= check_update_ftr_reg(SYS_ZCR_EL1, cpu,

					info->reg_zcr, boot->reg_zcr);



		/* Probe vector lengths, unless we already gave up on SVE */

		if (id_aa64pfr0_sve(read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1)) &&

		    !sys_caps_initialised)

			sve_update_vq_map();

	}



	/*

	 * Mismatched CPU features are a recipe for disaster. Don't even

	 * pretend to support them.
@@ -1106,6 +1135,23 @@ verify_local_cpu_features(const struct arm64_cpu_capabilities *caps) 
	}

}



static void verify_sve_features(void)

{

	u64 safe_zcr = read_sanitised_ftr_reg(SYS_ZCR_EL1);

	u64 zcr = read_zcr_features();



	unsigned int safe_len = safe_zcr & ZCR_ELx_LEN_MASK;

	unsigned int len = zcr & ZCR_ELx_LEN_MASK;



	if (len < safe_len || sve_verify_vq_map()) {

		pr_crit("CPU%d: SVE: required vector length(s) missing\n",

			smp_processor_id());

		cpu_die_early();

	}



	/* Add checks on other ZCR bits here if necessary */

}



/*

 * Run through the enabled system capabilities and enable() it on this CPU.

 * The capabilities were decided based on the available CPUs at the boot time.
@@ -1119,8 +1165,12 @@ static void verify_local_cpu_capabilities(void) 
	verify_local_cpu_errata_workarounds();

	verify_local_cpu_features(arm64_features);

	verify_local_elf_hwcaps(arm64_elf_hwcaps);



	if (system_supports_32bit_el0())

		verify_local_elf_hwcaps(compat_elf_hwcaps);



	if (system_supports_sve())

		verify_sve_features();

}



void check_local_cpu_capabilities(void)
@@ -1198,6 +1248,8 @@ void __init setup_cpu_features(void) 
	if (system_supports_32bit_el0())

		setup_elf_hwcaps(compat_elf_hwcaps);



	sve_setup();



	/* Advertise that we have computed the system capabilities */

	set_sys_caps_initialised();

arch/arm64/kernel/cpuinfo.c

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/cpu.h>

#include <asm/cputype.h>

#include <asm/cpufeature.h>

#include <asm/fpsimd.h>



#include <linux/bitops.h>

#include <linux/bug.h>
@@ -331,6 +332,7 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) 
	info->reg_id_aa64mmfr2 = read_cpuid(ID_AA64MMFR2_EL1);

	info->reg_id_aa64pfr0 = read_cpuid(ID_AA64PFR0_EL1);

	info->reg_id_aa64pfr1 = read_cpuid(ID_AA64PFR1_EL1);

	info->reg_id_aa64zfr0 = read_cpuid(ID_AA64ZFR0_EL1);



	/* Update the 32bit ID registers only if AArch32 is implemented */

	if (id_aa64pfr0_32bit_el0(info->reg_id_aa64pfr0)) {
@@ -353,6 +355,10 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) 
		info->reg_mvfr2 = read_cpuid(MVFR2_EL1);

	}



	if (IS_ENABLED(CONFIG_ARM64_SVE) &&

	    id_aa64pfr0_sve(info->reg_id_aa64pfr0))

		info->reg_zcr = read_zcr_features();



	cpuinfo_detect_icache_policy(info);

}