Commit 075c2dc7 authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: arm64: Advertise support for FEAT_SCTLR2 



Everything is in place to handle the additional state for SCTLR2_ELx,
which is all that FEAT_SCTLR2 implies.

Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20250708172532.1699409-22-oliver.upton@linux.dev


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 1f1c08d9

arch/arm64/kvm/sys_regs.c

+5 −2
Original line number Diff line number Diff line
@@ -1644,7 +1644,9 @@ static u64 __kvm_read_sanitised_id_reg(const struct kvm_vcpu *vcpu, 
		val &= ~ID_AA64MMFR2_EL1_NV;

		break;

	case SYS_ID_AA64MMFR3_EL1:

		val &= ID_AA64MMFR3_EL1_TCRX | ID_AA64MMFR3_EL1_S1POE |

		val &= ID_AA64MMFR3_EL1_TCRX |

		       ID_AA64MMFR3_EL1_SCTLRX |

		       ID_AA64MMFR3_EL1_S1POE |

		       ID_AA64MMFR3_EL1_S1PIE;

		break;

	case SYS_ID_MMFR4_EL1:
@@ -2961,6 +2963,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
					ID_AA64MMFR2_EL1_NV |

					ID_AA64MMFR2_EL1_CCIDX)),

	ID_WRITABLE(ID_AA64MMFR3_EL1, (ID_AA64MMFR3_EL1_TCRX	|

				       ID_AA64MMFR3_EL1_SCTLRX	|

				       ID_AA64MMFR3_EL1_S1PIE   |

				       ID_AA64MMFR3_EL1_S1POE)),

	ID_WRITABLE(ID_AA64MMFR4_EL1, ID_AA64MMFR4_EL1_NV_frac),