Re: [GIT PULL] KVM/arm64 updates for 6.15

[Marc Zyngier <maz@kernel.org>]

Paolo,

On Thu, 20 Mar 2025 04:29:25 +0000,
Oliver Upton <oliver.upton@linux.dev> wrote:
> 
> Hi Paolo,
> 
> Here's the latest pile o' patches for 6.15. The pull is based on a later
> -rc than I usually aim for to handle some conflicts with fixes that went
> in 6.14, but all of these patches have had exposure in -next for a good
> while.
> 
> There was a small conflict with the arm perf tree, which was addressed
> by Will pulling a prefix of the M1 PMU branch:
> 
>   https://lore.kernel.org/linux-next/20250312201853.0d75d9fe@canb.auug.org.au/

When you merge this, please also apply the patch below to address a
mismerge issue caught by Stephen, which causes a build breakage.

Thanks, and sorry for the bother.

	M.

From 6dbd388afc995de867081ea42d67b2630172bb2f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Mar 2025 20:24:04 +1100
Subject: [PATCH] KVM: arm64: Fix mismerge of IMPDEF PMU support with PV CPUID

We missed one of the is_midr_in_range_list() occurences at
merge time, breaking the build.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20250320203203.1de92b98@canb.auug.org.au
---
 arch/arm64/kernel/cpu_errata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index caac9e10a5bb7..b55f5f7057502 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -276,7 +276,7 @@ static bool has_impdef_pmuv3(const struct arm64_cpu_capabilities *entry, int sco
 	if (pmuver != ID_AA64DFR0_EL1_PMUVer_IMP_DEF)
 		return false;
 
-	return is_midr_in_range_list(read_cpuid_id(), impdef_pmuv3_cpus);
+	return is_midr_in_range_list(impdef_pmuv3_cpus);
 }
 
 static void cpu_enable_impdef_pmuv3_traps(const struct arm64_cpu_capabilities *__unused)
-- 
2.39.2


-- 
Without deviation from the norm, progress is not possible.