clocksource/drivers/arm_arch_timer: limit XGene-1 workaround
authorAndre Przywara <andre.przywara@arm.com>
Mon, 16 Oct 2023 15:31:27 +0000 (16:31 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 18 Oct 2023 09:58:59 +0000 (10:58 +0100)
commit851354cbd12bb9500909733c3d4054306f61df87
treed0c608711ea958cb5b3fa43fc6c84061b606d982
parent0899a6278a86b32e0b9d55f68f265519306a5be0
clocksource/drivers/arm_arch_timer: limit XGene-1 workaround

The AppliedMicro XGene-1 CPU has an erratum where the timer condition
would only consider TVAL, not CVAL. We currently apply a workaround when
seeing the PartNum field of MIDR_EL1 being 0x000, under the assumption
that this would match only the XGene-1 CPU model.
However even the Ampere eMAG (aka XGene-3) uses that same part number, and
only differs in the "Variant" and "Revision" fields: XGene-1's MIDR is
0x500f0000, our eMAG reports 0x503f0002. Experiments show the latter
doesn't show the faulty behaviour.

Increase the specificity of the check to only consider partnum 0x000 and
variant 0x00, to exclude the Ampere eMAG.

Fixes: 012f18850452 ("clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations")
Reported-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20231016153127.116101-1-andre.przywara@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/include/asm/cputype.h
arch/arm64/kvm/guest.c
drivers/clocksource/arm_arch_timer.c