@@ -426,6 +426,17 @@ static struct feature_config_ctrl ftr_ctrl_amu = {
.cfg_val = CPTR_EL2_TAM,
};
+/* For ID_AA64PFR1_EL1 */
+static struct feature_config_ctrl ftr_ctrl_mte = {
+ .ftr_reg = SYS_ID_AA64PFR1_EL1,
+ .ftr_shift = ID_AA64PFR1_MTE_SHIFT,
+ .ftr_min = ID_AA64PFR1_MTE_EL0,
+ .ftr_signed = FTR_UNSIGNED,
+ .cfg_reg = VCPU_HCR_EL2,
+ .cfg_mask = (HCR_TID5 | HCR_DCT | HCR_ATA),
+ .cfg_val = HCR_TID5,
+};
+
struct id_reg_info {
u32 sys_reg; /* Register ID */
u64 sys_val; /* Sanitized system value */
@@ -904,6 +915,10 @@ static struct id_reg_info id_aa64pfr1_el1_info = {
.init = init_id_aa64pfr1_el1_info,
.validate = validate_id_aa64pfr1_el1,
.get_reset_val = get_reset_id_aa64pfr1_el1,
+ .trap_features = &(const struct feature_config_ctrl *[]) {
+ &ftr_ctrl_mte,
+ NULL,
+ },
};
static struct id_reg_info id_aa64isar0_el1_info = {
Add feature_config_ctrl for MTE, which is indicated in ID_AA64PFR1_EL1, to program configuration register to trap the guest's using the feature when it is not exposed to the guest. Signed-off-by: Reiji Watanabe <reijiw@google.com> --- arch/arm64/kvm/sys_regs.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)