Hi all,
After merging the kvm-arm tree, today's linux-next build (arm64 defconfig)
failed like this:
arch/arm64/kernel/cpu_errata.c: In function 'has_impdef_pmuv3':
arch/arm64/kernel/cpu_errata.c:279:38: error: passing argument 1 of 'is_midr_in_range_list' makes pointer from integer without a cast [-Wint-conversion]
279 | return is_midr_in_range_list(read_cpuid_id(), impdef_pmuv3_cpus);
| ^~~~~~~~~~~~~~~
| |
| u32 {aka unsigned int}
arch/arm64/kernel/cpu_errata.c:47:53: note: expected 'const struct midr_range *' but argument is of type 'u32' {aka 'unsigned int'}
47 | bool is_midr_in_range_list(struct midr_range const *ranges)
| ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~
arch/arm64/kernel/cpu_errata.c:279:16: error: too many arguments to function 'is_midr_in_range_list'
279 | return is_midr_in_range_list(read_cpuid_id(), impdef_pmuv3_cpus);
| ^~~~~~~~~~~~~~~~~~~~~
arch/arm64/kernel/cpu_errata.c:47:6: note: declared here
47 | bool is_midr_in_range_list(struct midr_range const *ranges)
| ^~~~~~~~~~~~~~~~~~~~~
Caused by commit
1f561ad4b8f5 ("Merge branch 'kvm-arm64/pv-cpuid' into new-next")
The merge missed fixing up this instance from commit
e1231aacb065 ("arm64: Enable IMP DEF PMUv3 traps on Apple M*")
I have applied the following patch for today (but this should go into
the kvm-arm tree (perhaps squashed into the above merge).
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 20 Mar 2025 20:24:04 +1100
Subject: [PATCH] fix up for "Merge branch 'kvm-arm64/pv-cpuid' into new-next"
interacting with "arm64: Enable IMP DEF PMUv3 traps on Apple M*"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
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 caac9e10a5bb..b55f5f705750 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.45.2
--
Cheers,
Stephen Rothwell
Attachment:
pgp8Jc29Etg3O.pgp
Description: OpenPGP digital signature
