diff options
| author | Govindraj Raja <govindraj.raja@arm.com> | 2023-09-19 08:43:16 -0500 |
|---|---|---|
| committer | Govindraj Raja <govindraj.raja@arm.com> | 2023-09-19 08:46:09 -0500 |
| commit | 8b2048c1c019d799d1806926724c2fbbc399c4c1 (patch) | |
| tree | ec027823464a1036e7e8033586d9530455baec5b | |
| parent | 455cd0d3b55b3588e29bc4c44cec529fee7351e1 (diff) | |
fix(cpufeat): move nested virtualization support to optionals
Commit(f5211420b refactor(cpufeat): refactor arch feature build
options) accidentally added nested virtualization support to mandatory
8.4 features move this to optional 8.4 features list.
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
Change-Id: I3eb84ea489b6a5cc419359bc056aaadcced0ad0e
| -rw-r--r-- | make_helpers/arch_features.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/make_helpers/arch_features.mk b/make_helpers/arch_features.mk index 5cd89f0eb..f90136b78 100644 --- a/make_helpers/arch_features.mk +++ b/make_helpers/arch_features.mk @@ -55,11 +55,6 @@ CTX_INCLUDE_PAUTH_REGS := 0 # Flag to enable Secure EL-2 feature. ENABLE_FEAT_SEL2 := 0 -# Include nested virtualization control (Armv8.4-NV) registers in cpu context. -# This must be set to 1 if architecture implements Nested Virtualization -# Extension and platform wants to use this feature in the Secure world. -CTX_INCLUDE_NEVE_REGS := 0 - # By default, disable trace filter control register access to lower non-secure # exception levels, i.e. NS-EL2, or NS-EL1 if NS-EL2 is implemented, but # trace filter control register access is unused if FEAT_TRF is implemented. @@ -127,7 +122,6 @@ endif # Enable the features which are mandatory from ARCH version 8.4 and upwards. ifeq "8.4" "$(word 1, $(sort 8.4 $(ARM_ARCH_MAJOR).$(ARM_ARCH_MINOR)))" ENABLE_FEAT_SEL2 := 1 -CTX_INCLUDE_NEVE_REGS := 1 ENABLE_TRF_FOR_NS := 1 ENABLE_FEAT_DIT := 1 endif @@ -222,6 +216,11 @@ AMU_RESTRICT_COUNTERS ?= 0 # Build option to enable MPAM for lower ELs. ENABLE_MPAM_FOR_LOWER_ELS ?= 0 +# Include nested virtualization control (Armv8.4-NV) registers in cpu context. +# This must be set to 1 if architecture implements Nested Virtualization +# Extension and platform wants to use this feature in the Secure world. +CTX_INCLUDE_NEVE_REGS ?= 0 + #---- # 8.5 #---- |