macOS 27.0 has some more feature registers available. Fetch them (but not using the values yet).
Also fetch DCZID_EL0 at the same time. Signed-off-by: Mohamed Mediouni <[email protected]> Reviewed-by: Peter Maydell <[email protected]> --- target/arm/hvf/hvf.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index acbc257091..e1ddfe14c7 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1142,16 +1142,14 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) } regs[] = { { HV_FEATURE_REG_ID_AA64PFR0_EL1, ID_AA64PFR0_EL1_IDX }, { HV_FEATURE_REG_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_IDX }, - /* Add ID_AA64PFR2_EL1 here when HVF supports it */ { HV_FEATURE_REG_ID_AA64DFR0_EL1, ID_AA64DFR0_EL1_IDX }, { HV_FEATURE_REG_ID_AA64DFR1_EL1, ID_AA64DFR1_EL1_IDX }, { HV_FEATURE_REG_ID_AA64ISAR0_EL1, ID_AA64ISAR0_EL1_IDX }, { HV_FEATURE_REG_ID_AA64ISAR1_EL1, ID_AA64ISAR1_EL1_IDX }, - /* Add ID_AA64ISAR2_EL1 here when HVF supports it */ { HV_FEATURE_REG_ID_AA64MMFR0_EL1, ID_AA64MMFR0_EL1_IDX }, { HV_FEATURE_REG_ID_AA64MMFR1_EL1, ID_AA64MMFR1_EL1_IDX }, { HV_FEATURE_REG_ID_AA64MMFR2_EL1, ID_AA64MMFR2_EL1_IDX }, - /* Add ID_AA64MMFR3_EL1 here when HVF supports it */ + { HV_FEATURE_REG_DCZID_EL0, DCZID_EL0_IDX}, }; hv_return_t r = HV_SUCCESS; hv_vcpu_config_t config = hv_vcpu_config_create(); @@ -1191,6 +1189,22 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) } } + if (__builtin_available(macOS 27.0, *)) { + static const struct isar_regs { + hv_feature_reg_t reg; + ARMIDRegisterIdx index; + } new_regs[] = { + { HV_FEATURE_REG_ID_AA64ISAR2_EL1, ID_AA64ISAR2_EL1_IDX }, + { HV_FEATURE_REG_ID_AA64PFR2_EL1, ID_AA64PFR2_EL1_IDX }, + { HV_FEATURE_REG_ID_AA64MMFR3_EL1, ID_AA64MMFR3_EL1_IDX }, + { HV_FEATURE_REG_ID_AA64MMFR4_EL1, ID_AA64MMFR4_EL1_IDX }, + }; + for (i = 0; i < ARRAY_SIZE(new_regs); i++) { + r |= hv_vcpu_config_get_feature_reg(config, new_regs[i].reg, + &host_isar.idregs[new_regs[i].index]); + } + } + os_release(config); /* -- 2.54.0 (Apple Git-157)
