]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Jun 2025 13:39:08 +0000 (15:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Jun 2025 13:39:08 +0000 (15:39 +0200)
added patches:
perf-arm-cmn-initialise-cmn-cpu-earlier.patch

queue-5.15/perf-arm-cmn-initialise-cmn-cpu-earlier.patch [new file with mode: 0644]
queue-5.15/series

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 (file)
index 0000000..baaca6e
--- /dev/null
@@ -0,0 +1,45 @@
+From 597704e201068db3d104de3c7a4d447ff8209127 Mon Sep 17 00:00:00 2001
+From: Robin Murphy <robin.murphy@arm.com>
+Date: Mon, 12 May 2025 18:11:54 +0100
+Subject: perf/arm-cmn: Initialise cmn->cpu earlier
+
+From: Robin Murphy <robin.murphy@arm.com>
+
+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 <robin.murphy@arm.com>
+Reviewed-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
+Link: https://lore.kernel.org/r/b12fccba6b5b4d2674944f59e4daad91cd63420b.1747069914.git.robin.murphy@arm.com
+Signed-off-by: Will Deacon <will@kernel.org>
+[ backport past NUMA changes in 5.17 ]
+Signed-off-by: Robin Murphy <robin.murphy@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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,
index d7bb8748b5c333375e93e54c1f881e9137bab9f1..cf7fd500f69f1a862e8459933cad62f8f0ff1690 100644 (file)
@@ -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