Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: arm64: vgic: Add Apple M2 cpus to the list of broken SEIS implementations

I really hoped that Apple had fixed their not-quite-a-vgic implementation
when moving from M1 to M2. Alas, it seems they didn't, and running
a buggy EFI version results in the vgic generating SErrors outside
of the guest and taking the host down.

Apply the same workaround as for M1. Yes, this is all a bit crap.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230103095022.3230946-2-maz@kernel.org

+6
+4
arch/arm64/include/asm/cputype.h
··· 124 124 #define APPLE_CPU_PART_M1_FIRESTORM_PRO 0x025 125 125 #define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028 126 126 #define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029 127 + #define APPLE_CPU_PART_M2_BLIZZARD 0x032 128 + #define APPLE_CPU_PART_M2_AVALANCHE 0x033 127 129 128 130 #define AMPERE_CPU_PART_AMPERE1 0xAC3 129 131 ··· 179 177 #define MIDR_APPLE_M1_FIRESTORM_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO) 180 178 #define MIDR_APPLE_M1_ICESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX) 181 179 #define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX) 180 + #define MIDR_APPLE_M2_BLIZZARD MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD) 181 + #define MIDR_APPLE_M2_AVALANCHE MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE) 182 182 #define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1) 183 183 184 184 /* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */
+2
arch/arm64/kvm/vgic/vgic-v3.c
··· 616 616 MIDR_ALL_VERSIONS(MIDR_APPLE_M1_FIRESTORM_PRO), 617 617 MIDR_ALL_VERSIONS(MIDR_APPLE_M1_ICESTORM_MAX), 618 618 MIDR_ALL_VERSIONS(MIDR_APPLE_M1_FIRESTORM_MAX), 619 + MIDR_ALL_VERSIONS(MIDR_APPLE_M2_BLIZZARD), 620 + MIDR_ALL_VERSIONS(MIDR_APPLE_M2_AVALANCHE), 619 621 {}, 620 622 }; 621 623