From: Jiaxun Yang Date: Fri, 14 Jun 2024 15:40:15 +0000 (+0100) Subject: platform: mips: cpu_hwmon: Disable driver on unsupported hardware X-Git-Tag: v6.10.3~100 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=378a9d51afc17c9db7a0d5280228361d65ce9b28;p=thirdparty%2Fkernel%2Fstable.git platform: mips: cpu_hwmon: Disable driver on unsupported hardware 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 Signed-off-by: Thomas Bogendoerfer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/platform/mips/cpu_hwmon.c b/drivers/platform/mips/cpu_hwmon.c index d8c5f9195f85f..2ac2f31090f96 100644 --- a/drivers/platform/mips/cpu_hwmon.c +++ b/drivers/platform/mips/cpu_hwmon.c @@ -139,6 +139,9 @@ static int __init loongson_hwmon_init(void) 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;