Commit 9c4a2514 authored by Joey Gouly's avatar Joey Gouly Committed by Catalin Marinas
Browse files

arm64: cpufeature: add POE to cpucap_is_possible() 



Since de66cb37 ("arm64: Add cpucap_is_possible()"),
alternative_has_cap_unlikely() includes the IS_ENABLED() check.

Add CONFIG_ARM64_POE to cpucap_is_possible() to avoid the explicit check.

Signed-off-by: default avatarJoey Gouly <joey.gouly@arm.com>
Cc: Will Deacon <will@kernel.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20241008140121.2774348-1-joey.gouly@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 8ef41786

arch/arm64/include/asm/cpucaps.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ cpucap_is_possible(const unsigned int cap) 
		return IS_ENABLED(CONFIG_ARM64_BTI);

	case ARM64_HAS_TLB_RANGE:

		return IS_ENABLED(CONFIG_ARM64_TLB_RANGE);

	case ARM64_HAS_S1POE:

		return IS_ENABLED(CONFIG_ARM64_POE);

	case ARM64_UNMAP_KERNEL_AT_EL0:

		return IS_ENABLED(CONFIG_UNMAP_KERNEL_AT_EL0);

	case ARM64_WORKAROUND_843419:

arch/arm64/include/asm/cpufeature.h

+1 −2
Original line number Diff line number Diff line
@@ -834,8 +834,7 @@ static inline bool system_supports_lpa2(void) 


static inline bool system_supports_poe(void)

{

	return IS_ENABLED(CONFIG_ARM64_POE) &&

		alternative_has_cap_unlikely(ARM64_HAS_S1POE);

	return alternative_has_cap_unlikely(ARM64_HAS_S1POE);

}



int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt);