6.1-stable patches

added patches:
	platform-mips-cpu_hwmon-disable-driver-on-unsupported-hardware.patch

diff --git a/queue-6.1/platform-mips-cpu_hwmon-disable-driver-on-unsupported-hardware.patch b/queue-6.1/platform-mips-cpu_hwmon-disable-driver-on-unsupported-hardware.patch
new file mode 100644 (file)
index 0000000..1b2e55a
--- /dev/null
+++ b/queue-6.1/platform-mips-cpu_hwmon-disable-driver-on-unsupported-hardware.patch
@@ -0,0 +1,32 @@
+From f4d430db17b4ef4e9c3c352a04b2fe3c93011978 Mon Sep 17 00:00:00 2001
+From: Jiaxun Yang <jiaxun.yang@flygoat.com>
+Date: Fri, 14 Jun 2024 16:40:15 +0100
+Subject: platform: mips: cpu_hwmon: Disable driver on unsupported hardware
+
+From: Jiaxun Yang <jiaxun.yang@flygoat.com>
+
+commit f4d430db17b4ef4e9c3c352a04b2fe3c93011978 upstream.
+
+cpu_hwmon is unsupported on CPUs without loongson_chiptemp
+register and csr.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/platform/mips/cpu_hwmon.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/platform/mips/cpu_hwmon.c
++++ b/drivers/platform/mips/cpu_hwmon.c
+@@ -139,6 +139,9 @@ static int __init loongson_hwmon_init(vo
+               csr_temp_enable = csr_readl(LOONGSON_CSR_FEATURES) &
+                                 LOONGSON_CSRF_TEMP;
+ 
++      if (!csr_temp_enable && !loongson_chiptemp[0])
++              return -ENODEV;
++
+       nr_packages = loongson_sysconf.nr_cpus /
+               loongson_sysconf.cores_per_package;
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index 8ab46869204045a8e36abb9d35d92cb2457eeea7..df5c7c8c2822a6d24a653fbae77b2aaecf4f5a70 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -362,3 +362,4 @@ drm-dp_mst-fix-all-mstb-marked-as-not-probed-after-suspend-resume.patch
 drm-i915-dp-reset-intel_dp-link_trained-before-retraining-the-link.patch
 rtc-isl1208-fix-return-value-of-nvmem-callbacks.patch
 watchdog-perf-properly-initialize-the-turbo-mode-timestamp-and-rearm-counter.patch
+platform-mips-cpu_hwmon-disable-driver-on-unsupported-hardware.patch