Commit decb17ae authored by Marc Zyngier's avatar Marc Zyngier
Browse files

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: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230103095022.3230946-2-maz@kernel.org
parent 88603b6d

arch/arm64/include/asm/cputype.h

+4 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ 
#define APPLE_CPU_PART_M1_FIRESTORM_PRO	0x025

#define APPLE_CPU_PART_M1_ICESTORM_MAX	0x028

#define APPLE_CPU_PART_M1_FIRESTORM_MAX	0x029

#define APPLE_CPU_PART_M2_BLIZZARD	0x032

#define APPLE_CPU_PART_M2_AVALANCHE	0x033



#define AMPERE_CPU_PART_AMPERE1		0xAC3
@@ -177,6 +179,8 @@ 
#define MIDR_APPLE_M1_FIRESTORM_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO)

#define MIDR_APPLE_M1_ICESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX)

#define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX)

#define MIDR_APPLE_M2_BLIZZARD MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD)

#define MIDR_APPLE_M2_AVALANCHE MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE)

#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1)



/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */

arch/arm64/kvm/vgic/vgic-v3.c

+2 −0
Original line number Diff line number Diff line
@@ -616,6 +616,8 @@ static const struct midr_range broken_seis[] = { 
	MIDR_ALL_VERSIONS(MIDR_APPLE_M1_FIRESTORM_PRO),

	MIDR_ALL_VERSIONS(MIDR_APPLE_M1_ICESTORM_MAX),

	MIDR_ALL_VERSIONS(MIDR_APPLE_M1_FIRESTORM_MAX),

	MIDR_ALL_VERSIONS(MIDR_APPLE_M2_BLIZZARD),

	MIDR_ALL_VERSIONS(MIDR_APPLE_M2_AVALANCHE),

	{},

};