From: Greg Kroah-Hartman Date: Mon, 2 Jun 2025 13:39:08 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.294~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fefca101578dcea2b3dd4865bddf5738fb5bd79a;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: perf-arm-cmn-initialise-cmn-cpu-earlier.patch --- diff --git a/queue-5.15/perf-arm-cmn-initialise-cmn-cpu-earlier.patch b/queue-5.15/perf-arm-cmn-initialise-cmn-cpu-earlier.patch new file mode 100644 index 0000000000..baaca6ee49 --- /dev/null +++ b/queue-5.15/perf-arm-cmn-initialise-cmn-cpu-earlier.patch @@ -0,0 +1,45 @@ +From 597704e201068db3d104de3c7a4d447ff8209127 Mon Sep 17 00:00:00 2001 +From: Robin Murphy +Date: Mon, 12 May 2025 18:11:54 +0100 +Subject: perf/arm-cmn: Initialise cmn->cpu earlier + +From: Robin Murphy + +commit 597704e201068db3d104de3c7a4d447ff8209127 upstream. + +For all the complexity of handling affinity for CPU hotplug, what we've +apparently managed to overlook is that arm_cmn_init_irqs() has in fact +always been setting the *initial* affinity of all IRQs to CPU 0, not the +CPU we subsequently choose for event scheduling. Oh dear. + +Cc: stable@vger.kernel.org +Fixes: 0ba64770a2f2 ("perf: Add Arm CMN-600 PMU driver") +Signed-off-by: Robin Murphy +Reviewed-by: Ilkka Koskinen +Link: https://lore.kernel.org/r/b12fccba6b5b4d2674944f59e4daad91cd63420b.1747069914.git.robin.murphy@arm.com +Signed-off-by: Will Deacon +[ backport past NUMA changes in 5.17 ] +Signed-off-by: Robin Murphy +Signed-off-by: Greg Kroah-Hartman +--- + drivers/perf/arm-cmn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/perf/arm-cmn.c ++++ b/drivers/perf/arm-cmn.c +@@ -1512,6 +1512,7 @@ static int arm_cmn_probe(struct platform + return -ENOMEM; + + cmn->dev = &pdev->dev; ++ cmn->cpu = raw_smp_processor_id(); + platform_set_drvdata(pdev, cmn); + + if (has_acpi_companion(cmn->dev)) +@@ -1533,7 +1534,6 @@ static int arm_cmn_probe(struct platform + if (err) + return err; + +- cmn->cpu = raw_smp_processor_id(); + cmn->pmu = (struct pmu) { + .module = THIS_MODULE, + .attr_groups = arm_cmn_attr_groups, diff --git a/queue-5.15/series b/queue-5.15/series index d7bb8748b5..cf7fd500f6 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -204,3 +204,4 @@ nvme-pci-add-nvme_quirk_no_deepest_ps-quirk-for-soli.patch tpm-tis-double-the-timeout-b-to-4s.patch platform-x86-fujitsu-laptop-support-lifebook-s2110-h.patch platform-x86-thinkpad_acpi-ignore-battery-threshold-.patch +perf-arm-cmn-initialise-cmn-cpu-earlier.patch