Commit d5925c19 authored by Zengruan Ye's avatar Zengruan Ye Committed by lishusen
Browse files

arm64: cpufeature: TWED support detection 

virt inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8WMG6


CVE: NA

-----------------------------

TWE Delay is an optional feature in ARMv8.6 Extensions. This patch
detect this feature.

Signed-off-by: default avatarZengruan Ye <yezengruan@huawei.com>
Signed-off-by: default avatarJingyi Wang <wangjingyi11@huawei.com>
Signed-off-by: default avatarlishusen <lishusen2@huawei.com>
parent 6f420dad

arch/arm64/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -2183,6 +2183,16 @@ config ARM64_MTE 


endmenu # "ARMv8.5 architectural features"



menu "ARMv8.6 architectural features"



config ARM64_TWED

	bool "Enable support for delayed trapping of WFE"

	default y

	help

	  Delayed Trapping of WFE (part of the ARMv8.6 Extensions)



endmenu



menu "ARMv8.7 architectural features"



config ARM64_EPAN

arch/arm64/configs/openeuler_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -533,6 +533,12 @@ CONFIG_ARM64_AS_HAS_MTE=y 
# CONFIG_ARM64_MTE is not set

# end of ARMv8.5 architectural features



#

# ARMv8.6 architectural features

#

CONFIG_ARM64_TWED=y

# end of ARMv8.6 architectural features



#

# ARMv8.7 architectural features

#

arch/arm64/kernel/cpufeature.c

+9 −0
Original line number Diff line number Diff line
@@ -2791,6 +2791,15 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
		.cpu_enable = cpu_enable_mpam,

		ARM64_CPUID_FIELDS(ID_AA64PFR0_EL1, MPAM, 1)

	},

#endif

#ifdef CONFIG_ARM64_TWED

	{

		.desc = "Delayed Trapping of WFE",

		.capability = ARM64_HAS_TWED,

		.type = ARM64_CPUCAP_SYSTEM_FEATURE,

		.matches = has_cpuid_feature,

		ARM64_CPUID_FIELDS(ID_AA64MMFR1_EL1, TWED, IMP)

	},

#endif

	{},

};

arch/arm64/tools/cpucaps

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ HAS_STAGE2_FWB 
HAS_TCR2

HAS_TIDCP1

HAS_TLB_RANGE

HAS_TWED

HAS_VIRT_HOST_EXTN

HAS_WFXT

HW_DBM