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

Commit 93c95e04 authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch '1342-s-fp3-unsupported-cpu' into 'v1-s' 

Unsupported CPU feature variation during FP3 boot

See merge request !16
parents 7861ca30 387562df

arch/arm64/kernel/cpufeature.c

+12 −0
Original line number Diff line number Diff line
@@ -126,9 +126,21 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = { 


static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = {

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 32, 32, 0),

#ifdef CONFIG_ARM64_4K_PAGES

	S_ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN4_SHIFT, 4, ID_AA64MMFR0_TGRAN4_NI),

#else

	S_ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN4_SHIFT, 4, ID_AA64MMFR0_TGRAN4_NI),

#endif

#ifdef CONFIG_AARM64_64K_PAGES

	S_ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN64_SHIFT, 4, ID_AA64MMFR0_TGRAN64_NI),

#else

	S_ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN64_SHIFT, 4, ID_AA64MMFR0_TGRAN64_NI),

#endif

#ifdef CONFIG_AARM64_16K_PAGES

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN16_SHIFT, 4, ID_AA64MMFR0_TGRAN16_NI),

#else

	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_TGRAN16_SHIFT, 4, ID_AA64MMFR0_TGRAN16_NI),

#endif

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64MMFR0_BIGENDEL0_SHIFT, 4, 0),

	/* Linux shouldn't care about secure memory */

	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, ID_AA64MMFR0_SNSMEM_SHIFT, 4, 0),