Skip to contentSkip to conversation

thermal: loongson-2: add thermal management support

PATCH Superseded Yinbo Zhu 2 participants 15 messages Apr 26, 2023 – Jun 17, 2023

Subsystems (3)

v14 of 16 Superseded Latest is v16 →

lore
Share & tools
lore

Yinbo Zhu

author maintainer
#0 lore raw

PATCH v14 1/2 thermal: loongson-2: add thermal management support

This patch adds the support for Loongson-2 thermal sensor controller, which can support maximum 4 sensors, each sensor contains a sampling register and a control register. The sampling register is used to obtain the temperature in real time, the control register GATE field is used to set the threshold of high or low temperature, when the input temperature is higher than the high temperature threshold or lower than the low temperature threshold, an interrupt will occur.

---
Change in v14:
1. Add back depends on COMPILE_TEST.
2. The implementation of devm_thermal_add_hwmon_sysfs has changed in recent community code that cause compile fail issue and this verison add a dev args in devm_thermal_add_hwmon_sysfs to fix compile issue.
Change in v13:
1. Add a description about that how works the sensor.
2. Drop the COMPILE_TEST.
3. Rework the help prograph in LOONGSON2_THERMAL Kconfig.
4. Drop the 'tzd' 'irq' and 'pdev' element in loongson2_thermal_data.
5. Drop the reset of variable in loongson2_thermal_set.
6. Drop the function loongson2_thermal_get_sensor_id.
7. Drop the function loongson2_thermal_alarm_irq.
8. Rework the devm_thermal_of_zone_register.
9. Pass 'tzd' instead of 'data' in devm_request_threaded_irq.
10. Drop the "data->tzd->tzp->no_hwmon = false".
11. Drop the loongson2_thermal_remove.
12. Add the sensor id in the of_device_id data field.
13. Drop the save and restore function.
Change in v12:
1. Fixup it about min and max.
2. Use dev_err_probe replace dev_err in devm_request_threaded_irq context.
Change in v11:
1. Add min() and max() to replace related code in function loongson2_thermal_set.
2. Add dev_err_probe to to replace related code for function return value use devm_thermal_of_zone_register.
3. Replace thermal_add_hwmon_sysfs with devm_thermal_add_hwmon_sysfs and use dev_warn replace dev_err in this context.
Change in v10:
1. Add all history change log information.
Change in v9:
1. Switch new API that use devm_thermal_of_zone_register
to replace previous interfaces.
2. Add depend on LOONGARCH || COMPILE_TEST.
Change in v8:
1. Replace string loongson2/Loongson2/LOONGSON2 with loongson-2/ Loongson-2/LOONGSON-2 in Kconfig and commit log and MAINTAINERS files.
Change in v7:
1. Split the modification of patch 3 and merge it into this patch.
2. Remove the unless code annotation to fix the compile warning when compile C code with W=1.
Change in v6:
1. NO change, but other patch in this series of patches set has changes.
Change in v5:
1. NO change, but other patch in this series of patches set has changes.
Change in v4:
1. Fixup the compatible.
Change in v3:
1. Add a function to gain sensor id an remove dts id.
Change in v2:
1. Remove error msg printing when addr ioremap has error.
2. Make loongson2 thermal driver was built-in by default.
3. Replace ls2k with loongson2.
4. Remove CONFIG_PM_SLEEP and set pm function type was __maybe_unused.

 MAINTAINERS                         |   7 ++
 drivers/thermal/Kconfig             |  12 ++
 drivers/thermal/Makefile            |   1 +
 drivers/thermal/loongson2_thermal.c | 166 ++++++++++++++++++++++++++++
 4 files changed, 186 insertions(+)
 create mode 100644 drivers/thermal/loongson2_thermal.c
MAINTAINERS +7 -0
index 25a0981c74b6..b3a76acd2caf 100644
@@ -12143,6 +12143,13 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
 F:	drivers/pinctrl/pinctrl-loongson2.c
 
+LOONGSON-2 SOC SERIES THERMAL DRIVER
+M:	zhanghongchen <[email protected]>
+M:	Yinbo Zhu <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/thermal/loongson2_thermal.c
+
 LOONGSON GPIO DRIVER
 M:	Yinbo Zhu <[email protected]>
 L:	[email protected]
drivers/thermal/Kconfig +12 -0
index 4cd7ab707315..c4de94e972f4 100644
@@ -502,4 +502,16 @@ config KHADAS_MCU_FAN_THERMAL
 	  If you say yes here you get support for the FAN controlled
 	  by the Microcontroller found on the Khadas VIM boards.
 
+config LOONGSON2_THERMAL
+	tristate "Loongson-2 SoC series thermal driver"
+	depends on LOONGARCH || COMPILE_TEST
+	depends on OF
+	help
+	  Support for Thermal driver found on Loongson-2 SoC series platforms.
+	  The thermal driver realizes get_temp and set_trips function, which
+	  are used to obtain the temperature of the current node and set the
+	  temperature range to trigger the interrupt. When the input temperature
+	  is higher than the high temperature threshold or lower than the low
+	  temperature threshold, the interrupt will occur.
+
 endif
drivers/thermal/Makefile +1 -0
index eed300e83d48..4edde4df647b 100644
@@ -62,3 +62,4 @@ obj-$(CONFIG_UNIPHIER_THERMAL)	+= uniphier_thermal.o
 obj-$(CONFIG_AMLOGIC_THERMAL)     += amlogic_thermal.o
 obj-$(CONFIG_SPRD_THERMAL)	+= sprd_thermal.o
 obj-$(CONFIG_KHADAS_MCU_FAN_THERMAL)	+= khadas_mcu_fan.o
+obj-$(CONFIG_LOONGSON2_THERMAL)	+= loongson2_thermal.o
drivers/thermal/loongson2_thermal.c new file +166 -0

166 lines not on this page · raw message

Signature · 1 line
2.20.1
author maintainer
#1 lore raw

PATCH v14 2/2 dt-bindings: thermal: add loongson-2 thermal

Add the Loongson-2 thermal binding with DT schema format using json-schema.

---
Change in v14:
1. NO change, but other patch in this series of patches set has changes.
Change in v13:
1. Drop the sensor id.
Change in v12:
1. NO change, but other patch in this series of patches set has changes.
Change in v11:
1. NO change, but other patch in this series of patches set has changes.
Change in v10:
1. Add all history change log information.
Change in v9:
1. NO change, but other patch in this series of patches set has changes.
Change in v8:
1. Replace string Loongson2/loongson2 with Loongson-2/loongson-2.
Change in v7:
1. Split the modification of patch 3 and merge it into this patch.
Change in v6:
1. Fix the warning "reg: [[0, 534779136], [0, 48]] is too long" when compile the yaml.
Change in v5:
1. Keep use same quotes "'" in all places.
Change in v4:
1. Fixup the compatible.
2. Update the binding file name.
3. Include irq.h to fix compile issue.
Change in v3:
1. Remove the sensor id.
2. Remove the interrupt-parent in thermal required property.
3. Update the thermal binding file name.
4. Fixup the commit log information.
Change in v2:
1. Add description and type about the "id".
2. Make the filename was based on compatible.

 .../thermal/loongson,ls2k-thermal.yaml        | 38 +++++++++++++++++++
 MAINTAINERS                                   |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml
Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml new file +38 -0
new file mode 100644
index 000000000000..258046383179
@@ -0,0 +1,38 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/thermal/loongson,ls2k-thermal.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Thermal sensors on Loongson-2 SoCs
+
+maintainers:
+  - zhanghongchen <[email protected]>
+  - Yinbo Zhu <[email protected]>
+
+properties:
+  compatible:
+    const: loongson,ls2k-thermal
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - interrupts
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    thermal: thermal-sensor@1fe01500 {
+        compatible = "loongson,ls2k-thermal";
+        reg = <0x1fe01500 0x30>;
+        interrupt-parent = <&liointc0>;
+        interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
+    };
MAINTAINERS +1 -0
index b3a76acd2caf..40289c32372a 100644
@@ -12148,6 +12148,7 @@ M:	zhanghongchen <[email protected]>
 M:	Yinbo Zhu <[email protected]>
 L:	[email protected]
 S:	Maintained
+F:	Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml
 F:	drivers/thermal/loongson2_thermal.c
 
 LOONGSON GPIO DRIVER
Signature · 1 line
2.20.1
author maintainer
#2 lore raw
In reply to Yinbo Zhu

Friendly ping ?

Quoted 299 lines · Yinbo Zhu

This patch adds the support for Loongson-2 thermal sensor controller, which can support maximum 4 sensors, each sensor contains a sampling register and a control register. The sampling register is used to obtain the temperature in real time, the control register GATE field is used to set the threshold of high or low temperature, when the input temperature is higher than the high temperature threshold or lower than the low temperature threshold, an interrupt will occur.

---
Change in v14:
1. Add back depends on COMPILE_TEST.
2. The implementation of devm_thermal_add_hwmon_sysfs has changed in recent community code that cause compile fail issue and this verison add a dev args in devm_thermal_add_hwmon_sysfs to fix compile issue.
Change in v13:
1. Add a description about that how works the sensor.
2. Drop the COMPILE_TEST.
3. Rework the help prograph in LOONGSON2_THERMAL Kconfig.
4. Drop the 'tzd' 'irq' and 'pdev' element in loongson2_thermal_data.
5. Drop the reset of variable in loongson2_thermal_set.
6. Drop the function loongson2_thermal_get_sensor_id.
7. Drop the function loongson2_thermal_alarm_irq.
8. Rework the devm_thermal_of_zone_register.
9. Pass 'tzd' instead of 'data' in devm_request_threaded_irq.
10. Drop the "data->tzd->tzp->no_hwmon = false".
11. Drop the loongson2_thermal_remove.
12. Add the sensor id in the of_device_id data field.
13. Drop the save and restore function.
Change in v12:
1. Fixup it about min and max.
2. Use dev_err_probe replace dev_err in devm_request_threaded_irq context.
Change in v11:
1. Add min() and max() to replace related code in function loongson2_thermal_set.
2. Add dev_err_probe to to replace related code for function return value use devm_thermal_of_zone_register.
3. Replace thermal_add_hwmon_sysfs with devm_thermal_add_hwmon_sysfs and use dev_warn replace dev_err in this context.
Change in v10:
1. Add all history change log information.
Change in v9:
1. Switch new API that use devm_thermal_of_zone_register
to replace previous interfaces.
2. Add depend on LOONGARCH || COMPILE_TEST.
Change in v8:
1. Replace string loongson2/Loongson2/LOONGSON2 with loongson-2/ Loongson-2/LOONGSON-2 in Kconfig and commit log and MAINTAINERS files.
Change in v7:
1. Split the modification of patch 3 and merge it into this patch.
2. Remove the unless code annotation to fix the compile warning when compile C code with W=1.
Change in v6:
1. NO change, but other patch in this series of patches set has changes.
Change in v5:
1. NO change, but other patch in this series of patches set has changes.
Change in v4:
1. Fixup the compatible.
Change in v3:
1. Add a function to gain sensor id an remove dts id.
Change in v2:
1. Remove error msg printing when addr ioremap has error.
2. Make loongson2 thermal driver was built-in by default.
3. Replace ls2k with loongson2.
4. Remove CONFIG_PM_SLEEP and set pm function type was __maybe_unused.

  MAINTAINERS                         |   7 ++
  drivers/thermal/Kconfig             |  12 ++
  drivers/thermal/Makefile            |   1 +
  drivers/thermal/loongson2_thermal.c | 166 ++++++++++++++++++++++++++++
  4 files changed, 186 insertions(+)

create mode 100644 drivers/thermal/loongson2_thermal.c

MAINTAINERS +7 -0
index 25a0981c74b6..b3a76acd2caf 100644
@@ -12143,6 +12143,13 @@ S:	Maintained
  F:	Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
  F:	drivers/pinctrl/pinctrl-loongson2.c
 
+LOONGSON-2 SOC SERIES THERMAL DRIVER
+M:	zhanghongchen <[email protected]>
+M:	Yinbo Zhu <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/thermal/loongson2_thermal.c
+
  LOONGSON GPIO DRIVER
  M:	Yinbo Zhu <[email protected]>
  L:	[email protected]
drivers/thermal/Kconfig +12 -0
index 4cd7ab707315..c4de94e972f4 100644
@@ -502,4 +502,16 @@ config KHADAS_MCU_FAN_THERMAL
  	  If you say yes here you get support for the FAN controlled
  	  by the Microcontroller found on the Khadas VIM boards.
 
+config LOONGSON2_THERMAL
+	tristate "Loongson-2 SoC series thermal driver"
+	depends on LOONGARCH || COMPILE_TEST
+	depends on OF
+	help
+	  Support for Thermal driver found on Loongson-2 SoC series platforms.
+	  The thermal driver realizes get_temp and set_trips function, which
+	  are used to obtain the temperature of the current node and set the
+	  temperature range to trigger the interrupt. When the input temperature
+	  is higher than the high temperature threshold or lower than the low
+	  temperature threshold, the interrupt will occur.
+
  endif
drivers/thermal/Makefile +1 -0
index eed300e83d48..4edde4df647b 100644
@@ -62,3 +62,4 @@ obj-$(CONFIG_UNIPHIER_THERMAL)	+= uniphier_thermal.o
  obj-$(CONFIG_AMLOGIC_THERMAL)     += amlogic_thermal.o
  obj-$(CONFIG_SPRD_THERMAL)	+= sprd_thermal.o
  obj-$(CONFIG_KHADAS_MCU_FAN_THERMAL)	+= khadas_mcu_fan.o
+obj-$(CONFIG_LOONGSON2_THERMAL)	+= loongson2_thermal.o
drivers/thermal/loongson2_thermal.c new file +166 -0
new file mode 100644
index 000000000000..6a338e6e490e
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Author: zhanghongchen <[email protected]>
+ *         Yinbo Zhu <[email protected]>
+ * Copyright (C) 2022-2023 Loongson Technology Corporation Limited
+ */
+
+#include <linux/cpufreq.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/of_device.h>
+#include <linux/thermal.h>
+#include "thermal_hwmon.h"
+
+#define LOONGSON2_SOC_MAX_SENSOR_NUM			4
+
+#define LOONGSON2_TSENSOR_CTRL_HI			0x0
+#define LOONGSON2_TSENSOR_CTRL_LO			0x8
+#define LOONGSON2_TSENSOR_STATUS			0x10
+#define LOONGSON2_TSENSOR_OUT				0x14
+
+struct loongson2_thermal_data {
+	int id;
+	void __iomem *regs;
+};
+
+static int loongson2_thermal_set(struct loongson2_thermal_data *data,
+					int low, int high, bool enable)
+{
+	u64 reg_ctrl = 0;
+	int reg_off = data->id * 2;
+
+	if (low > high)
+		return -EINVAL;
+
+	low = max(low, -40);
+	high = min(high, 125);
+
+	low += 100;
+	high += 100;
+
+	reg_ctrl = low;
+	reg_ctrl |= enable ? 0x100 : 0;
+	writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_LO + reg_off);
+
+	reg_ctrl = high;
+	reg_ctrl |= enable ? 0x100 : 0;
+	writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_HI + reg_off);
+
+	return 0;
+}
+
+static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
+{
+	u32 reg_val;
+	struct loongson2_thermal_data *data = tz->devdata;
+
+	reg_val = readl(data->regs + LOONGSON2_TSENSOR_OUT);
+	*temp = ((reg_val & 0xff) - 100) * 1000;
+
+	return 0;
+}
+
+static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
+{
+	struct thermal_zone_device *tzd = dev;
+	struct loongson2_thermal_data *data = tzd->devdata;
+
+	/* clear interrupt */
+	writeb(0x3, data->regs + LOONGSON2_TSENSOR_STATUS);
+
+	thermal_zone_device_update(tzd, THERMAL_EVENT_UNSPECIFIED);
+
+	return IRQ_HANDLED;
+}
+
+static int loongson2_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)
+{
+	struct loongson2_thermal_data *data = tz->devdata;
+
+	return loongson2_thermal_set(data, low/1000, high/1000, true);
+}
+
+static const struct thermal_zone_device_ops loongson2_of_thermal_ops = {
+	.get_temp = loongson2_thermal_get_temp,
+	.set_trips = loongson2_thermal_set_trips,
+};
+
+static int loongson2_thermal_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct resource *res;
+	struct loongson2_thermal_data *data;
+	struct thermal_zone_device *tzd;
+	int ret, irq, i;
+
+	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+	data->id = (uintptr_t)device_get_match_data(dev);
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	data->regs = devm_ioremap(dev, res->start, resource_size(res));
+	if (IS_ERR(data->regs))
+		return PTR_ERR(data->regs);
+
+	/* get irq */
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0)
+		return irq;
+
+	if (data->id > LOONGSON2_SOC_MAX_SENSOR_NUM - 1 || data->id < 0) {
+		dev_err(dev, "sensor id error,must be in <0 ~ %d>\n",
+				LOONGSON2_SOC_MAX_SENSOR_NUM - 1);
+		return -EINVAL;
+	}
+
+	writeb(0xff, data->regs + LOONGSON2_TSENSOR_STATUS);
+
+	loongson2_thermal_set(data, 0, 0, false);
+
+	for (i = 0; i < LOONGSON2_SOC_MAX_SENSOR_NUM; i++) {
+		tzd = devm_thermal_of_zone_register(dev, i, data,
+			&loongson2_of_thermal_ops);
+
+		if (!IS_ERR(tzd))
+			break;
+
+		if (PTR_ERR(tzd) != ENODEV)
+			continue;
+
+		return dev_err_probe(dev, PTR_ERR(tzd), "failed to register");
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, loongson2_thermal_irq_thread,
+			IRQF_ONESHOT, "loongson2_thermal", tzd);
+	if (ret < 0)
+		return dev_err_probe(dev, ret, "failed to request alarm irq\n");
+
+	if (devm_thermal_add_hwmon_sysfs(dev, tzd))
+		dev_warn(dev, "Failed to add hwmon sysfs attributes\n");
+
+	return 0;
+}
+
+static const struct of_device_id of_loongson2_thermal_match[] = {
+	{ .compatible = "loongson,ls2k-thermal", .data = (const void *)0},
+	{ /* end */ }
+};
+MODULE_DEVICE_TABLE(of, of_loongson2_thermal_match);
+
+static struct platform_driver loongson2_thermal_driver = {
+	.driver = {
+		.name		= "loongson2_thermal",
+		.of_match_table = of_loongson2_thermal_match,
+	},
+	.probe	= loongson2_thermal_probe,
+};
+module_platform_driver(loongson2_thermal_driver);
+
+MODULE_DESCRIPTION("Loongson2 thermal driver");
+MODULE_LICENSE("GPL");
#3 lore raw
In reply to Yinbo Zhu
Quoted 132 lines · Yinbo Zhu

This patch adds the support for Loongson-2 thermal sensor controller, which can support maximum 4 sensors, each sensor contains a sampling register and a control register. The sampling register is used to obtain the temperature in real time, the control register GATE field is used to set the threshold of high or low temperature, when the input temperature is higher than the high temperature threshold or lower than the low temperature threshold, an interrupt will occur.

---
Change in v14:
1. Add back depends on COMPILE_TEST.
2. The implementation of devm_thermal_add_hwmon_sysfs has changed in recent community code that cause compile fail issue and this verison add a dev args in devm_thermal_add_hwmon_sysfs to fix compile issue.
Change in v13:
1. Add a description about that how works the sensor.
2. Drop the COMPILE_TEST.
3. Rework the help prograph in LOONGSON2_THERMAL Kconfig.
4. Drop the 'tzd' 'irq' and 'pdev' element in loongson2_thermal_data.
5. Drop the reset of variable in loongson2_thermal_set.
6. Drop the function loongson2_thermal_get_sensor_id.
7. Drop the function loongson2_thermal_alarm_irq.
8. Rework the devm_thermal_of_zone_register.
9. Pass 'tzd' instead of 'data' in devm_request_threaded_irq.
10. Drop the "data->tzd->tzp->no_hwmon = false".
11. Drop the loongson2_thermal_remove.
12. Add the sensor id in the of_device_id data field.
13. Drop the save and restore function.
Change in v12:
1. Fixup it about min and max.
2. Use dev_err_probe replace dev_err in devm_request_threaded_irq context.
Change in v11:
1. Add min() and max() to replace related code in function loongson2_thermal_set.
2. Add dev_err_probe to to replace related code for function return value use devm_thermal_of_zone_register.
3. Replace thermal_add_hwmon_sysfs with devm_thermal_add_hwmon_sysfs and use dev_warn replace dev_err in this context.
Change in v10:
1. Add all history change log information.
Change in v9:
1. Switch new API that use devm_thermal_of_zone_register
to replace previous interfaces.
2. Add depend on LOONGARCH || COMPILE_TEST.
Change in v8:
1. Replace string loongson2/Loongson2/LOONGSON2 with loongson-2/ Loongson-2/LOONGSON-2 in Kconfig and commit log and MAINTAINERS files.
Change in v7:
1. Split the modification of patch 3 and merge it into this patch.
2. Remove the unless code annotation to fix the compile warning when compile C code with W=1.
Change in v6:
1. NO change, but other patch in this series of patches set has changes.
Change in v5:
1. NO change, but other patch in this series of patches set has changes.
Change in v4:
1. Fixup the compatible.
Change in v3:
1. Add a function to gain sensor id an remove dts id.
Change in v2:
1. Remove error msg printing when addr ioremap has error.
2. Make loongson2 thermal driver was built-in by default.
3. Replace ls2k with loongson2.
4. Remove CONFIG_PM_SLEEP and set pm function type was __maybe_unused.

  MAINTAINERS                         |   7 ++
  drivers/thermal/Kconfig             |  12 ++
  drivers/thermal/Makefile            |   1 +
  drivers/thermal/loongson2_thermal.c | 166 ++++++++++++++++++++++++++++
  4 files changed, 186 insertions(+)

create mode 100644 drivers/thermal/loongson2_thermal.c

MAINTAINERS +7 -0
index 25a0981c74b6..b3a76acd2caf 100644
@@ -12143,6 +12143,13 @@ S:	Maintained
  F:	Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
  F:	drivers/pinctrl/pinctrl-loongson2.c
 
+LOONGSON-2 SOC SERIES THERMAL DRIVER
+M:	zhanghongchen <[email protected]>
+M:	Yinbo Zhu <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/thermal/loongson2_thermal.c
+
  LOONGSON GPIO DRIVER
  M:	Yinbo Zhu <[email protected]>
  L:	[email protected]
drivers/thermal/Kconfig +12 -0
index 4cd7ab707315..c4de94e972f4 100644
@@ -502,4 +502,16 @@ config KHADAS_MCU_FAN_THERMAL
  	  If you say yes here you get support for the FAN controlled
  	  by the Microcontroller found on the Khadas VIM boards.
 
+config LOONGSON2_THERMAL
+	tristate "Loongson-2 SoC series thermal driver"
+	depends on LOONGARCH || COMPILE_TEST
+	depends on OF
+	help
+	  Support for Thermal driver found on Loongson-2 SoC series platforms.
+	  The thermal driver realizes get_temp and set_trips function, which
+	  are used to obtain the temperature of the current node and set the
+	  temperature range to trigger the interrupt. When the input temperature
+	  is higher than the high temperature threshold or lower than the low
+	  temperature threshold, the interrupt will occur.
+
  endif
drivers/thermal/Makefile +1 -0
index eed300e83d48..4edde4df647b 100644
@@ -62,3 +62,4 @@ obj-$(CONFIG_UNIPHIER_THERMAL)	+= uniphier_thermal.o
  obj-$(CONFIG_AMLOGIC_THERMAL)     += amlogic_thermal.o
  obj-$(CONFIG_SPRD_THERMAL)	+= sprd_thermal.o
  obj-$(CONFIG_KHADAS_MCU_FAN_THERMAL)	+= khadas_mcu_fan.o
+obj-$(CONFIG_LOONGSON2_THERMAL)	+= loongson2_thermal.o
drivers/thermal/loongson2_thermal.c new file +0 -0
new file mode 100644
index 000000000000..6a338e6e490e

drivers/thermal/loongson2_thermal.c line 8

Quoted 8 lines
drivers/thermal/loongson2_thermal.c new file +8 -0
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Author: zhanghongchen <[email protected]>
+ *         Yinbo Zhu <[email protected]>
+ * Copyright (C) 2022-2023 Loongson Technology Corporation Limited
+ */
+
+#include <linux/cpufreq.h>

Is it really needed ?

drivers/thermal/loongson2_thermal.c line 9

Quoted 1 line
drivers/thermal/loongson2_thermal.c new file +1 -0
+#include <linux/delay.h>

Is it really needed ?

Quoted 4 lines
drivers/thermal/loongson2_thermal.c new file +4 -0
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>

drivers/thermal/loongson2_thermal.c line 23

Quoted 10 lines
drivers/thermal/loongson2_thermal.c new file +9 -0
+#include <linux/of_device.h>
+#include <linux/thermal.h>
+#include "thermal_hwmon.h"
 
+#define LOONGSON2_SOC_MAX_SENSOR_NUM			4
+
+#define LOONGSON2_TSENSOR_CTRL_HI			0x0
+#define LOONGSON2_TSENSOR_CTRL_LO			0x8
+#define LOONGSON2_TSENSOR_STATUS			0x10
+#define LOONGSON2_TSENSOR_OUT				0x14

Please use BIT() macros

drivers/thermal/loongson2_thermal.c line 28

Quoted 4 lines
drivers/thermal/loongson2_thermal.c new file +4 -0
+struct loongson2_thermal_data {
+	int id;
+	void __iomem *regs;
+};

It would make sense to replace the id by the precomputed register offset value.

drivers/thermal/loongson2_thermal.c line 37

Quoted 8 lines
drivers/thermal/loongson2_thermal.c new file +8 -0
+static int loongson2_thermal_set(struct loongson2_thermal_data *data,
+					int low, int high, bool enable)
+{
+	u64 reg_ctrl = 0;
+	int reg_off = data->id * 2;
+
+	if (low > high)
+		return -EINVAL;

I don't think this is supposed to happen

drivers/thermal/loongson2_thermal.c line 40

Quoted 2 lines
drivers/thermal/loongson2_thermal.c new file +2 -0
+	low = max(low, -40);
+	high = min(high, 125);

You can use clamp() alternatively (your call)

drivers/thermal/loongson2_thermal.c line 51

Quoted 11 lines
drivers/thermal/loongson2_thermal.c new file +11 -0
+
+	low += 100;
+	high += 100;
+
+	reg_ctrl = low;
+	reg_ctrl |= enable ? 0x100 : 0;
+	writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_LO + reg_off);
+
+	reg_ctrl = high;
+	reg_ctrl |= enable ? 0x100 : 0;
+	writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_HI + reg_off);

Is the 'enable' boolean really useful?

Wouldn't be the sensor trip points disabled by default at reset time?

If it is the case then we can get ride of this variable and make the routine simpler

drivers/thermal/loongson2_thermal.c line 61

Quoted 9 lines
drivers/thermal/loongson2_thermal.c new file +9 -0
+	return 0;
+}
+
+static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
+{
+	u32 reg_val;
+	struct loongson2_thermal_data *data = tz->devdata;
+
+	reg_val = readl(data->regs + LOONGSON2_TSENSOR_OUT);

Seems like there is no offset for the sensor id here ?

drivers/thermal/loongson2_thermal.c line 62

Quoted 1 line
drivers/thermal/loongson2_thermal.c new file +1 -0
+	*temp = ((reg_val & 0xff) - 100) * 1000;

Please use macros in units.h for conversion and change literals by macro

drivers/thermal/loongson2_thermal.c line 70

Quoted 7 lines
drivers/thermal/loongson2_thermal.c new file +7 -0
+	return 0;
+}
+
+static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
+{
+	struct thermal_zone_device *tzd = dev;
+	struct loongson2_thermal_data *data = tzd->devdata;

The init function tells me whatever the sensor triggering the interrupt we update the same thermal zone, not necessarily the one which reach the trip point.

drivers/thermal/loongson2_thermal.c line 73

Quoted 2 lines
drivers/thermal/loongson2_thermal.c new file +2 -0
+	/* clear interrupt */
+	writeb(0x3, data->regs + LOONGSON2_TSENSOR_STATUS);

Replace the literal value by a macro.

drivers/thermal/loongson2_thermal.c line 84

Quoted 10 lines
drivers/thermal/loongson2_thermal.c new file +10 -0
+	thermal_zone_device_update(tzd, THERMAL_EVENT_UNSPECIFIED);
+
+	return IRQ_HANDLED;
+}
+
+static int loongson2_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)
+{
+	struct loongson2_thermal_data *data = tz->devdata;
+
+	return loongson2_thermal_set(data, low/1000, high/1000, true);

Please use macros in units.h for conversion

Quoted 10 lines
drivers/thermal/loongson2_thermal.c new file +10 -0
+}
+
+static const struct thermal_zone_device_ops loongson2_of_thermal_ops = {
+	.get_temp = loongson2_thermal_get_temp,
+	.set_trips = loongson2_thermal_set_trips,
+};
+
+static int loongson2_thermal_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;

drivers/thermal/loongson2_thermal.c line 104

Quoted 10 lines
drivers/thermal/loongson2_thermal.c new file +10 -0
+	struct resource *res;
+	struct loongson2_thermal_data *data;
+	struct thermal_zone_device *tzd;
+	int ret, irq, i;
+
+	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+	data->id = (uintptr_t)device_get_match_data(dev);

The changelog says there is up to 4 sensors on the controller but the initialization code seems to handle only one.

Either you skip this data at all and let the loop to fill the id when the thermal zone successfully registered or you add a eg. a mask with the sensor (eg. 0x3 for sensor 0 and 1) and use those value in the loop.

Quoted 5 lines
drivers/thermal/loongson2_thermal.c new file +5 -0
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	data->regs = devm_ioremap(dev, res->start, resource_size(res));
+	if (IS_ERR(data->regs))
+		return PTR_ERR(data->regs);
+

drivers/thermal/loongson2_thermal.c line 120

Quoted 10 lines
drivers/thermal/loongson2_thermal.c new file +10 -0
+	/* get irq */
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0)
+		return irq;
+
+	if (data->id > LOONGSON2_SOC_MAX_SENSOR_NUM - 1 || data->id < 0) {
+		dev_err(dev, "sensor id error,must be in <0 ~ %d>\n",
+				LOONGSON2_SOC_MAX_SENSOR_NUM - 1);
+		return -EINVAL;
+	}

As this is coming from a static initialization, this test is not needed.

drivers/thermal/loongson2_thermal.c line 122

Quoted 1 line
drivers/thermal/loongson2_thermal.c new file +1 -0
+	writeb(0xff, data->regs + LOONGSON2_TSENSOR_STATUS);

Replace the literal value by a macro

drivers/thermal/loongson2_thermal.c line 131

Quoted 8 lines
drivers/thermal/loongson2_thermal.c new file +8 -0
+	loongson2_thermal_set(data, 0, 0, false);
+
+	for (i = 0; i < LOONGSON2_SOC_MAX_SENSOR_NUM; i++) {
+		tzd = devm_thermal_of_zone_register(dev, i, data,
+			&loongson2_of_thermal_ops);
+
+		if (!IS_ERR(tzd))
+			break;

Assuming the loop aims to register all the supported thermal zones, the conditions should be inverted.

drivers/thermal/loongson2_thermal.c

Quoted 10 lines
drivers/thermal/loongson2_thermal.c new file +9 -0
+		if (PTR_ERR(tzd) != ENODEV)
+			continue;
 
+		return dev_err_probe(dev, PTR_ERR(tzd), "failed to register");
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, loongson2_thermal_irq_thread,
+			IRQF_ONESHOT, "loongson2_thermal", tzd);
+	if (ret < 0)
+		return dev_err_probe(dev, ret, "failed to request alarm irq\n")

So there is one interrupt but 4 sensors. I assume there is one interrupt per controller but I don't see in the interrupt handler routine the code to figure out which sensor triggered the interrupt.

drivers/thermal/loongson2_thermal.c line 151

Quoted 8 lines
drivers/thermal/loongson2_thermal.c new file +8 -0
+	if (devm_thermal_add_hwmon_sysfs(dev, tzd))
+		dev_warn(dev, "Failed to add hwmon sysfs attributes\n");
+
+	return 0;
+}
+
+static const struct of_device_id of_loongson2_thermal_match[] = {
+	{ .compatible = "loongson,ls2k-thermal", .data = (const void *)0},

May be better to replace that with a structure pointer but it is up to you to decide

Quoted 15 lines
drivers/thermal/loongson2_thermal.c new file +15 -0
+	{ /* end */ }
+};
+MODULE_DEVICE_TABLE(of, of_loongson2_thermal_match);
+
+static struct platform_driver loongson2_thermal_driver = {
+	.driver = {
+		.name		= "loongson2_thermal",
+		.of_match_table = of_loongson2_thermal_match,
+	},
+	.probe	= loongson2_thermal_probe,
+};
+module_platform_driver(loongson2_thermal_driver);
+
+MODULE_DESCRIPTION("Loongson2 thermal driver");
+MODULE_LICENSE("GPL");
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
author maintainer
#4 lore raw

Hi Daniel,

Thank you very much for your feedback and suggestions. Below, I have some comments, please review.

Quoted 136 lines · Daniel Lezcano
Quoted 135 lines · Yinbo Zhu

This patch adds the support for Loongson-2 thermal sensor controller, which can support maximum 4 sensors, each sensor contains a sampling register and a control register. The sampling register is used to obtain the temperature in real time, the control register GATE field is used to set the threshold of high or low temperature, when the input temperature is higher than the high temperature threshold or lower than the low temperature threshold, an interrupt will occur.

---
Change in v14:
        1. Add back depends on COMPILE_TEST.
        2. The implementation of devm_thermal_add_hwmon_sysfs has changed in recent community code that cause compile fail issue and this verison add a dev args in devm_thermal_add_hwmon_sysfs to fix compile issue. Change in v13:
        1. Add a description about that how works the sensor.
        2. Drop the COMPILE_TEST.
        3. Rework the help prograph in LOONGSON2_THERMAL Kconfig.
        4. Drop the 'tzd' 'irq' and 'pdev' element in loongson2_thermal_data.
        5. Drop the reset of variable in loongson2_thermal_set.
        6. Drop the function loongson2_thermal_get_sensor_id.
        7. Drop the function loongson2_thermal_alarm_irq.
        8. Rework the devm_thermal_of_zone_register.
        9. Pass 'tzd' instead of 'data' in devm_request_threaded_irq.
        10. Drop the "data->tzd->tzp->no_hwmon = false".
        11. Drop the loongson2_thermal_remove.
        12. Add the sensor id in the of_device_id data field.
        13. Drop the save and restore function.
Change in v12:
        1. Fixup it about min and max.
        2. Use dev_err_probe replace dev_err in devm_request_threaded_irq context. Change in v11:
        1. Add min() and max() to replace related code in function loongson2_thermal_set.
        2. Add dev_err_probe to to replace related code for function return value use devm_thermal_of_zone_register.
        3. Replace thermal_add_hwmon_sysfs with devm_thermal_add_hwmon_sysfs and use dev_warn replace dev_err in this context.
Change in v10:
        1. Add all history change log information.
Change in v9:
        1. Switch new API that use devm_thermal_of_zone_register
           to replace previous interfaces.
        2. Add depend on LOONGARCH || COMPILE_TEST.
Change in v8:
                 1. Replace string loongson2/Loongson2/LOONGSON2 with loongson-2/ Loongson-2/LOONGSON-2 in Kconfig and commit log and MAINTAINERS files.
Change in v7:
        1. Split the modification of patch 3 and merge it into this patch.
        2. Remove the unless code annotation to fix the compile warning when compile C code with W=1.
Change in v6:
        1. NO change, but other patch in this series of patches set has changes.
Change in v5:
        1. NO change, but other patch in this series of patches set has changes.
Change in v4:
        1. Fixup the compatible.
Change in v3:
        1. Add a function to gain sensor id an remove dts id.
Change in v2:
        1. Remove error msg printing when addr ioremap has error.
        2. Make loongson2 thermal driver was built-in by default.
        3. Replace ls2k with loongson2.
        4. Remove CONFIG_PM_SLEEP and set pm function type was __maybe_unused.

  MAINTAINERS                         |   7 ++ drivers/thermal/Kconfig             |  12 ++ drivers/thermal/Makefile            |   1 + drivers/thermal/loongson2_thermal.c | 166 ++++++++++++++++++++++++++++

  4 files changed, 186 insertions(+)

  create mode 100644 drivers/thermal/loongson2_thermal.c

MAINTAINERS +0 -0
index 25a0981c74b6..b3a76acd2caf 100644
@@ -12143,6 +12143,13 @@ S:    Maintained

  F: Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
  F:    drivers/pinctrl/pinctrl-loongson2.c

MAINTAINERS +7 -0
+LOONGSON-2 SOC SERIES THERMAL DRIVER
+M:    zhanghongchen <[email protected]>
+M:    Yinbo Zhu <[email protected]>
+L:    [email protected]
+S:    Maintained
+F:    drivers/thermal/loongson2_thermal.c
+

  LOONGSON GPIO DRIVER
  M:    Yinbo Zhu <[email protected]>
  L:    [email protected]

drivers/thermal/Kconfig +0 -0
index 4cd7ab707315..c4de94e972f4 100644
@@ -502,4 +502,16 @@ config KHADAS_MCU_FAN_THERMAL

        If you say yes here you get support for the FAN controlled by the Microcontroller found on the Khadas VIM boards. +config LOONGSON2_THERMAL
+    tristate "Loongson-2 SoC series thermal driver"
+    depends on LOONGARCH || COMPILE_TEST
+    depends on OF
+    help
+      Support for Thermal driver found on Loongson-2 SoC series platforms.
+      The thermal driver realizes get_temp and set_trips function, which +      are used to obtain the temperature of the current node and set the +      temperature range to trigger the interrupt. When the input temperature
+      is higher than the high temperature threshold or lower than the low
+      temperature threshold, the interrupt will occur.
+
  endif

drivers/thermal/Makefile +0 -0
index eed300e83d48..4edde4df647b 100644
@@ -62,3 +62,4 @@ obj-$(CONFIG_UNIPHIER_THERMAL)    += uniphier_thermal.o

  obj-$(CONFIG_AMLOGIC_THERMAL)     += amlogic_thermal.o obj-$(CONFIG_SPRD_THERMAL)    += sprd_thermal.o obj-$(CONFIG_KHADAS_MCU_FAN_THERMAL)    += khadas_mcu_fan.o

drivers/thermal/Makefile +1 -0
+obj-$(CONFIG_LOONGSON2_THERMAL)    += loongson2_thermal.o
drivers/thermal/loongson2_thermal.c new file +2 -0
new file mode 100644
index 000000000000..6a338e6e490e
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
Quoted 8 lines

drivers/thermal/loongson2_thermal.c line 8

Quoted 6 lines
drivers/thermal/loongson2_thermal.c new file +6 -0
+ * Author: zhanghongchen <[email protected]>
+ *         Yinbo Zhu <[email protected]>
+ * Copyright (C) 2022-2023 Loongson Technology Corporation Limited
+ */
+
+#include <linux/cpufreq.h>

Is it really needed ?

okay, I will check it.

Quoted 4 lines

drivers/thermal/loongson2_thermal.c line 9

Quoted 2 lines
drivers/thermal/loongson2_thermal.c new file +1 -0
+#include <linux/delay.h>

Is it really needed ?

okay, I will check it.

Quoted 9 lines
Quoted 9 lines
drivers/thermal/loongson2_thermal.c new file +7 -0
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/of_device.h>
+#include <linux/thermal.h>
+#include "thermal_hwmon.h"
Quoted 8 lines

drivers/thermal/loongson2_thermal.c line 23

Quoted 6 lines
drivers/thermal/loongson2_thermal.c new file +6 -0
+#define LOONGSON2_SOC_MAX_SENSOR_NUM            4
+
+#define LOONGSON2_TSENSOR_CTRL_HI            0x0
+#define LOONGSON2_TSENSOR_CTRL_LO            0x8
+#define LOONGSON2_TSENSOR_STATUS            0x10
+#define LOONGSON2_TSENSOR_OUT                0x14

Please use BIT() macros

okay, I got it.

Quoted 8 lines

drivers/thermal/loongson2_thermal.c line 28

Quoted 5 lines
drivers/thermal/loongson2_thermal.c new file +4 -0
+struct loongson2_thermal_data {
+    int id;
+    void __iomem *regs;
+};

It would make sense to replace the id by the precomputed register offset value.

Quoted 10 lines

drivers/thermal/loongson2_thermal.c line 37

Quoted 8 lines
drivers/thermal/loongson2_thermal.c new file +8 -0
+static int loongson2_thermal_set(struct loongson2_thermal_data *data,
+                    int low, int high, bool enable)
+{
+    u64 reg_ctrl = 0;
+    int reg_off = data->id * 2;
+
+    if (low > high)
+        return -EINVAL;

I don't think this is supposed to happen

okay, I will remove it.

Quoted 5 lines

drivers/thermal/loongson2_thermal.c line 40

Quoted 3 lines
drivers/thermal/loongson2_thermal.c new file +2 -0
+    low = max(low, -40);
+    high = min(high, 125);

You can use clamp() alternatively (your call)

okay, I got it, I will use it.

Quoted 14 lines

drivers/thermal/loongson2_thermal.c line 51

Quoted 12 lines
drivers/thermal/loongson2_thermal.c new file +11 -0
+
+    low += 100;
+    high += 100;
+
+    reg_ctrl = low;
+    reg_ctrl |= enable ? 0x100 : 0;
+    writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_LO + reg_off);
+
+    reg_ctrl = high;
+    reg_ctrl |= enable ? 0x100 : 0;
+    writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_HI + reg_off);

Is the 'enable' boolean really useful?

Yes, this 'enable' was to enable thermal irq.

Quoted 3 lines

Wouldn't be the sensor trip points disabled by default at reset time?

Only here will thermal irq be enabled throughout the entire driver, and actual testing has shown that interrupts are valid, so this is meaningful.

Quoted 14 lines

If it is the case then we can get ride of this variable and make the routine simpler

drivers/thermal/loongson2_thermal.c line 61

Quoted 10 lines
drivers/thermal/loongson2_thermal.c new file +4 -0
+    return 0;
+}
+
+static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, 

int *temp)

drivers/thermal/loongson2_thermal.c new file +5 -0
+{
+    u32 reg_val;
+    struct loongson2_thermal_data *data = tz->devdata;
+
+    reg_val = readl(data->regs + LOONGSON2_TSENSOR_OUT);

Seems like there is no offset for the sensor id here ?

There is no need for a sensor ID here.

There are some things that I didn't describe clearly, which made you misunderstand. Actually, the temperature sensor of 2K1000 is like this:

There are 4 sets of temperature interrupt controllers, only one set of temperature sampling registers. a sets of temperature interrupt controllers was considered a sensor, which sensor include 3 register as follows, where "SEL" represents which sensor is referenced, In 2k1000 datasheet, which "SEL" must be 0.

1) GATE:
2) EN:
3) SEL:

Quoted 4 lines
Quoted 2 lines

+    *temp = ((reg_val & 0xff) - 100) * 1000;

Please use macros in units.h for conversion and change literals by macro

okay, I got it.

Quoted 10 lines

drivers/thermal/loongson2_thermal.c line 70

Quoted 8 lines

+    return 0;

drivers/thermal/loongson2_thermal.c new file +6 -0
+}
+
+static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
+{
+    struct thermal_zone_device *tzd = dev;
+    struct loongson2_thermal_data *data = tzd->devdata;

The init function tells me whatever the sensor triggering the interrupt we update the same thermal zone, not necessarily the one which reach the trip point.

Although there are four sets of registers, but, only one set temperature interrupt controllers was valid in 2k1000. and the condition for interruption is that the temperature reaches trip point.

Quoted 5 lines
Quoted 3 lines

+    /* clear interrupt */
+    writeb(0x3, data->regs + LOONGSON2_TSENSOR_STATUS);

Replace the literal value by a macro.

okay, I got it .

Quoted 14 lines

drivers/thermal/loongson2_thermal.c line 84

Quoted 12 lines

+    thermal_zone_device_update(tzd, THERMAL_EVENT_UNSPECIFIED);

drivers/thermal/loongson2_thermal.c new file +5 -0
+
+    return IRQ_HANDLED;
+}
+
+static int loongson2_thermal_set_trips(struct thermal_zone_device 

*tz, int low, int high)

drivers/thermal/loongson2_thermal.c new file +4 -0
+{
+    struct loongson2_thermal_data *data = tz->devdata;
+
+    return loongson2_thermal_set(data, low/1000, high/1000, true);

Please use macros in units.h for conversion

okay, I got it.

Quoted 24 lines
Quoted 11 lines
drivers/thermal/loongson2_thermal.c new file +10 -0
+}
+
+static const struct thermal_zone_device_ops loongson2_of_thermal_ops = {
+    .get_temp = loongson2_thermal_get_temp,
+    .set_trips = loongson2_thermal_set_trips,
+};
+
+static int loongson2_thermal_probe(struct platform_device *pdev)
+{
+    struct device *dev = &pdev->dev;

drivers/thermal/loongson2_thermal.c line 104

Quoted 10 lines
drivers/thermal/loongson2_thermal.c new file +10 -0
+    struct resource *res;
+    struct loongson2_thermal_data *data;
+    struct thermal_zone_device *tzd;
+    int ret, irq, i;
+
+    data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+    if (!data)
+        return -ENOMEM;
+
+    data->id = (uintptr_t)device_get_match_data(dev);

The changelog says there is up to 4 sensors on the controller but the initialization code seems to handle only one.

Quoted 1 line

Either you skip this data at all and let the loop to fill the id when the thermal zone successfully registered or you add a eg. a mask with the sensor (eg. 0x3 for sensor 0 and 1) and use those value in the loop.

At present, this code seems appropriate because although 2k1000 has four sets of temperature interrupt controllers, only the 0th set is valid.

Quoted 11 lines
Quoted 11 lines

+    res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +    data->regs = devm_ioremap(dev, res->start, resource_size(res)); +    if (IS_ERR(data->regs))
+        return PTR_ERR(data->regs);
+
+    /* get irq */
+    irq = platform_get_irq(pdev, 0);
+    if (irq < 0)
+        return irq;

Quoted 8 lines
Quoted 6 lines

+
+    if (data->id > LOONGSON2_SOC_MAX_SENSOR_NUM - 1 || data->id < 0) { +        dev_err(dev, "sensor id error,must be in <0 ~ %d>\n", +                LOONGSON2_SOC_MAX_SENSOR_NUM - 1);
+        return -EINVAL;
+    }

As this is coming from a static initialization, this test is not needed.

okay, I got it.

Quoted 4 lines
Quoted 2 lines

+    writeb(0xff, data->regs + LOONGSON2_TSENSOR_STATUS);

Replace the literal value by a macro

okay, I got it.

Quoted 11 lines

drivers/thermal/loongson2_thermal.c line 131

Quoted 9 lines

+    loongson2_thermal_set(data, 0, 0, false);

drivers/thermal/loongson2_thermal.c new file +7 -0
+
+    for (i = 0; i < LOONGSON2_SOC_MAX_SENSOR_NUM; i++) {
+        tzd = devm_thermal_of_zone_register(dev, i, data,
+            &loongson2_of_thermal_ops);
+
+        if (!IS_ERR(tzd))
+            break;

Assuming the loop aims to register all the supported thermal zones, the conditions should be inverted.

This code seems appropriate, the reason is as above.

Quoted 13 lines
Quoted 4 lines

+        if (PTR_ERR(tzd) != ENODEV)
+            continue;

Quoted 8 lines

+        return dev_err_probe(dev, PTR_ERR(tzd), "failed to register"); +    }
+
+    ret = devm_request_threaded_irq(dev, irq, NULL, loongson2_thermal_irq_thread,
+            IRQF_ONESHOT, "loongson2_thermal", tzd);
+    if (ret < 0)
+        return dev_err_probe(dev, ret, "failed to request alarm irq\n")

Quoted 1 line

So there is one interrupt but 4 sensors. I assume there is one interrupt per controller but I don't see in the interrupt handler routine the code to figure out which sensor triggered the interrupt.

This code seems appropriate, the reason is as above.

Quoted 11 lines

drivers/thermal/loongson2_thermal.c line 151

Quoted 9 lines

+    if (devm_thermal_add_hwmon_sysfs(dev, tzd))
+        dev_warn(dev, "Failed to add hwmon sysfs attributes\n");

drivers/thermal/loongson2_thermal.c new file +6 -0
+
+    return 0;
+}
+
+static const struct of_device_id of_loongson2_thermal_match[] = {
+    { .compatible = "loongson,ls2k-thermal", .data = (const void *)0},

May be better to replace that with a structure pointer but it is up to you to decide

okay, I got it.

Thanks,
Yinbo

#5 lore raw

Hi Yinbo,

Quoted 5 lines · zhuyinbo

Hi Daniel,

Thank you very much for your feedback and suggestions. Below, I have some comments, please review.

[ ... ]

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

+
+    low += 100;
+    high += 100;

Literals -> macros

Quoted 14 lines
Quoted 9 lines
Quoted 7 lines

+    reg_ctrl = low;
+    reg_ctrl |= enable ? 0x100 : 0;
+    writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_LO + reg_off); +
+    reg_ctrl = high;
+    reg_ctrl |= enable ? 0x100 : 0;
+    writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_HI + reg_off);

Is the 'enable' boolean really useful?

Yes, this 'enable' was to enable thermal irq.

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

Wouldn't be the sensor trip points disabled by default at reset time?

Only here will thermal irq be enabled throughout the entire driver, and actual testing has shown that interrupts are valid, so this is meaningful.

Ok.

Quoted 18 lines
Quoted 14 lines

If it is the case then we can get ride of this variable and make the routine simpler

drivers/thermal/loongson2_thermal.c line 61

Quoted 10 lines

+    return 0;

drivers/thermal/loongson2_thermal.c new file +3 -0
+}
+
+static int loongson2_thermal_get_temp(struct thermal_zone_device 

*tz, int *temp)

drivers/thermal/loongson2_thermal.c new file +5 -0
+{
+    u32 reg_val;
+    struct loongson2_thermal_data *data = tz->devdata;
+
+    reg_val = readl(data->regs + LOONGSON2_TSENSOR_OUT);

Seems like there is no offset for the sensor id here ?

There is no need for a sensor ID here.

Quoted 8 lines

There are some things that I didn't describe clearly, which made you misunderstand. Actually, the temperature sensor of 2K1000 is like this:

There are 4 sets of temperature interrupt controllers, only one set of temperature sampling registers. a sets of temperature interrupt controllers was considered a sensor, which sensor include 3 register as follows, where "SEL" represents which sensor is referenced, In 2k1000 datasheet, which "SEL" must be 0.

I'm not sure to understand. Let me rephrase it and know what is wrong.

1. The thermal controller has 4 sensors. The interrupt can be set for these 4 sensors.

2. When reading a temperature, we have to select the sensor via the 'SEL' register.

3. The 2k1000 has one sensor with an id = 0.

4. In the future, more Loongson platform can be submitted with more than one sensor

If this is correct, then my comments are about the inconsistency of the proposed changes. Guessing in the future Loongson board there will be more than one sensor, the existing code mixes support for one and multiple sensors as well as assuming id is 0.

So if you add in the of_loongson2_thermal_match table a new platform with several sensors, the current code will be broken because:

- the initialization loop does exit when the first thermal zone
registration succeed

- the interrupt handler does not figure out which sensor crossed the
low/high limit

- the get_temp is not selecting the right sensor

That is my point:

- write the code to support one sensor with id=0 only

*or*

- write the code to support multiple sensors

If I'm not wrong the code is closer to support multiple sensors ;)

Let me know if these deductions are correct

-- Daniel

ps : is there an English translation for the 2k1000 datasheet ?

Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
author maintainer
#6 lore raw

Hi Daniel,

Quoted 11 lines · Daniel Lezcano

Hi Yinbo,

Quoted 5 lines · zhuyinbo

Hi Daniel,

Thank you very much for your feedback and suggestions. Below, I have some comments, please review.

Quoted 7 lines

[ ... ]

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

+
+    low += 100;
+    high += 100;

Literals -> macros

okay, I got it.

Quoted 54 lines
Quoted 17 lines
Quoted 11 lines
Quoted 10 lines

+    reg_ctrl = low;
+    reg_ctrl |= enable ? 0x100 : 0;
+    writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_LO + reg_off);
+
+    reg_ctrl = high;
+    reg_ctrl |= enable ? 0x100 : 0;
+    writew(reg_ctrl, data->regs + LOONGSON2_TSENSOR_CTRL_HI + reg_off);

Quoted 1 line

Is the 'enable' boolean really useful?

Yes, this 'enable' was to enable thermal irq.

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

Wouldn't be the sensor trip points disabled by default at reset time?

Only here will thermal irq be enabled throughout the entire driver, and actual testing has shown that interrupts are valid, so this is meaningful.

Ok.

Quoted 18 lines
Quoted 14 lines

If it is the case then we can get ride of this variable and make the routine simpler

drivers/thermal/loongson2_thermal.c line 61

Quoted 10 lines

+    return 0;

drivers/thermal/loongson2_thermal.c new file +3 -0
+}
+
+static int loongson2_thermal_get_temp(struct thermal_zone_device 

*tz, int *temp)

drivers/thermal/loongson2_thermal.c new file +5 -0
+{
+    u32 reg_val;
+    struct loongson2_thermal_data *data = tz->devdata;
+
+    reg_val = readl(data->regs + LOONGSON2_TSENSOR_OUT);

Seems like there is no offset for the sensor id here ?

There is no need for a sensor ID here.

Quoted 8 lines

There are some things that I didn't describe clearly, which made you misunderstand. Actually, the temperature sensor of 2K1000 is like this:

There are 4 sets of temperature interrupt controllers, only one set of temperature sampling registers. a sets of temperature interrupt controllers was considered a sensor, which sensor include 3 register as follows, where "SEL" represents which sensor is referenced, In 2k1000 datasheet, which "SEL" must be 0.

Quoted 3 lines

I'm not sure to understand. Let me rephrase it and know what is wrong.

1. The thermal controller has 4 sensors. The interrupt can be set for these 4 sensors.

You can think it's actually a sensor, but the thermal sensor include a set of status register and four sets of control register in loongson-2k series (2k1000 /2k2000), but the control register only select a group register by set "SEL".

Quoted 2 lines

2. When reading a temperature, we have to select the sensor via the 'SEL' register.

The 'SEL' was to select thermal control register set, that reading a tempearure was to thermal status register set. thermal status register set only one and no no other choice. The function of 'SEL' is actually to select which temperature sensor collects the temperature as input.

Quoted 2 lines

3. The 2k1000 has one sensor with an id = 0.

Yes, the future 2k series product may still be a sensor, but the ID may not be 0, it may be 1 or 2 or 3.

Quoted 2 lines

4. In the future, more Loongson platform can be submitted with more than one sensor

From the current situation of the 2k series (2k1000/2k2000), it seems that there will always be only one sensor, but 'SEL' can be used to select which sensor. (0th, 1th, 2th, 3th). If there are really special circumstances in the future, add appropriate modifications at that time.

Quoted 5 lines

If this is correct, then my comments are about the inconsistency of the proposed changes. Guessing in the future Loongson board there will be more than one sensor, the existing code mixes support for one and multiple sensors as well as assuming id is 0.

So if you add in the of_loongson2_thermal_match table a new platform with several sensors, the current code will be broken because:

Quoted 7 lines

 - the initialization loop does exit when the first thermal zone
registration succeed

 - the interrupt handler does not figure out which sensor crossed the
low/high limit

 - the get_temp is not selecting the right sensor

Yes, but currently this code does not support the requirement for multiple sensors.

Quoted 11 lines

That is my point:

 - write the code to support one sensor with id=0 only

   *or*

 - write the code to support multiple sensors

If I'm not wrong the code is closer to support multiple sensors ;)

In fact, my code is more inclined to support one sensor, but it can determine which sensor to use based on the ID. (id = 0, 1, 2, 3)

Quoted 6 lines

Let me know if these deductions are correct

  -- Daniel

ps : is there an English translation for the 2k1000 datasheet ?

Sorry, there seems to be no English version available at the moment.

Thanks,
Yinbo.

#7 lore raw

PATCH 1/1 thermal/drivers/loongson2: Fix thermal zone private data access

The thermal zone device won't be accessible directly anymore.

Use the private data accessor.

---
 drivers/thermal/loongson2_thermal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/thermal/loongson2_thermal.c +3 -3
index 6a338e6e490e..9a07409c3bd2 100644
@@ -56,7 +56,7 @@ static int loongson2_thermal_set(struct loongson2_thermal_data *data,
 static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
 {
 	u32 reg_val;
-	struct loongson2_thermal_data *data = tz->devdata;
+	struct loongson2_thermal_data *data = thermal_zone_device_priv(tz);
 
 	reg_val = readl(data->regs + LOONGSON2_TSENSOR_OUT);
 	*temp = ((reg_val & 0xff) - 100) * 1000;
@@ -67,7 +67,7 @@ static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
 static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
 {
 	struct thermal_zone_device *tzd = dev;
-	struct loongson2_thermal_data *data = tzd->devdata;
+	struct loongson2_thermal_data *data = thermal_zone_device_priv(tzd);
 
 	/* clear interrupt */
 	writeb(0x3, data->regs + LOONGSON2_TSENSOR_STATUS);
@@ -79,7 +79,7 @@ static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
 
 static int loongson2_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)
 {
-	struct loongson2_thermal_data *data = tz->devdata;
+	struct loongson2_thermal_data *data = thermal_zone_device_priv(tz);
 
 	return loongson2_thermal_set(data, low/1000, high/1000, true);
 }
Signature · 1 line
2.34.1
#8 lore raw

Re: [PATCH] thermal/drivers/loongson2: Fix thermal zone private data access

Quoted 3 lines · Daniel Lezcano

The thermal zone device won't be accessible directly anymore.

Use the private data accessor.

To be folded with your next version

Thanks

Quoted 38 lines
---
  drivers/thermal/loongson2_thermal.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
drivers/thermal/loongson2_thermal.c +3 -3
index 6a338e6e490e..9a07409c3bd2 100644
@@ -56,7 +56,7 @@ static int loongson2_thermal_set(struct loongson2_thermal_data *data,
  static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
  {
  	u32 reg_val;
-	struct loongson2_thermal_data *data = tz->devdata;
+	struct loongson2_thermal_data *data = thermal_zone_device_priv(tz);
 
  	reg_val = readl(data->regs + LOONGSON2_TSENSOR_OUT);
  	*temp = ((reg_val & 0xff) - 100) * 1000;
@@ -67,7 +67,7 @@ static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
  static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
  {
  	struct thermal_zone_device *tzd = dev;
-	struct loongson2_thermal_data *data = tzd->devdata;
+	struct loongson2_thermal_data *data = thermal_zone_device_priv(tzd);
 
  	/* clear interrupt */
  	writeb(0x3, data->regs + LOONGSON2_TSENSOR_STATUS);
@@ -79,7 +79,7 @@ static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev)
 
  static int loongson2_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)
  {
-	struct loongson2_thermal_data *data = tz->devdata;
+	struct loongson2_thermal_data *data = thermal_zone_device_priv(tz);
 
  	return loongson2_thermal_set(data, low/1000, high/1000, true);
  }
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
author maintainer
#9 lore raw

Re: [PATCH] thermal/drivers/loongson2: Fix thermal zone private data access

Quoted 7 lines · Daniel Lezcano
Quoted 3 lines · Daniel Lezcano

The thermal zone device won't be accessible directly anymore.

Use the private data accessor.

To be folded with your next version

okay, If I understand correctly, I will make this patch as a independent [3/3] patch of the v15 series patch.

Thanks,
Yinbo

#10 lore raw

Re: [PATCH] thermal/drivers/loongson2: Fix thermal zone private data access

Quoted 6 lines · zhuyinbo
Quoted 3 lines · Daniel Lezcano
Quoted 2 lines · Daniel Lezcano

The thermal zone device won't be accessible directly anymore.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Use the private data accessor.

To be folded with your next version

okay, If I understand correctly, I will make this patch as a independent [3/3] patch of the v15 series patch.

It is better to merge it with your patch 2 in order to prevent a git bisecting error (no need to add a my signoff or whatever)

Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
author maintainer
#11 lore raw

Re: [PATCH] thermal/drivers/loongson2: Fix thermal zone private data access

Quoted 9 lines · Daniel Lezcano
Quoted 8 lines · zhuyinbo
Quoted 5 lines · Daniel Lezcano
Quoted 3 lines · Daniel Lezcano

The thermal zone device won't be accessible directly anymore.

Use the private data accessor.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

To be folded with your next version

okay, If I understand correctly, I will make this patch as a independent [3/3] patch of the v15 series patch.

It is better to merge it with your patch 2 in order to prevent a git bisecting error (no need to add a my signoff or whatever)

okay, I got it.

Thanks,
Yinbo

Quoted 1 line
author maintainer
#12 lore raw
In reply to Daniel Lezcano

Hi Daniel,

在 2023/6/12 下午10:22, Daniel Lezcano 写道:

...

Quoted 9 lines

drivers/thermal/loongson2_thermal.c line 23

Quoted 7 lines
drivers/thermal/loongson2_thermal.c new file +6 -0
+#define LOONGSON2_SOC_MAX_SENSOR_NUM            4
+
+#define LOONGSON2_TSENSOR_CTRL_HI            0x0
+#define LOONGSON2_TSENSOR_CTRL_LO            0x8
+#define LOONGSON2_TSENSOR_STATUS            0x10
+#define LOONGSON2_TSENSOR_OUT                0x14

Please use BIT() macros

I learn about that BIT() is generally used to describe the functional bit or control bit or status bits of a register, but these register was some different register offset and not some control bit or status bit So using BIT() here seems a bit inappropriate, Do you think so?

Thanks,
Yinbo

#13 lore raw
Quoted 18 lines · zhuyinbo

Hi Daniel,

在 2023/6/12 下午10:22, Daniel Lezcano 写道:

...

Quoted 9 lines

drivers/thermal/loongson2_thermal.c line 23

Quoted 7 lines
drivers/thermal/loongson2_thermal.c new file +6 -0
+#define LOONGSON2_SOC_MAX_SENSOR_NUM            4
+
+#define LOONGSON2_TSENSOR_CTRL_HI            0x0
+#define LOONGSON2_TSENSOR_CTRL_LO            0x8
+#define LOONGSON2_TSENSOR_STATUS            0x10
+#define LOONGSON2_TSENSOR_OUT                0x14

Please use BIT() macros

Quoted 4 lines

I learn about that BIT() is generally used to describe the functional bit or control bit or status bits of a register, but these register was some different register offset and not some control bit or status bit So using BIT() here seems a bit inappropriate, Do you think so?

Yes, you are right

Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
author maintainer
#14 lore raw
Quoted 19 lines · Daniel Lezcano
Quoted 18 lines · zhuyinbo

Hi Daniel,

在 2023/6/12 下午10:22, Daniel Lezcano 写道:

...

Quoted 9 lines

drivers/thermal/loongson2_thermal.c line 23

Quoted 7 lines
drivers/thermal/loongson2_thermal.c new file +6 -0
+#define LOONGSON2_SOC_MAX_SENSOR_NUM            4
+
+#define LOONGSON2_TSENSOR_CTRL_HI            0x0
+#define LOONGSON2_TSENSOR_CTRL_LO            0x8
+#define LOONGSON2_TSENSOR_STATUS            0x10
+#define LOONGSON2_TSENSOR_OUT                0x14

Please use BIT() macros

Quoted 6 lines
Quoted 4 lines

I learn about that BIT() is generally used to describe the functional bit or control bit or status bits of a register, but these register was some different register offset and not some control bit or status bit So using BIT() here seems a bit inappropriate, Do you think so?

Yes, you are right

okay, I got it.

Thanks,
Yinbo