diff options
| author | Borislav Petkov <bp@suse.de> | 2022-03-21 12:34:57 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-03-21 12:34:57 +0300 |
| commit | 1422df58e5eb83dca131dc64e0f307a1f9e56078 (patch) | |
| tree | f54bb7952a406cd783cbdbfe1b5ac4f80de02d68 /arch/arm64/kvm/vgic/vgic-v3.c | |
| parent | e1bca853dddcb57cbf084acbf35e3654cef6fc75 (diff) | |
| parent | 2151c84ece920dc55942495004a823cbecb921e5 (diff) | |
| download | linux-1422df58e5eb83dca131dc64e0f307a1f9e56078.tar.xz | |
Merge branch 'edac-amd64' into edac-updates-for-v5.18
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/arm64/kvm/vgic/vgic-v3.c')
| -rw-r--r-- | arch/arm64/kvm/vgic/vgic-v3.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c index a33d4366b326..b549af8b1dc2 100644 --- a/arch/arm64/kvm/vgic/vgic-v3.c +++ b/arch/arm64/kvm/vgic/vgic-v3.c @@ -609,6 +609,18 @@ static int __init early_gicv4_enable(char *buf) } early_param("kvm-arm.vgic_v4_enable", early_gicv4_enable); +static const struct midr_range broken_seis[] = { + MIDR_ALL_VERSIONS(MIDR_APPLE_M1_ICESTORM), + MIDR_ALL_VERSIONS(MIDR_APPLE_M1_FIRESTORM), + {}, +}; + +static bool vgic_v3_broken_seis(void) +{ + return ((kvm_vgic_global_state.ich_vtr_el2 & ICH_VTR_SEIS_MASK) && + is_midr_in_range_list(read_cpuid_id(), broken_seis)); +} + /** * vgic_v3_probe - probe for a VGICv3 compatible interrupt controller * @info: pointer to the GIC description @@ -676,9 +688,10 @@ int vgic_v3_probe(const struct gic_kvm_info *info) group1_trap = true; } - if (kvm_vgic_global_state.ich_vtr_el2 & ICH_VTR_SEIS_MASK) { - kvm_info("GICv3 with locally generated SEI\n"); + if (vgic_v3_broken_seis()) { + kvm_info("GICv3 with broken locally generated SEI\n"); + kvm_vgic_global_state.ich_vtr_el2 &= ~ICH_VTR_SEIS_MASK; group0_trap = true; group1_trap = true; if (ich_vtr_el2 & ICH_VTR_TDS_MASK) |