Skip to content

Commit e910baa

Browse files
author
Marc Zyngier
committed
KVM: arm64: vgic: Add Apple M2 PRO/MAX cpus to the list of broken SEIS implementations
Unsurprisingly, the M2 PRO is also affected by the SEIS bug, so add it to the naughty list. And since M2 MAX is likely to be of the same ilk, flag it as well. Tested on a M2 PRO mini machine. Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Zenghui Yu <yuzenghui@huawei.com> Link: https://lore.kernel.org/r/20230501182141.39770-1-maz@kernel.org
1 parent aaa2f14 commit e910baa

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

arch/arm64/include/asm/cputype.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@
126126
#define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029
127127
#define APPLE_CPU_PART_M2_BLIZZARD 0x032
128128
#define APPLE_CPU_PART_M2_AVALANCHE 0x033
129+
#define APPLE_CPU_PART_M2_BLIZZARD_PRO 0x034
130+
#define APPLE_CPU_PART_M2_AVALANCHE_PRO 0x035
131+
#define APPLE_CPU_PART_M2_BLIZZARD_MAX 0x038
132+
#define APPLE_CPU_PART_M2_AVALANCHE_MAX 0x039
129133

130134
#define AMPERE_CPU_PART_AMPERE1 0xAC3
131135

@@ -181,6 +185,10 @@
181185
#define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX)
182186
#define MIDR_APPLE_M2_BLIZZARD MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD)
183187
#define MIDR_APPLE_M2_AVALANCHE MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE)
188+
#define MIDR_APPLE_M2_BLIZZARD_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_PRO)
189+
#define MIDR_APPLE_M2_AVALANCHE_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_PRO)
190+
#define MIDR_APPLE_M2_BLIZZARD_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX)
191+
#define MIDR_APPLE_M2_AVALANCHE_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_MAX)
184192
#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1)
185193

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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,10 @@ static const struct midr_range broken_seis[] = {
616616
MIDR_ALL_VERSIONS(MIDR_APPLE_M1_FIRESTORM_MAX),
617617
MIDR_ALL_VERSIONS(MIDR_APPLE_M2_BLIZZARD),
618618
MIDR_ALL_VERSIONS(MIDR_APPLE_M2_AVALANCHE),
619+
MIDR_ALL_VERSIONS(MIDR_APPLE_M2_BLIZZARD_PRO),
620+
MIDR_ALL_VERSIONS(MIDR_APPLE_M2_AVALANCHE_PRO),
621+
MIDR_ALL_VERSIONS(MIDR_APPLE_M2_BLIZZARD_MAX),
622+
MIDR_ALL_VERSIONS(MIDR_APPLE_M2_AVALANCHE_MAX),
619623
{},
620624
};
621625

0 commit comments

Comments
 (0)