Skip to contentSkip to conversation

add thermal driver for h6

PATCH Superseded Yangtao Li 4 participants 22 messages May 25, 2019 – Jun 18, 2019

Subsystems (4)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Yangtao Li

author maintainer
#0 lore raw

v3 cover add thermal driver for h6

This patchset add support for H6 thermal sensor.

BWY, do a cleanup in thermal makfile.

Yangtao Li (3):
thermal: sun8i: add thermal driver for h6
dt-bindings: thermal: add binding document for h6 thermal controller
thermal: fix indentation in makefile

 .../bindings/thermal/sun8i-thermal.yaml       |  71 +++
 MAINTAINERS                                   |   7 +
 drivers/thermal/Kconfig                       |  14 +
 drivers/thermal/Makefile                      |   9 +-
 drivers/thermal/sun8i_thermal.c               | 437 ++++++++++++++++++
 5 files changed, 534 insertions(+), 4 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
 create mode 100644 drivers/thermal/sun8i_thermal.c

---
v3:
-Add a sun8i prefix to some function
-Remove disable callback and rename enable to init -Remove clock enable, calibration from init callback -Convert driver to interrupt based
-Convert doc to yaml file
---
2.17.0

author maintainer
#1 lore raw

PATCH v3 1/3 thermal: sun8i: add thermal driver for h6

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:	Yangtao Li <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:	drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:	Maxime Ripard <[email protected]>
 M:	Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +14 -0
index 9966364a6deb..e5465053d66f 100644
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
 	  Enable this to plug the SPEAr thermal sensor driver into the Linux
 	  thermal framework.
 
+config SUN8I_THERMAL
+	tristate "Allwinner sun8i thermal driver"
+	depends on ARCH_SUNXI || COMPILE_TEST
+	depends on HAS_IOMEM
+	depends on NVMEM_SUNXI_SID
+	depends on OF
+	depends on RESET_CONTROLLER
+	help
+	  Support for the sun8i thermal sensor driver into the Linux thermal
+	  framework.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
 	tristate "Rockchip thermal driver"
 	depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y				+= broadcom/
 obj-$(CONFIG_THERMAL_MMIO)		+= thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)	+= spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)	+= rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)	+= rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)	+= rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +437 -0

437 lines not on this page · raw message

Signature · 1 line
2.17.0
author maintainer
#19 lore raw

PATCH v3 2/3 dt-bindings: thermal: add binding document for h6 thermal controller

In reply to Yangtao Li

This patch adds binding document for allwinner h6 thermal controller.

---
 .../bindings/thermal/sun8i-thermal.yaml       | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml new file +71 -0
new file mode 100644
index 000000000000..54cf1277870e
@@ -0,0 +1,71 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/thermal/sun8i-thermal.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner SUN8I Thermal Controller Device Tree Bindings
+
+maintainers:
+  - Yangtao Li <[email protected]>
+
+description: |-
+  This describes the device tree binding for the Allwinner thermal
+  controller which measures the on-SoC temperatures.
+
+properties:
+  compatible:
+    enum:
+      - allwinner,sun50i-h6-ths
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: ths bus clock
+
+  clock-names:
+    items:
+      - const: bus
+
+  "#thermal-sensor-cells":
+    enum: [ 0, 1 ]
+
+  nvmem-cells:
+    items:
+      - description: ths calibrate data
+
+  nvmem-cell-names:
+    items:
+      - const: calib
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - reset
+  - clocks
+  - clock-names
+
+examples:
+  - |
+    ths: ths@5070400 {
+         compatible = "allwinner,sun50i-h6-ths";
+         reg = <0x05070400 0x100>;
+         clocks = <&ccu CLK_BUS_THS>;
+         clock-names = "bus";
+         resets = <&ccu RST_BUS_THS>;
+         interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+         nvmem-cells = <&tsen_calib>;
+         nvmem-cell-names = "calib";
+         #thermal-sensor-cells = <1>;
+    };
+
+...
Signature · 1 line
2.17.0
author maintainer
#21 lore raw

PATCH v3 3/3 thermal: fix indentation in makefile

In reply to Yangtao Li

To unify code style.

---
 drivers/thermal/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/thermal/Makefile +4 -4
index fa6f8b206281..d7eafb5ef8ef 100644
@@ -5,7 +5,7 @@
 
 obj-$(CONFIG_THERMAL)		+= thermal_sys.o
 thermal_sys-y			+= thermal_core.o thermal_sysfs.o \
-					thermal_helpers.o
+				   thermal_helpers.o
 
 # interface to/from other layers providing sensors
 thermal_sys-$(CONFIG_THERMAL_HWMON)		+= thermal_hwmon.o
@@ -25,11 +25,11 @@ thermal_sys-$(CONFIG_CPU_THERMAL)	+= cpu_cooling.o
 thermal_sys-$(CONFIG_CLOCK_THERMAL)	+= clock_cooling.o
 
 # devfreq cooling
-thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
+thermal_sys-$(CONFIG_DEVFREQ_THERMAL) 	+= devfreq_cooling.o
 
 # platform thermal drivers
 obj-y				+= broadcom/
-obj-$(CONFIG_THERMAL_MMIO)		+= thermal_mmio.o
+obj-$(CONFIG_THERMAL_MMIO)	+= thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)	+= spear_thermal.o
 obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)	+= rockchip_thermal.o
@@ -50,7 +50,7 @@ obj-$(CONFIG_TI_SOC_THERMAL)	+= ti-soc-thermal/
 obj-y				+= st/
 obj-$(CONFIG_QCOM_TSENS)	+= qcom/
 obj-y				+= tegra/
-obj-$(CONFIG_HISI_THERMAL)     += hisi_thermal.o
+obj-$(CONFIG_HISI_THERMAL)     	+= hisi_thermal.o
 obj-$(CONFIG_MTK_THERMAL)	+= mtk_thermal.o
 obj-$(CONFIG_GENERIC_ADC_THERMAL)	+= thermal-generic-adc.o
 obj-$(CONFIG_ZX2967_THERMAL)	+= zx2967_thermal.o
Signature · 1 line
2.17.0
#20 lore raw

Re: [PATCH v3 2/3] dt-bindings: thermal: add binding document for h6 thermal controller

In reply to Yangtao Li

Hi,

Thanks for working on this!

Quoted 41 lines · Yangtao Li

This patch adds binding document for allwinner h6 thermal controller.

---
 .../bindings/thermal/sun8i-thermal.yaml       | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml new file +26 -0
new file mode 100644
index 000000000000..54cf1277870e
@@ -0,0 +1,71 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/thermal/sun8i-thermal.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner SUN8I Thermal Controller Device Tree Bindings
+
+maintainers:
+  - Yangtao Li <[email protected]>
+
+description: |-
+  This describes the device tree binding for the Allwinner thermal
+  controller which measures the on-SoC temperatures.
+
+properties:
+  compatible:
+    enum:
+      - allwinner,sun50i-h6-ths
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+

Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml line 36

Quoted 10 lines
Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml new file +10 -0
+  resets:
+    maxItems: 1
+
+  clocks:
+    items:
+      - description: ths bus clock
+
+  clock-names:
+    items:
+      - const: bus

You don't need the items here, you can just do:

clocks:
maxItems: 1
description:
Bus clock

clock-names:
const: bus

Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml line 39

Quoted 2 lines
Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml new file +2 -0
+  "#thermal-sensor-cells":
+    enum: [ 0, 1 ]

You should document when you would need one or the other.

My guess is that you did it that way to deal with the A33? If so, we can just request the cell size to be 1 for now, and then expand it to an enum later on when we'll support the A33.

Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml line 47

Quoted 7 lines
Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml new file +7 -0
+  nvmem-cells:
+    items:
+      - description: ths calibrate data
+
+  nvmem-cell-names:
+    items:
+      - const: calib

Same remark than for the clocks

Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml line 55

Quoted 8 lines
Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml new file +8 -0
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - reset
+  - clocks
+  - clock-names

I guess you'd need #thermal-sensor-cells too?

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#2 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Yangtao Li

Hi!

Thanks for submitting a new version

Quoted 36 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:	Yangtao Li <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:	drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:	Maxime Ripard <[email protected]>
 M:	Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +0 -0
index 9966364a6deb..e5465053d66f 100644

drivers/thermal/Kconfig config SPEAR_THERMAL · line 269

Quoted 8 lines
drivers/thermal/Kconfig +5 -0
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
 	  Enable this to plug the SPEAr thermal sensor driver into the Linux
 	  thermal framework.
 
+config SUN8I_THERMAL
+	tristate "Allwinner sun8i thermal driver"
+	depends on ARCH_SUNXI || COMPILE_TEST
+	depends on HAS_IOMEM
+	depends on NVMEM_SUNXI_SID

Do you? It looks from your binding as if it's optional. Also, it's pretty uncommon to depend on a given driver, usually you'll want to depend on the framework instead.

Quoted 88 lines
drivers/thermal/Kconfig +9 -0
+	depends on OF
+	depends on RESET_CONTROLLER
+	help
+	  Support for the sun8i thermal sensor driver into the Linux thermal
+	  framework.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
 	tristate "Rockchip thermal driver"
 	depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y				+= broadcom/
 obj-$(CONFIG_THERMAL_MMIO)		+= thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)	+= spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)	+= rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)	+= rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)	+= rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +58 -0
new file mode 100644
index 000000000000..a9cc2197f4cb
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Thermal sensor driver for Allwinner SOC
+ * Copyright (C) 2019 Yangtao Li
+ *
+ * Based on the work of Icenowy Zheng <[email protected]>
+ * Based on the work of Ondrej Jirman <[email protected]>
+ * Based on the work of Josef Gajdusek <[email protected]>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+
+#define MAX_SENSOR_NUM	4
+
+#define FT_TEMP_MASK				GENMASK(11, 0)
+#define TEMP_CALIB_MASK				GENMASK(11, 0)
+#define TEMP_TO_REG				672
+#define CALIBRATE_DEFAULT			0x800
+
+#define SUN50I_THS_CTRL0			0x00
+#define SUN50I_H6_THS_ENABLE			0x04
+#define SUN50I_H6_THS_PC			0x08
+#define SUN50I_H6_THS_DIC			0x10
+#define SUN50I_H6_THS_DIS			0x20
+#define SUN50I_H6_THS_MFC			0x30
+#define SUN50I_H6_THS_TEMP_CALIB		0xa0
+#define SUN50I_H6_THS_TEMP_DATA			0xc0
+
+#define SUN50I_THS_CTRL0_T_ACQ(x)		((GENMASK(15, 0) & (x)) << 16)
+#define SUN50I_THS_FILTER_EN			BIT(2)
+#define SUN50I_THS_FILTER_TYPE(x)		(GENMASK(1, 0) & (x))
+#define SUN50I_H6_THS_PC_TEMP_PERIOD(x)		((GENMASK(19, 0) & (x)) << 12)
+#define SUN50I_H6_THS_DATA_IRQ_STS(x)		BIT(x)
+
+/* millidegree celsius */
+#define SUN50I_H6_FT_DEVIATION			7000
+
+struct ths_device;
+
+struct tsensor {
+	struct ths_device		*tmdev;
+	struct thermal_zone_device	*tzd;
+	int				id;
+	wait_queue_head_t		wait_queue;
+};
+
+struct ths_thermal_chip {

drivers/thermal/sun8i_thermal.c line 68

Quoted 10 lines
drivers/thermal/sun8i_thermal.c new file +10 -0
+	int		sensor_num;
+	int		offset;
+	int		scale;
+	int		ft_deviation;
+	int		temp_calib_base;
+	int		temp_data_base;
+	int		(*calibrate)(struct ths_device *tmdev);
+	int		(*init)(struct ths_device *tmdev);
+	irqreturn_t	(*irq_thread)(int irq, void *data);
+};

Again, you should remove these quirks structure at the moment and only deal with the H6.

Quoted 55 lines
drivers/thermal/sun8i_thermal.c new file +55 -0
+struct ths_device {
+	const struct ths_thermal_chip		*chip;
+	struct device				*dev;
+	struct regmap				*regmap;
+	struct reset_control			*reset;
+	struct clk				*bus_clk;
+	struct tsensor				sensor[MAX_SENSOR_NUM];
+	int					data_ready;
+};
+
+/* Temp Unit: millidegree Celsius */
+static int sun8i_ths_reg2temp(struct ths_device *tmdev,
+			      int reg)
+{
+	return (reg + tmdev->chip->offset) * tmdev->chip->scale;
+}
+
+static int sun8i_ths_get_temp(void *data, int *temp)
+{
+	struct tsensor *s = data;
+	struct ths_device *tmdev = s->tmdev;
+	int val;
+
+	wait_event(s->wait_queue, tmdev->data_ready & BIT(s->id));
+	tmdev->data_ready &= ~BIT(s->id);
+
+	regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
+		    0x4 * s->id, &val);
+
+	*temp = sun8i_ths_reg2temp(tmdev, val);
+	/*
+	 * XX - According to the original sdk, there are some platforms(rarely)
+	 * that add a fixed offset value after calculating the temperature
+	 * value. We can't simply put it on the formula for calculating the
+	 * temperature above, because the formula for calculating the
+	 * temperature above is also used when the sensor is calibrated. If
+	 * do this, the correct calibration formula is hard to know.
+	 */
+	if (tmdev->chip->ft_deviation)
+		*temp += tmdev->chip->ft_deviation;
+
+	return 0;
+}
+
+static const struct thermal_zone_of_device_ops ths_ops = {
+	.get_temp = sun8i_ths_get_temp,
+};
+
+static const struct regmap_config config = {
+	.reg_bits = 32,
+	.val_bits = 32,
+	.reg_stride = 4,
+	.fast_io = true,
+};
+

drivers/thermal/sun8i_thermal.c line 134

Quoted 10 lines
drivers/thermal/sun8i_thermal.c new file +10 -0
+static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+{
+	wait_queue_head_t *data_wait;
+	struct ths_device *tmdev = data;
+	int i, state;
+
+	regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
+
+	for (i = 0; i < tmdev->chip->sensor_num; i++) {
+		data_wait = &tmdev->sensor[i].wait_queue;

You're only using data_wait in that scope, so you should define it here.

Quoted 38 lines
drivers/thermal/sun8i_thermal.c new file +38 -0
+
+		if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
+			/* clear data irq pending */
+			regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
+				     SUN50I_H6_THS_DATA_IRQ_STS(i));
+
+			tmdev->data_ready |= BIT(i);
+			wake_up(data_wait);
+		}
+	}
+
+	return IRQ_HANDLED;
+}
+
+static int sun8i_ths_resource_init(struct ths_device *tmdev)
+{
+	struct device *dev = tmdev->dev;
+	struct platform_device *pdev = to_platform_device(dev);
+	struct resource *mem;
+	void __iomem *base;
+	int ret, irq;
+
+	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	base = devm_ioremap_resource(dev, mem);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
+
+	tmdev->regmap = devm_regmap_init_mmio(dev, base, &config);
+	if (IS_ERR(tmdev->regmap))
+		return PTR_ERR(tmdev->regmap);
+
+	tmdev->reset = devm_reset_control_get(dev, 0);
+	if (IS_ERR(tmdev->reset))
+		return PTR_ERR(tmdev->reset);
+
+	tmdev->bus_clk = devm_clk_get(&pdev->dev, "bus");
+	if (IS_ERR(tmdev->bus_clk))
+		return PTR_ERR(tmdev->bus_clk);

drivers/thermal/sun8i_thermal.c line 182

Quoted 10 lines
drivers/thermal/sun8i_thermal.c new file +10 -0
+
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0)
+		return irq;
+
+	ret = devm_request_threaded_irq(dev, irq, NULL,
+					tmdev->chip->irq_thread,
+					IRQF_ONESHOT, "ths", tmdev);
+	if (ret)
+		return ret;

Is there any particular reason to use a threaded interrupt?

Also, starting from here you can start having interrupts...

drivers/thermal/sun8i_thermal.c line 194

Quoted 12 lines
drivers/thermal/sun8i_thermal.c new file +12 -0
+
+	ret = reset_control_deassert(tmdev->reset);
+	if (ret)
+		return ret;
+
+	ret = clk_prepare_enable(tmdev->bus_clk);
+	if (ret)
+		goto assert_reset;
+
+	ret = tmdev->chip->calibrate(tmdev);
+	if (ret)
+		goto bus_disable;

While the device hasn't been properly initialized yet. Especially when held in reset, some Allwinner controllers has been known to send spurious interrupts, so we want to defer that to the very last minute (so right before your call to sun8i_ths_register).

Quoted 169 lines
drivers/thermal/sun8i_thermal.c new file +169 -0
+	return 0;
+
+bus_disable:
+	clk_disable_unprepare(tmdev->bus_clk);
+assert_reset:
+	reset_control_assert(tmdev->reset);
+
+	return ret;
+}
+
+static int sun50i_ths_calibrate(struct ths_device *tmdev)
+{
+	struct nvmem_cell *calcell;
+	struct device *dev = tmdev->dev;
+	u16 *caldata;
+	size_t callen;
+	int ft_temp;
+	int i, ret = 0;
+
+	calcell = devm_nvmem_cell_get(dev, "calib");
+	if (IS_ERR(calcell)) {
+		if (PTR_ERR(calcell) == -EPROBE_DEFER)
+			return -EPROBE_DEFER;
+		/*
+		 * Even if the external calibration data stored in sid is
+		 * not accessible, the THS hardware can still work, although
+		 * the data won't be so accurate.
+		 *
+		 * The default value of calibration register is 0x800 for
+		 * every sensor, and the calibration value is usually 0x7xx
+		 * or 0x8xx, so they won't be away from the default value
+		 * for a lot.
+		 *
+		 * So here we do not return error if the calibartion data is
+		 * not available, except the probe needs deferring.
+		 */
+		goto out;
+	}
+
+	caldata = nvmem_cell_read(calcell, &callen);
+	if (IS_ERR(caldata)) {
+		ret = PTR_ERR(caldata);
+		goto out;
+	}
+
+	if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
+		ret = -EINVAL;
+		goto out_free;
+	}
+
+	/*
+	 * efuse layout:
+	 *
+	 *	0   11  16	 32
+	 *	+-------+-------+-------+
+	 *	|temp|  |sensor0|sensor1|
+	 *	+-------+-------+-------+
+	 *
+	 * The calibration data on the H6 is the ambient temperature and
+	 * sensor values that are filled during the factory test stage.
+	 *
+	 * The unit of stored FT temperature is 0.1 degreee celusis.
+	 * Through the stored ambient temperature and the data read
+	 * by the sensor, after a certain calculation, the calibration
+	 * value to be compensated can be obtained.
+	 */
+	ft_temp = caldata[0] & FT_TEMP_MASK;
+
+	for (i = 0; i < tmdev->chip->sensor_num; i++) {
+		int reg = (int)caldata[i + 1];
+		int sensor_temp = sun8i_ths_reg2temp(tmdev, reg);
+		int delta, cdata, calib_offest;
+
+		/*
+		 * To calculate the calibration value:
+		 *
+		 * X(in Celsius) = Ts - ft_temp
+		 * delta = X * 10000 / TEMP_TO_REG
+		 * cdata = CALIBRATE_DEFAULT - delta
+		 *
+		 * cdata: calibration value
+		 */
+		delta = (sensor_temp - ft_temp * 100) * 10 / TEMP_TO_REG;
+		cdata = CALIBRATE_DEFAULT - delta;
+		if (cdata & ~TEMP_CALIB_MASK) {
+			/*
+			 * Calibration value more than 12-bit, but calibration
+			 * register is 12-bit. In this case, ths hardware can
+			 * still work without calibration, although the data
+			 * won't be so accurate.
+			 */
+			dev_warn(dev, "sensor%d is not calibrated.\n", i);
+
+			continue;
+		}
+
+		calib_offest = tmdev->chip->temp_calib_base + (i / 2) * 0x4;
+
+		if (i % 2) {
+			int val;
+
+			regmap_read(tmdev->regmap, calib_offest, &val);
+			val = (val & TEMP_CALIB_MASK) | (cdata << 16);
+			regmap_write(tmdev->regmap, calib_offest, val);
+		} else {
+			regmap_write(tmdev->regmap, calib_offest, cdata);
+		}
+	}
+
+out_free:
+	kfree(caldata);
+out:
+	return ret;
+}
+
+static int sun8i_ths_register(struct ths_device *tmdev)
+{
+	struct thermal_zone_device *tzd;
+	int i;
+
+	for (i = 0; i < tmdev->chip->sensor_num; i++) {
+		tmdev->sensor[i].tmdev = tmdev;
+		tmdev->sensor[i].id = i;
+		tmdev->sensor[i].tzd =
+			devm_thermal_zone_of_sensor_register(tmdev->dev,
+							     i,
+							     &tmdev->sensor[i],
+							     &ths_ops);
+		if (IS_ERR(tmdev->sensor[i].tzd))
+			return PTR_ERR(tzd);
+	}
+
+	return 0;
+}
+
+static int sun8i_ths_probe(struct platform_device *pdev)
+{
+	struct ths_device *tmdev;
+	struct device *dev = &pdev->dev;
+	int i, ret;
+
+	tmdev = devm_kzalloc(dev, sizeof(*tmdev), GFP_KERNEL);
+	if (!tmdev)
+		return -ENOMEM;
+
+	tmdev->dev = dev;
+	tmdev->chip = of_device_get_match_data(&pdev->dev);
+	if (!tmdev->chip)
+		return -EINVAL;
+
+	/*
+	 * Initialize wait_queue in advance, to avoid calling wake_up
+	 * before ths is registered in isr.
+	 */
+	for (i = 0; i < tmdev->chip->sensor_num; i++)
+		init_waitqueue_head(&tmdev->sensor[i].wait_queue);
+
+	platform_set_drvdata(pdev, tmdev);
+
+	ret = sun8i_ths_resource_init(tmdev);
+	if (ret)
+		return ret;
+
+	ret = tmdev->chip->init(tmdev);
+	if (ret)
+		return ret;
+
+	ret = sun8i_ths_register(tmdev);
+	if (ret)

drivers/thermal/sun8i_thermal.c line 374

Quoted 10 lines
drivers/thermal/sun8i_thermal.c new file +10 -0
+		return ret;
+
+	return ret;
+}
+
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+	struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+	clk_disable_unprepare(tmdev->bus_clk);

I know that we discussed that already, but I'm not sure why you switch back to a regular call to regmap_init_mmio, while regmap_init_mmio_clk will take care of enabling and disabling the bus clock for you?

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#7 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Yangtao Li

Hi Yangtao,

Quoted 158 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:	Yangtao Li <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:	drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:	Maxime Ripard <[email protected]>
 M:	Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +14 -0
index 9966364a6deb..e5465053d66f 100644
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
 	  Enable this to plug the SPEAr thermal sensor driver into the Linux
 	  thermal framework.
 
+config SUN8I_THERMAL
+	tristate "Allwinner sun8i thermal driver"
+	depends on ARCH_SUNXI || COMPILE_TEST
+	depends on HAS_IOMEM
+	depends on NVMEM_SUNXI_SID
+	depends on OF
+	depends on RESET_CONTROLLER
+	help
+	  Support for the sun8i thermal sensor driver into the Linux thermal
+	  framework.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
 	tristate "Rockchip thermal driver"
 	depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y				+= broadcom/
 obj-$(CONFIG_THERMAL_MMIO)		+= thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)	+= spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)	+= rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)	+= rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)	+= rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +84 -0
new file mode 100644
index 000000000000..a9cc2197f4cb
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Thermal sensor driver for Allwinner SOC
+ * Copyright (C) 2019 Yangtao Li
+ *
+ * Based on the work of Icenowy Zheng <[email protected]>
+ * Based on the work of Ondrej Jirman <[email protected]>
+ * Based on the work of Josef Gajdusek <[email protected]>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+
+#define MAX_SENSOR_NUM	4
+
+#define FT_TEMP_MASK				GENMASK(11, 0)
+#define TEMP_CALIB_MASK				GENMASK(11, 0)
+#define TEMP_TO_REG				672
+#define CALIBRATE_DEFAULT			0x800
+
+#define SUN50I_THS_CTRL0			0x00
+#define SUN50I_H6_THS_ENABLE			0x04
+#define SUN50I_H6_THS_PC			0x08
+#define SUN50I_H6_THS_DIC			0x10
+#define SUN50I_H6_THS_DIS			0x20
+#define SUN50I_H6_THS_MFC			0x30
+#define SUN50I_H6_THS_TEMP_CALIB		0xa0
+#define SUN50I_H6_THS_TEMP_DATA			0xc0
+
+#define SUN50I_THS_CTRL0_T_ACQ(x)		((GENMASK(15, 0) & (x)) << 16)
+#define SUN50I_THS_FILTER_EN			BIT(2)
+#define SUN50I_THS_FILTER_TYPE(x)		(GENMASK(1, 0) & (x))
+#define SUN50I_H6_THS_PC_TEMP_PERIOD(x)		((GENMASK(19, 0) & (x)) << 12)
+#define SUN50I_H6_THS_DATA_IRQ_STS(x)		BIT(x)
+
+/* millidegree celsius */
+#define SUN50I_H6_FT_DEVIATION			7000
+
+struct ths_device;
+
+struct tsensor {
+	struct ths_device		*tmdev;
+	struct thermal_zone_device	*tzd;
+	int				id;
+	wait_queue_head_t		wait_queue;
+};
+
+struct ths_thermal_chip {
+	int		sensor_num;
+	int		offset;
+	int		scale;
+	int		ft_deviation;
+	int		temp_calib_base;
+	int		temp_data_base;
+	int		(*calibrate)(struct ths_device *tmdev);
+	int		(*init)(struct ths_device *tmdev);
+	irqreturn_t	(*irq_thread)(int irq, void *data);
+};
+
+struct ths_device {
+	const struct ths_thermal_chip		*chip;
+	struct device				*dev;
+	struct regmap				*regmap;
+	struct reset_control			*reset;
+	struct clk				*bus_clk;
+	struct tsensor				sensor[MAX_SENSOR_NUM];
+	int					data_ready;
+};
+
+/* Temp Unit: millidegree Celsius */
+static int sun8i_ths_reg2temp(struct ths_device *tmdev,
+			      int reg)
+{
+	return (reg + tmdev->chip->offset) * tmdev->chip->scale;

drivers/thermal/sun8i_thermal.c line 94

Quoted 10 lines
drivers/thermal/sun8i_thermal.c new file +10 -0
+}
+
+static int sun8i_ths_get_temp(void *data, int *temp)
+{
+	struct tsensor *s = data;
+	struct ths_device *tmdev = s->tmdev;
+	int val;
+
+	wait_event(s->wait_queue, tmdev->data_ready & BIT(s->id));
+	tmdev->data_ready &= ~BIT(s->id);

I've looked at thermal_core.c and it looks like that the proper way to handle this situation is just returning -EAGAIN.

See update_temperature() function in thermal_core.c.

That will suppress the warning about failure to read thermal zone. Also it's much simpler than this wait_queue stuff. No other thermal driver uses this either. Also get_temp is called under thermal_list_lock mutex and that would block cooling device registrations and god knows what else.

Other than that, and what Maxime said, I don't see any more issues.

thank you,

	o.
Quoted 350 lines
drivers/thermal/sun8i_thermal.c new file +342 -0
+	regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
+		    0x4 * s->id, &val);
+
+	*temp = sun8i_ths_reg2temp(tmdev, val);
+	/*
+	 * XX - According to the original sdk, there are some platforms(rarely)
+	 * that add a fixed offset value after calculating the temperature
+	 * value. We can't simply put it on the formula for calculating the
+	 * temperature above, because the formula for calculating the
+	 * temperature above is also used when the sensor is calibrated. If
+	 * do this, the correct calibration formula is hard to know.
+	 */
+	if (tmdev->chip->ft_deviation)
+		*temp += tmdev->chip->ft_deviation;
+
+	return 0;
+}
+
+static const struct thermal_zone_of_device_ops ths_ops = {
+	.get_temp = sun8i_ths_get_temp,
+};
+
+static const struct regmap_config config = {
+	.reg_bits = 32,
+	.val_bits = 32,
+	.reg_stride = 4,
+	.fast_io = true,
+};
+
+static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+{
+	wait_queue_head_t *data_wait;
+	struct ths_device *tmdev = data;
+	int i, state;
+
+	regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
+
+	for (i = 0; i < tmdev->chip->sensor_num; i++) {
+		data_wait = &tmdev->sensor[i].wait_queue;
+
+		if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
+			/* clear data irq pending */
+			regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
+				     SUN50I_H6_THS_DATA_IRQ_STS(i));
+
+			tmdev->data_ready |= BIT(i);
+			wake_up(data_wait);
+		}
+	}
+
+	return IRQ_HANDLED;
+}
+
+static int sun8i_ths_resource_init(struct ths_device *tmdev)
+{
+	struct device *dev = tmdev->dev;
+	struct platform_device *pdev = to_platform_device(dev);
+	struct resource *mem;
+	void __iomem *base;
+	int ret, irq;
+
+	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	base = devm_ioremap_resource(dev, mem);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
+
+	tmdev->regmap = devm_regmap_init_mmio(dev, base, &config);
+	if (IS_ERR(tmdev->regmap))
+		return PTR_ERR(tmdev->regmap);
+
+	tmdev->reset = devm_reset_control_get(dev, 0);
+	if (IS_ERR(tmdev->reset))
+		return PTR_ERR(tmdev->reset);
+
+	tmdev->bus_clk = devm_clk_get(&pdev->dev, "bus");
+	if (IS_ERR(tmdev->bus_clk))
+		return PTR_ERR(tmdev->bus_clk);
+
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0)
+		return irq;
+
+	ret = devm_request_threaded_irq(dev, irq, NULL,
+					tmdev->chip->irq_thread,
+					IRQF_ONESHOT, "ths", tmdev);
+	if (ret)
+		return ret;
+
+	ret = reset_control_deassert(tmdev->reset);
+	if (ret)
+		return ret;
+
+	ret = clk_prepare_enable(tmdev->bus_clk);
+	if (ret)
+		goto assert_reset;
+
+	ret = tmdev->chip->calibrate(tmdev);
+	if (ret)
+		goto bus_disable;
+
+	return 0;
+
+bus_disable:
+	clk_disable_unprepare(tmdev->bus_clk);
+assert_reset:
+	reset_control_assert(tmdev->reset);
+
+	return ret;
+}
+
+static int sun50i_ths_calibrate(struct ths_device *tmdev)
+{
+	struct nvmem_cell *calcell;
+	struct device *dev = tmdev->dev;
+	u16 *caldata;
+	size_t callen;
+	int ft_temp;
+	int i, ret = 0;
+
+	calcell = devm_nvmem_cell_get(dev, "calib");
+	if (IS_ERR(calcell)) {
+		if (PTR_ERR(calcell) == -EPROBE_DEFER)
+			return -EPROBE_DEFER;
+		/*
+		 * Even if the external calibration data stored in sid is
+		 * not accessible, the THS hardware can still work, although
+		 * the data won't be so accurate.
+		 *
+		 * The default value of calibration register is 0x800 for
+		 * every sensor, and the calibration value is usually 0x7xx
+		 * or 0x8xx, so they won't be away from the default value
+		 * for a lot.
+		 *
+		 * So here we do not return error if the calibartion data is
+		 * not available, except the probe needs deferring.
+		 */
+		goto out;
+	}
+
+	caldata = nvmem_cell_read(calcell, &callen);
+	if (IS_ERR(caldata)) {
+		ret = PTR_ERR(caldata);
+		goto out;
+	}
+
+	if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
+		ret = -EINVAL;
+		goto out_free;
+	}
+
+	/*
+	 * efuse layout:
+	 *
+	 *	0   11  16	 32
+	 *	+-------+-------+-------+
+	 *	|temp|  |sensor0|sensor1|
+	 *	+-------+-------+-------+
+	 *
+	 * The calibration data on the H6 is the ambient temperature and
+	 * sensor values that are filled during the factory test stage.
+	 *
+	 * The unit of stored FT temperature is 0.1 degreee celusis.
+	 * Through the stored ambient temperature and the data read
+	 * by the sensor, after a certain calculation, the calibration
+	 * value to be compensated can be obtained.
+	 */
+	ft_temp = caldata[0] & FT_TEMP_MASK;
+
+	for (i = 0; i < tmdev->chip->sensor_num; i++) {
+		int reg = (int)caldata[i + 1];
+		int sensor_temp = sun8i_ths_reg2temp(tmdev, reg);
+		int delta, cdata, calib_offest;
+
+		/*
+		 * To calculate the calibration value:
+		 *
+		 * X(in Celsius) = Ts - ft_temp
+		 * delta = X * 10000 / TEMP_TO_REG
+		 * cdata = CALIBRATE_DEFAULT - delta
+		 *
+		 * cdata: calibration value
+		 */
+		delta = (sensor_temp - ft_temp * 100) * 10 / TEMP_TO_REG;
+		cdata = CALIBRATE_DEFAULT - delta;
+		if (cdata & ~TEMP_CALIB_MASK) {
+			/*
+			 * Calibration value more than 12-bit, but calibration
+			 * register is 12-bit. In this case, ths hardware can
+			 * still work without calibration, although the data
+			 * won't be so accurate.
+			 */
+			dev_warn(dev, "sensor%d is not calibrated.\n", i);
+
+			continue;
+		}
+
+		calib_offest = tmdev->chip->temp_calib_base + (i / 2) * 0x4;
+
+		if (i % 2) {
+			int val;
+
+			regmap_read(tmdev->regmap, calib_offest, &val);
+			val = (val & TEMP_CALIB_MASK) | (cdata << 16);
+			regmap_write(tmdev->regmap, calib_offest, val);
+		} else {
+			regmap_write(tmdev->regmap, calib_offest, cdata);
+		}
+	}
+
+out_free:
+	kfree(caldata);
+out:
+	return ret;
+}
+
+static int sun8i_ths_register(struct ths_device *tmdev)
+{
+	struct thermal_zone_device *tzd;
+	int i;
+
+	for (i = 0; i < tmdev->chip->sensor_num; i++) {
+		tmdev->sensor[i].tmdev = tmdev;
+		tmdev->sensor[i].id = i;
+		tmdev->sensor[i].tzd =
+			devm_thermal_zone_of_sensor_register(tmdev->dev,
+							     i,
+							     &tmdev->sensor[i],
+							     &ths_ops);
+		if (IS_ERR(tmdev->sensor[i].tzd))
+			return PTR_ERR(tzd);
+	}
+
+	return 0;
+}
+
+static int sun8i_ths_probe(struct platform_device *pdev)
+{
+	struct ths_device *tmdev;
+	struct device *dev = &pdev->dev;
+	int i, ret;
+
+	tmdev = devm_kzalloc(dev, sizeof(*tmdev), GFP_KERNEL);
+	if (!tmdev)
+		return -ENOMEM;
+
+	tmdev->dev = dev;
+	tmdev->chip = of_device_get_match_data(&pdev->dev);
+	if (!tmdev->chip)
+		return -EINVAL;
+
+	/*
+	 * Initialize wait_queue in advance, to avoid calling wake_up
+	 * before ths is registered in isr.
+	 */
+	for (i = 0; i < tmdev->chip->sensor_num; i++)
+		init_waitqueue_head(&tmdev->sensor[i].wait_queue);
+
+	platform_set_drvdata(pdev, tmdev);
+
+	ret = sun8i_ths_resource_init(tmdev);
+	if (ret)
+		return ret;
+
+	ret = tmdev->chip->init(tmdev);
+	if (ret)
+		return ret;
+
+	ret = sun8i_ths_register(tmdev);
+	if (ret)
+		return ret;
+
+	return ret;
+}
+
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+	struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+	clk_disable_unprepare(tmdev->bus_clk);
+	reset_control_assert(tmdev->reset);
+
+	return 0;
+}
+
+static int sun50i_thermal_init(struct ths_device *tmdev)
+{
+	int val;
+
+	/*
+	 * clkin = 24MHz
+	 * T acquire = clkin / (x + 1)
+	 *           = 20us
+	 */
+	regmap_write(tmdev->regmap, SUN50I_THS_CTRL0,
+		     SUN50I_THS_CTRL0_T_ACQ(479));
+	/* average over 4 samples */
+	regmap_write(tmdev->regmap, SUN50I_H6_THS_MFC,
+		     SUN50I_THS_FILTER_EN |
+		     SUN50I_THS_FILTER_TYPE(1));
+	/* period = (x + 1) * 4096 / clkin; ~10ms */
+	regmap_write(tmdev->regmap, SUN50I_H6_THS_PC,
+		     SUN50I_H6_THS_PC_TEMP_PERIOD(58));
+	/* enable sensor */
+	val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+	regmap_write(tmdev->regmap, SUN50I_H6_THS_ENABLE, val);
+	/* thermal data interrupt enable */
+	val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+	regmap_write(tmdev->regmap, SUN50I_H6_THS_DIC, val);
+
+	return 0;
+}
+
+static const struct ths_thermal_chip sun50i_h6_ths = {
+	.sensor_num = 2,
+	.offset = -2794,
+	.scale = -67,
+	.ft_deviation = SUN50I_H6_FT_DEVIATION,
+	.temp_calib_base = SUN50I_H6_THS_TEMP_CALIB,
+	.temp_data_base = SUN50I_H6_THS_TEMP_DATA,
+	.calibrate = sun50i_ths_calibrate,
+	.init = sun50i_thermal_init,
+	.irq_thread = sun50i_h6_irq_thread,
+};
+
+static const struct of_device_id of_ths_match[] = {
+	{ .compatible = "allwinner,sun50i-h6-ths", .data = &sun50i_h6_ths },
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, of_ths_match);
+
+static struct platform_driver ths_driver = {
+	.probe = sun8i_ths_probe,
+	.remove = sun8i_ths_remove,
+	.driver = {
+		.name = "sun8i-thermal",
+		.of_match_table = of_ths_match,
+	},
+};
+module_platform_driver(ths_driver);
+
+MODULE_DESCRIPTION("Thermal sensor driver for Allwinner SOC");
+MODULE_LICENSE("GPL v2");
Signature · 7 lines
2.17.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#3 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Maxime Ripard
Quoted 268 lines · Maxime Ripard

Hi!

Thanks for submitting a new version

Quoted 36 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L:       [email protected]
 S:   Maintained
 F:   drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:   Yangtao Li <[email protected]>
+L:   [email protected]
+S:   Maintained
+F:   Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:   drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:   Maxime Ripard <[email protected]>
 M:   Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +0 -0
index 9966364a6deb..e5465053d66f 100644

drivers/thermal/Kconfig config SPEAR_THERMAL · line 269

Quoted 8 lines
drivers/thermal/Kconfig +5 -0
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
        Enable this to plug the SPEAr thermal sensor driver into the Linux
        thermal framework.
 
+config SUN8I_THERMAL
+     tristate "Allwinner sun8i thermal driver"
+     depends on ARCH_SUNXI || COMPILE_TEST
+     depends on HAS_IOMEM
+     depends on NVMEM_SUNXI_SID

Do you? It looks from your binding as if it's optional. Also, it's pretty uncommon to depend on a given driver, usually you'll want to depend on the framework instead.

Quoted 88 lines
drivers/thermal/Kconfig +9 -0
+     depends on OF
+     depends on RESET_CONTROLLER
+     help
+       Support for the sun8i thermal sensor driver into the Linux thermal
+       framework.
+
+       To compile this driver as a module, choose M here: the
+       module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
      tristate "Rockchip thermal driver"
      depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y                                += broadcom/
 obj-$(CONFIG_THERMAL_MMIO)           += thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)  += spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)       += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)   += rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)      += rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +58 -0
new file mode 100644
index 000000000000..a9cc2197f4cb
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Thermal sensor driver for Allwinner SOC
+ * Copyright (C) 2019 Yangtao Li
+ *
+ * Based on the work of Icenowy Zheng <[email protected]>
+ * Based on the work of Ondrej Jirman <[email protected]>
+ * Based on the work of Josef Gajdusek <[email protected]>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+
+#define MAX_SENSOR_NUM       4
+
+#define FT_TEMP_MASK                         GENMASK(11, 0)
+#define TEMP_CALIB_MASK                              GENMASK(11, 0)
+#define TEMP_TO_REG                          672
+#define CALIBRATE_DEFAULT                    0x800
+
+#define SUN50I_THS_CTRL0                     0x00
+#define SUN50I_H6_THS_ENABLE                 0x04
+#define SUN50I_H6_THS_PC                     0x08
+#define SUN50I_H6_THS_DIC                    0x10
+#define SUN50I_H6_THS_DIS                    0x20
+#define SUN50I_H6_THS_MFC                    0x30
+#define SUN50I_H6_THS_TEMP_CALIB             0xa0
+#define SUN50I_H6_THS_TEMP_DATA                      0xc0
+
+#define SUN50I_THS_CTRL0_T_ACQ(x)            ((GENMASK(15, 0) & (x)) << 16)
+#define SUN50I_THS_FILTER_EN                 BIT(2)
+#define SUN50I_THS_FILTER_TYPE(x)            (GENMASK(1, 0) & (x))
+#define SUN50I_H6_THS_PC_TEMP_PERIOD(x)              ((GENMASK(19, 0) & (x)) << 12)
+#define SUN50I_H6_THS_DATA_IRQ_STS(x)                BIT(x)
+
+/* millidegree celsius */
+#define SUN50I_H6_FT_DEVIATION                       7000
+
+struct ths_device;
+
+struct tsensor {
+     struct ths_device               *tmdev;
+     struct thermal_zone_device      *tzd;
+     int                             id;
+     wait_queue_head_t               wait_queue;
+};
+
+struct ths_thermal_chip {

drivers/thermal/sun8i_thermal.c line 68

Quoted 10 lines
drivers/thermal/sun8i_thermal.c new file +10 -0
+     int             sensor_num;
+     int             offset;
+     int             scale;
+     int             ft_deviation;
+     int             temp_calib_base;
+     int             temp_data_base;
+     int             (*calibrate)(struct ths_device *tmdev);
+     int             (*init)(struct ths_device *tmdev);
+     irqreturn_t     (*irq_thread)(int irq, void *data);
+};

Again, you should remove these quirks structure at the moment and only deal with the H6.

Quoted 55 lines
drivers/thermal/sun8i_thermal.c new file +55 -0
+struct ths_device {
+     const struct ths_thermal_chip           *chip;
+     struct device                           *dev;
+     struct regmap                           *regmap;
+     struct reset_control                    *reset;
+     struct clk                              *bus_clk;
+     struct tsensor                          sensor[MAX_SENSOR_NUM];
+     int                                     data_ready;
+};
+
+/* Temp Unit: millidegree Celsius */
+static int sun8i_ths_reg2temp(struct ths_device *tmdev,
+                           int reg)
+{
+     return (reg + tmdev->chip->offset) * tmdev->chip->scale;
+}
+
+static int sun8i_ths_get_temp(void *data, int *temp)
+{
+     struct tsensor *s = data;
+     struct ths_device *tmdev = s->tmdev;
+     int val;
+
+     wait_event(s->wait_queue, tmdev->data_ready & BIT(s->id));
+     tmdev->data_ready &= ~BIT(s->id);
+
+     regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
+                 0x4 * s->id, &val);
+
+     *temp = sun8i_ths_reg2temp(tmdev, val);
+     /*
+      * XX - According to the original sdk, there are some platforms(rarely)
+      * that add a fixed offset value after calculating the temperature
+      * value. We can't simply put it on the formula for calculating the
+      * temperature above, because the formula for calculating the
+      * temperature above is also used when the sensor is calibrated. If
+      * do this, the correct calibration formula is hard to know.
+      */
+     if (tmdev->chip->ft_deviation)
+             *temp += tmdev->chip->ft_deviation;
+
+     return 0;
+}
+
+static const struct thermal_zone_of_device_ops ths_ops = {
+     .get_temp = sun8i_ths_get_temp,
+};
+
+static const struct regmap_config config = {
+     .reg_bits = 32,
+     .val_bits = 32,
+     .reg_stride = 4,
+     .fast_io = true,
+};
+

drivers/thermal/sun8i_thermal.c line 134

Quoted 10 lines
drivers/thermal/sun8i_thermal.c new file +10 -0
+static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+{
+     wait_queue_head_t *data_wait;
+     struct ths_device *tmdev = data;
+     int i, state;
+
+     regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             data_wait = &tmdev->sensor[i].wait_queue;

You're only using data_wait in that scope, so you should define it here.

Quoted 42 lines
drivers/thermal/sun8i_thermal.c new file +42 -0
+
+             if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
+                     /* clear data irq pending */
+                     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
+                                  SUN50I_H6_THS_DATA_IRQ_STS(i));
+
+                     tmdev->data_ready |= BIT(i);
+                     wake_up(data_wait);
+             }
+     }
+
+     return IRQ_HANDLED;
+}
+
+static int sun8i_ths_resource_init(struct ths_device *tmdev)
+{
+     struct device *dev = tmdev->dev;
+     struct platform_device *pdev = to_platform_device(dev);
+     struct resource *mem;
+     void __iomem *base;
+     int ret, irq;
+
+     mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+     base = devm_ioremap_resource(dev, mem);
+     if (IS_ERR(base))
+             return PTR_ERR(base);
+
+     tmdev->regmap = devm_regmap_init_mmio(dev, base, &config);
+     if (IS_ERR(tmdev->regmap))
+             return PTR_ERR(tmdev->regmap);
+
+     tmdev->reset = devm_reset_control_get(dev, 0);
+     if (IS_ERR(tmdev->reset))
+             return PTR_ERR(tmdev->reset);
+
+     tmdev->bus_clk = devm_clk_get(&pdev->dev, "bus");
+     if (IS_ERR(tmdev->bus_clk))
+             return PTR_ERR(tmdev->bus_clk);
+
+     irq = platform_get_irq(pdev, 0);
+     if (irq < 0)
+             return irq;
Quoted 8 lines

drivers/thermal/sun8i_thermal.c line 182

Quoted 6 lines
drivers/thermal/sun8i_thermal.c new file +6 -0
+
+     ret = devm_request_threaded_irq(dev, irq, NULL,
+                                     tmdev->chip->irq_thread,
+                                     IRQF_ONESHOT, "ths", tmdev);
+     if (ret)
+             return ret;

Is there any particular reason to use a threaded interrupt?

Just to improve real-time.

Quoted 196 lines

Also, starting from here you can start having interrupts...

drivers/thermal/sun8i_thermal.c line 194

Quoted 12 lines
drivers/thermal/sun8i_thermal.c new file +12 -0
+
+     ret = reset_control_deassert(tmdev->reset);
+     if (ret)
+             return ret;
+
+     ret = clk_prepare_enable(tmdev->bus_clk);
+     if (ret)
+             goto assert_reset;
+
+     ret = tmdev->chip->calibrate(tmdev);
+     if (ret)
+             goto bus_disable;

While the device hasn't been properly initialized yet. Especially when held in reset, some Allwinner controllers has been known to send spurious interrupts, so we want to defer that to the very last minute (so right before your call to sun8i_ths_register).

Quoted 175 lines
drivers/thermal/sun8i_thermal.c new file +175 -0
+     return 0;
+
+bus_disable:
+     clk_disable_unprepare(tmdev->bus_clk);
+assert_reset:
+     reset_control_assert(tmdev->reset);
+
+     return ret;
+}
+
+static int sun50i_ths_calibrate(struct ths_device *tmdev)
+{
+     struct nvmem_cell *calcell;
+     struct device *dev = tmdev->dev;
+     u16 *caldata;
+     size_t callen;
+     int ft_temp;
+     int i, ret = 0;
+
+     calcell = devm_nvmem_cell_get(dev, "calib");
+     if (IS_ERR(calcell)) {
+             if (PTR_ERR(calcell) == -EPROBE_DEFER)
+                     return -EPROBE_DEFER;
+             /*
+              * Even if the external calibration data stored in sid is
+              * not accessible, the THS hardware can still work, although
+              * the data won't be so accurate.
+              *
+              * The default value of calibration register is 0x800 for
+              * every sensor, and the calibration value is usually 0x7xx
+              * or 0x8xx, so they won't be away from the default value
+              * for a lot.
+              *
+              * So here we do not return error if the calibartion data is
+              * not available, except the probe needs deferring.
+              */
+             goto out;
+     }
+
+     caldata = nvmem_cell_read(calcell, &callen);
+     if (IS_ERR(caldata)) {
+             ret = PTR_ERR(caldata);
+             goto out;
+     }
+
+     if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
+             ret = -EINVAL;
+             goto out_free;
+     }
+
+     /*
+      * efuse layout:
+      *
+      *      0   11  16       32
+      *      +-------+-------+-------+
+      *      |temp|  |sensor0|sensor1|
+      *      +-------+-------+-------+
+      *
+      * The calibration data on the H6 is the ambient temperature and
+      * sensor values that are filled during the factory test stage.
+      *
+      * The unit of stored FT temperature is 0.1 degreee celusis.
+      * Through the stored ambient temperature and the data read
+      * by the sensor, after a certain calculation, the calibration
+      * value to be compensated can be obtained.
+      */
+     ft_temp = caldata[0] & FT_TEMP_MASK;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             int reg = (int)caldata[i + 1];
+             int sensor_temp = sun8i_ths_reg2temp(tmdev, reg);
+             int delta, cdata, calib_offest;
+
+             /*
+              * To calculate the calibration value:
+              *
+              * X(in Celsius) = Ts - ft_temp
+              * delta = X * 10000 / TEMP_TO_REG
+              * cdata = CALIBRATE_DEFAULT - delta
+              *
+              * cdata: calibration value
+              */
+             delta = (sensor_temp - ft_temp * 100) * 10 / TEMP_TO_REG;
+             cdata = CALIBRATE_DEFAULT - delta;
+             if (cdata & ~TEMP_CALIB_MASK) {
+                     /*
+                      * Calibration value more than 12-bit, but calibration
+                      * register is 12-bit. In this case, ths hardware can
+                      * still work without calibration, although the data
+                      * won't be so accurate.
+                      */
+                     dev_warn(dev, "sensor%d is not calibrated.\n", i);
+
+                     continue;
+             }
+
+             calib_offest = tmdev->chip->temp_calib_base + (i / 2) * 0x4;
+
+             if (i % 2) {
+                     int val;
+
+                     regmap_read(tmdev->regmap, calib_offest, &val);
+                     val = (val & TEMP_CALIB_MASK) | (cdata << 16);
+                     regmap_write(tmdev->regmap, calib_offest, val);
+             } else {
+                     regmap_write(tmdev->regmap, calib_offest, cdata);
+             }
+     }
+
+out_free:
+     kfree(caldata);
+out:
+     return ret;
+}
+
+static int sun8i_ths_register(struct ths_device *tmdev)
+{
+     struct thermal_zone_device *tzd;
+     int i;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             tmdev->sensor[i].tmdev = tmdev;
+             tmdev->sensor[i].id = i;
+             tmdev->sensor[i].tzd =
+                     devm_thermal_zone_of_sensor_register(tmdev->dev,
+                                                          i,
+                                                          &tmdev->sensor[i],
+                                                          &ths_ops);
+             if (IS_ERR(tmdev->sensor[i].tzd))
+                     return PTR_ERR(tzd);
+     }
+
+     return 0;
+}
+
+static int sun8i_ths_probe(struct platform_device *pdev)
+{
+     struct ths_device *tmdev;
+     struct device *dev = &pdev->dev;
+     int i, ret;
+
+     tmdev = devm_kzalloc(dev, sizeof(*tmdev), GFP_KERNEL);
+     if (!tmdev)
+             return -ENOMEM;
+
+     tmdev->dev = dev;
+     tmdev->chip = of_device_get_match_data(&pdev->dev);
+     if (!tmdev->chip)
+             return -EINVAL;
+
+     /*
+      * Initialize wait_queue in advance, to avoid calling wake_up
+      * before ths is registered in isr.
+      */
+     for (i = 0; i < tmdev->chip->sensor_num; i++)
+             init_waitqueue_head(&tmdev->sensor[i].wait_queue);
+
+     platform_set_drvdata(pdev, tmdev);
+
+     ret = sun8i_ths_resource_init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = tmdev->chip->init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = sun8i_ths_register(tmdev);
+     if (ret)
+             return ret;
+
+     return ret;
+}
+
+static int sun8i_ths_remove(struct platform_device *pdev)
Quoted 8 lines

drivers/thermal/sun8i_thermal.c line 374

Quoted 4 lines
drivers/thermal/sun8i_thermal.c new file +4 -0
+{
+     struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+     clk_disable_unprepare(tmdev->bus_clk);

I know that we discussed that already, but I'm not sure why you switch back to a regular call to regmap_init_mmio, while regmap_init_mmio_clk will take care of enabling and disabling the bus clock for you?

It seems that regmap_init_mmio_clk just get clk and prepare clk but no enable.

Yangtao

Quoted 7 lines

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

author maintainer
#8 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Ondřej Jirman

HI Ondřej,

Quoted 167 lines · Ondřej Jirman

Hi Yangtao,

Quoted 163 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L:       [email protected]
 S:   Maintained
 F:   drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:   Yangtao Li <[email protected]>
+L:   [email protected]
+S:   Maintained
+F:   Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:   drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:   Maxime Ripard <[email protected]>
 M:   Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +14 -0
index 9966364a6deb..e5465053d66f 100644
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
        Enable this to plug the SPEAr thermal sensor driver into the Linux
        thermal framework.
 
+config SUN8I_THERMAL
+     tristate "Allwinner sun8i thermal driver"
+     depends on ARCH_SUNXI || COMPILE_TEST
+     depends on HAS_IOMEM
+     depends on NVMEM_SUNXI_SID
+     depends on OF
+     depends on RESET_CONTROLLER
+     help
+       Support for the sun8i thermal sensor driver into the Linux thermal
+       framework.
+
+       To compile this driver as a module, choose M here: the
+       module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
      tristate "Rockchip thermal driver"
      depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y                                += broadcom/
 obj-$(CONFIG_THERMAL_MMIO)           += thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)  += spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)       += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)   += rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)      += rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +89 -0
new file mode 100644
index 000000000000..a9cc2197f4cb
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Thermal sensor driver for Allwinner SOC
+ * Copyright (C) 2019 Yangtao Li
+ *
+ * Based on the work of Icenowy Zheng <[email protected]>
+ * Based on the work of Ondrej Jirman <[email protected]>
+ * Based on the work of Josef Gajdusek <[email protected]>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+
+#define MAX_SENSOR_NUM       4
+
+#define FT_TEMP_MASK                         GENMASK(11, 0)
+#define TEMP_CALIB_MASK                              GENMASK(11, 0)
+#define TEMP_TO_REG                          672
+#define CALIBRATE_DEFAULT                    0x800
+
+#define SUN50I_THS_CTRL0                     0x00
+#define SUN50I_H6_THS_ENABLE                 0x04
+#define SUN50I_H6_THS_PC                     0x08
+#define SUN50I_H6_THS_DIC                    0x10
+#define SUN50I_H6_THS_DIS                    0x20
+#define SUN50I_H6_THS_MFC                    0x30
+#define SUN50I_H6_THS_TEMP_CALIB             0xa0
+#define SUN50I_H6_THS_TEMP_DATA                      0xc0
+
+#define SUN50I_THS_CTRL0_T_ACQ(x)            ((GENMASK(15, 0) & (x)) << 16)
+#define SUN50I_THS_FILTER_EN                 BIT(2)
+#define SUN50I_THS_FILTER_TYPE(x)            (GENMASK(1, 0) & (x))
+#define SUN50I_H6_THS_PC_TEMP_PERIOD(x)              ((GENMASK(19, 0) & (x)) << 12)
+#define SUN50I_H6_THS_DATA_IRQ_STS(x)                BIT(x)
+
+/* millidegree celsius */
+#define SUN50I_H6_FT_DEVIATION                       7000
+
+struct ths_device;
+
+struct tsensor {
+     struct ths_device               *tmdev;
+     struct thermal_zone_device      *tzd;
+     int                             id;
+     wait_queue_head_t               wait_queue;
+};
+
+struct ths_thermal_chip {
+     int             sensor_num;
+     int             offset;
+     int             scale;
+     int             ft_deviation;
+     int             temp_calib_base;
+     int             temp_data_base;
+     int             (*calibrate)(struct ths_device *tmdev);
+     int             (*init)(struct ths_device *tmdev);
+     irqreturn_t     (*irq_thread)(int irq, void *data);
+};
+
+struct ths_device {
+     const struct ths_thermal_chip           *chip;
+     struct device                           *dev;
+     struct regmap                           *regmap;
+     struct reset_control                    *reset;
+     struct clk                              *bus_clk;
+     struct tsensor                          sensor[MAX_SENSOR_NUM];
+     int                                     data_ready;
+};
+
+/* Temp Unit: millidegree Celsius */
+static int sun8i_ths_reg2temp(struct ths_device *tmdev,
+                           int reg)
+{
+     return (reg + tmdev->chip->offset) * tmdev->chip->scale;
+}
+
+static int sun8i_ths_get_temp(void *data, int *temp)
+{
+     struct tsensor *s = data;
Quoted 8 lines

drivers/thermal/sun8i_thermal.c line 94

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+     struct ths_device *tmdev = s->tmdev;
+     int val;
+
+     wait_event(s->wait_queue, tmdev->data_ready & BIT(s->id));
+     tmdev->data_ready &= ~BIT(s->id);

I've looked at thermal_core.c and it looks like that the proper way to handle this situation is just returning -EAGAIN.

What we are doing now is to turn it into an interrupt-based program. Every time we use temperature data, we need to wait until new data is collected.

Quoted 7 lines

See update_temperature() function in thermal_core.c.

That will suppress the warning about failure to read thermal zone. Also it's much simpler than this wait_queue stuff. No other thermal driver uses this either. Also get_temp is called under thermal_list_lock mutex and that would block cooling device registrations and god knows what else.

Since there is no valid temperature data, it cannot be blocked.

MBR,
Yangtao

Quoted 356 lines

Other than that, and what Maxime said, I don't see any more issues.

thank you,

        o.
Quoted 350 lines
drivers/thermal/sun8i_thermal.c new file +342 -1
+     regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
+                 0x4 * s->id, &val);
+
+     *temp = sun8i_ths_reg2temp(tmdev, val);
+     /*
+      * XX - According to the original sdk, there are some platforms(rarely)
+      * that add a fixed offset value after calculating the temperature
+      * value. We can't simply put it on the formula for calculating the
+      * temperature above, because the formula for calculating the
+      * temperature above is also used when the sensor is calibrated. If
+      * do this, the correct calibration formula is hard to know.
+      */
+     if (tmdev->chip->ft_deviation)
+             *temp += tmdev->chip->ft_deviation;
+
+     return 0;
+}
+
+static const struct thermal_zone_of_device_ops ths_ops = {
+     .get_temp = sun8i_ths_get_temp,
+};
+
+static const struct regmap_config config = {
+     .reg_bits = 32,
+     .val_bits = 32,
+     .reg_stride = 4,
+     .fast_io = true,
+};
+
+static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+{
+     wait_queue_head_t *data_wait;
+     struct ths_device *tmdev = data;
+     int i, state;
+
+     regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             data_wait = &tmdev->sensor[i].wait_queue;
+
+             if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
+                     /* clear data irq pending */
+                     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
+                                  SUN50I_H6_THS_DATA_IRQ_STS(i));
+
+                     tmdev->data_ready |= BIT(i);
+                     wake_up(data_wait);
+             }
+     }
+
+     return IRQ_HANDLED;
+}
+
+static int sun8i_ths_resource_init(struct ths_device *tmdev)
+{
+     struct device *dev = tmdev->dev;
+     struct platform_device *pdev = to_platform_device(dev);
+     struct resource *mem;
+     void __iomem *base;
+     int ret, irq;
+
+     mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+     base = devm_ioremap_resource(dev, mem);
+     if (IS_ERR(base))
+             return PTR_ERR(base);
+
+     tmdev->regmap = devm_regmap_init_mmio(dev, base, &config);
+     if (IS_ERR(tmdev->regmap))
+             return PTR_ERR(tmdev->regmap);
+
+     tmdev->reset = devm_reset_control_get(dev, 0);
+     if (IS_ERR(tmdev->reset))
+             return PTR_ERR(tmdev->reset);
+
+     tmdev->bus_clk = devm_clk_get(&pdev->dev, "bus");
+     if (IS_ERR(tmdev->bus_clk))
+             return PTR_ERR(tmdev->bus_clk);
+
+     irq = platform_get_irq(pdev, 0);
+     if (irq < 0)
+             return irq;
+
+     ret = devm_request_threaded_irq(dev, irq, NULL,
+                                     tmdev->chip->irq_thread,
+                                     IRQF_ONESHOT, "ths", tmdev);
+     if (ret)
+             return ret;
+
+     ret = reset_control_deassert(tmdev->reset);
+     if (ret)
+             return ret;
+
+     ret = clk_prepare_enable(tmdev->bus_clk);
+     if (ret)
+             goto assert_reset;
+
+     ret = tmdev->chip->calibrate(tmdev);
+     if (ret)
+             goto bus_disable;
+
+     return 0;
+
+bus_disable:
+     clk_disable_unprepare(tmdev->bus_clk);
+assert_reset:
+     reset_control_assert(tmdev->reset);
+
+     return ret;
+}
+
+static int sun50i_ths_calibrate(struct ths_device *tmdev)
+{
+     struct nvmem_cell *calcell;
+     struct device *dev = tmdev->dev;
+     u16 *caldata;
+     size_t callen;
+     int ft_temp;
+     int i, ret = 0;
+
+     calcell = devm_nvmem_cell_get(dev, "calib");
+     if (IS_ERR(calcell)) {
+             if (PTR_ERR(calcell) == -EPROBE_DEFER)
+                     return -EPROBE_DEFER;
+             /*
+              * Even if the external calibration data stored in sid is
+              * not accessible, the THS hardware can still work, although
+              * the data won't be so accurate.
+              *
+              * The default value of calibration register is 0x800 for
+              * every sensor, and the calibration value is usually 0x7xx
+              * or 0x8xx, so they won't be away from the default value
+              * for a lot.
+              *
+              * So here we do not return error if the calibartion data is
+              * not available, except the probe needs deferring.
+              */
+             goto out;
+     }
+
+     caldata = nvmem_cell_read(calcell, &callen);
+     if (IS_ERR(caldata)) {
+             ret = PTR_ERR(caldata);
+             goto out;
+     }
+
+     if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
+             ret = -EINVAL;
+             goto out_free;
+     }
+
+     /*
+      * efuse layout:
+      *
+      *      0   11  16       32
+      *      +-------+-------+-------+
+      *      |temp|  |sensor0|sensor1|
+      *      +-------+-------+-------+
+      *
+      * The calibration data on the H6 is the ambient temperature and
+      * sensor values that are filled during the factory test stage.
+      *
+      * The unit of stored FT temperature is 0.1 degreee celusis.
+      * Through the stored ambient temperature and the data read
+      * by the sensor, after a certain calculation, the calibration
+      * value to be compensated can be obtained.
+      */
+     ft_temp = caldata[0] & FT_TEMP_MASK;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             int reg = (int)caldata[i + 1];
+             int sensor_temp = sun8i_ths_reg2temp(tmdev, reg);
+             int delta, cdata, calib_offest;
+
+             /*
+              * To calculate the calibration value:
+              *
+              * X(in Celsius) = Ts - ft_temp
+              * delta = X * 10000 / TEMP_TO_REG
+              * cdata = CALIBRATE_DEFAULT - delta
+              *
+              * cdata: calibration value
+              */
+             delta = (sensor_temp - ft_temp * 100) * 10 / TEMP_TO_REG;
+             cdata = CALIBRATE_DEFAULT - delta;
+             if (cdata & ~TEMP_CALIB_MASK) {
+                     /*
+                      * Calibration value more than 12-bit, but calibration
+                      * register is 12-bit. In this case, ths hardware can
+                      * still work without calibration, although the data
+                      * won't be so accurate.
+                      */
+                     dev_warn(dev, "sensor%d is not calibrated.\n", i);
+
+                     continue;
+             }
+
+             calib_offest = tmdev->chip->temp_calib_base + (i / 2) * 0x4;
+
+             if (i % 2) {
+                     int val;
+
+                     regmap_read(tmdev->regmap, calib_offest, &val);
+                     val = (val & TEMP_CALIB_MASK) | (cdata << 16);
+                     regmap_write(tmdev->regmap, calib_offest, val);
+             } else {
+                     regmap_write(tmdev->regmap, calib_offest, cdata);
+             }
+     }
+
+out_free:
+     kfree(caldata);
+out:
+     return ret;
+}
+
+static int sun8i_ths_register(struct ths_device *tmdev)
+{
+     struct thermal_zone_device *tzd;
+     int i;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             tmdev->sensor[i].tmdev = tmdev;
+             tmdev->sensor[i].id = i;
+             tmdev->sensor[i].tzd =
+                     devm_thermal_zone_of_sensor_register(tmdev->dev,
+                                                          i,
+                                                          &tmdev->sensor[i],
+                                                          &ths_ops);
+             if (IS_ERR(tmdev->sensor[i].tzd))
+                     return PTR_ERR(tzd);
+     }
+
+     return 0;
+}
+
+static int sun8i_ths_probe(struct platform_device *pdev)
+{
+     struct ths_device *tmdev;
+     struct device *dev = &pdev->dev;
+     int i, ret;
+
+     tmdev = devm_kzalloc(dev, sizeof(*tmdev), GFP_KERNEL);
+     if (!tmdev)
+             return -ENOMEM;
+
+     tmdev->dev = dev;
+     tmdev->chip = of_device_get_match_data(&pdev->dev);
+     if (!tmdev->chip)
+             return -EINVAL;
+
+     /*
+      * Initialize wait_queue in advance, to avoid calling wake_up
+      * before ths is registered in isr.
+      */
+     for (i = 0; i < tmdev->chip->sensor_num; i++)
+             init_waitqueue_head(&tmdev->sensor[i].wait_queue);
+
+     platform_set_drvdata(pdev, tmdev);
+
+     ret = sun8i_ths_resource_init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = tmdev->chip->init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = sun8i_ths_register(tmdev);
+     if (ret)
+             return ret;
+
+     return ret;
+}
+
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+     struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+     clk_disable_unprepare(tmdev->bus_clk);
+     reset_control_assert(tmdev->reset);
+
+     return 0;
+}
+
+static int sun50i_thermal_init(struct ths_device *tmdev)
+{
+     int val;
+
+     /*
+      * clkin = 24MHz
+      * T acquire = clkin / (x + 1)
+      *           = 20us
+      */
+     regmap_write(tmdev->regmap, SUN50I_THS_CTRL0,
+                  SUN50I_THS_CTRL0_T_ACQ(479));
+     /* average over 4 samples */
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_MFC,
+                  SUN50I_THS_FILTER_EN |
+                  SUN50I_THS_FILTER_TYPE(1));
+     /* period = (x + 1) * 4096 / clkin; ~10ms */
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_PC,
+                  SUN50I_H6_THS_PC_TEMP_PERIOD(58));
+     /* enable sensor */
+     val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_ENABLE, val);
+     /* thermal data interrupt enable */
+     val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIC, val);
+
+     return 0;
+}
+
+static const struct ths_thermal_chip sun50i_h6_ths = {
+     .sensor_num = 2,
+     .offset = -2794,
+     .scale = -67,
+     .ft_deviation = SUN50I_H6_FT_DEVIATION,
+     .temp_calib_base = SUN50I_H6_THS_TEMP_CALIB,
+     .temp_data_base = SUN50I_H6_THS_TEMP_DATA,
+     .calibrate = sun50i_ths_calibrate,
+     .init = sun50i_thermal_init,
+     .irq_thread = sun50i_h6_irq_thread,
+};
+
+static const struct of_device_id of_ths_match[] = {
+     { .compatible = "allwinner,sun50i-h6-ths", .data = &sun50i_h6_ths },
+     { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, of_ths_match);
+
+static struct platform_driver ths_driver = {
+     .probe = sun8i_ths_probe,
+     .remove = sun8i_ths_remove,
+     .driver = {
+             .name = "sun8i-thermal",
+             .of_match_table = of_ths_match,
+     },
+};
+module_platform_driver(ths_driver);
+
+MODULE_DESCRIPTION("Thermal sensor driver for Allwinner SOC");
+MODULE_LICENSE("GPL v2");
--

2.17.0

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer
#9 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

Quoted 185 lines · Frank Lee

HI Ondřej,

Quoted 167 lines · Ondřej Jirman

Hi Yangtao,

Quoted 163 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L:       [email protected]
 S:   Maintained
 F:   drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:   Yangtao Li <[email protected]>
+L:   [email protected]
+S:   Maintained
+F:   Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:   drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:   Maxime Ripard <[email protected]>
 M:   Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +14 -0
index 9966364a6deb..e5465053d66f 100644
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
        Enable this to plug the SPEAr thermal sensor driver into the Linux
        thermal framework.
 
+config SUN8I_THERMAL
+     tristate "Allwinner sun8i thermal driver"
+     depends on ARCH_SUNXI || COMPILE_TEST
+     depends on HAS_IOMEM
+     depends on NVMEM_SUNXI_SID
+     depends on OF
+     depends on RESET_CONTROLLER
+     help
+       Support for the sun8i thermal sensor driver into the Linux thermal
+       framework.
+
+       To compile this driver as a module, choose M here: the
+       module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
      tristate "Rockchip thermal driver"
      depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y                                += broadcom/
 obj-$(CONFIG_THERMAL_MMIO)           += thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)  += spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)       += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)   += rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)      += rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +89 -0
new file mode 100644
index 000000000000..a9cc2197f4cb
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Thermal sensor driver for Allwinner SOC
+ * Copyright (C) 2019 Yangtao Li
+ *
+ * Based on the work of Icenowy Zheng <[email protected]>
+ * Based on the work of Ondrej Jirman <[email protected]>
+ * Based on the work of Josef Gajdusek <[email protected]>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+
+#define MAX_SENSOR_NUM       4
+
+#define FT_TEMP_MASK                         GENMASK(11, 0)
+#define TEMP_CALIB_MASK                              GENMASK(11, 0)
+#define TEMP_TO_REG                          672
+#define CALIBRATE_DEFAULT                    0x800
+
+#define SUN50I_THS_CTRL0                     0x00
+#define SUN50I_H6_THS_ENABLE                 0x04
+#define SUN50I_H6_THS_PC                     0x08
+#define SUN50I_H6_THS_DIC                    0x10
+#define SUN50I_H6_THS_DIS                    0x20
+#define SUN50I_H6_THS_MFC                    0x30
+#define SUN50I_H6_THS_TEMP_CALIB             0xa0
+#define SUN50I_H6_THS_TEMP_DATA                      0xc0
+
+#define SUN50I_THS_CTRL0_T_ACQ(x)            ((GENMASK(15, 0) & (x)) << 16)
+#define SUN50I_THS_FILTER_EN                 BIT(2)
+#define SUN50I_THS_FILTER_TYPE(x)            (GENMASK(1, 0) & (x))
+#define SUN50I_H6_THS_PC_TEMP_PERIOD(x)              ((GENMASK(19, 0) & (x)) << 12)
+#define SUN50I_H6_THS_DATA_IRQ_STS(x)                BIT(x)
+
+/* millidegree celsius */
+#define SUN50I_H6_FT_DEVIATION                       7000
+
+struct ths_device;
+
+struct tsensor {
+     struct ths_device               *tmdev;
+     struct thermal_zone_device      *tzd;
+     int                             id;
+     wait_queue_head_t               wait_queue;
+};
+
+struct ths_thermal_chip {
+     int             sensor_num;
+     int             offset;
+     int             scale;
+     int             ft_deviation;
+     int             temp_calib_base;
+     int             temp_data_base;
+     int             (*calibrate)(struct ths_device *tmdev);
+     int             (*init)(struct ths_device *tmdev);
+     irqreturn_t     (*irq_thread)(int irq, void *data);
+};
+
+struct ths_device {
+     const struct ths_thermal_chip           *chip;
+     struct device                           *dev;
+     struct regmap                           *regmap;
+     struct reset_control                    *reset;
+     struct clk                              *bus_clk;
+     struct tsensor                          sensor[MAX_SENSOR_NUM];
+     int                                     data_ready;
+};
+
+/* Temp Unit: millidegree Celsius */
+static int sun8i_ths_reg2temp(struct ths_device *tmdev,
+                           int reg)
+{
+     return (reg + tmdev->chip->offset) * tmdev->chip->scale;
+}
+
+static int sun8i_ths_get_temp(void *data, int *temp)
+{
+     struct tsensor *s = data;
Quoted 8 lines

drivers/thermal/sun8i_thermal.c line 94

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+     struct ths_device *tmdev = s->tmdev;
+     int val;
+
+     wait_event(s->wait_queue, tmdev->data_ready & BIT(s->id));
+     tmdev->data_ready &= ~BIT(s->id);

I've looked at thermal_core.c and it looks like that the proper way to handle this situation is just returning -EAGAIN.

What we are doing now is to turn it into an interrupt-based program. Every time we use temperature data, we need to wait until new data is collected.

Quoted 1 line
Quoted 8 lines
Quoted 6 lines

See update_temperature() function in thermal_core.c.

That will suppress the warning about failure to read thermal zone. Also it's much simpler than this wait_queue stuff. No other thermal driver uses this either. Also get_temp is called under thermal_list_lock mutex and that would block cooling device registrations and god knows what else.

Since there is no valid temperature data, it cannot be blocked.

Since there is no valid temperature data, why can't it be blocked?

Quoted 360 lines

MBR,
Yangtao

Quoted 356 lines

Other than that, and what Maxime said, I don't see any more issues.

thank you,

        o.
Quoted 350 lines
drivers/thermal/sun8i_thermal.c new file +342 -1
+     regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
+                 0x4 * s->id, &val);
+
+     *temp = sun8i_ths_reg2temp(tmdev, val);
+     /*
+      * XX - According to the original sdk, there are some platforms(rarely)
+      * that add a fixed offset value after calculating the temperature
+      * value. We can't simply put it on the formula for calculating the
+      * temperature above, because the formula for calculating the
+      * temperature above is also used when the sensor is calibrated. If
+      * do this, the correct calibration formula is hard to know.
+      */
+     if (tmdev->chip->ft_deviation)
+             *temp += tmdev->chip->ft_deviation;
+
+     return 0;
+}
+
+static const struct thermal_zone_of_device_ops ths_ops = {
+     .get_temp = sun8i_ths_get_temp,
+};
+
+static const struct regmap_config config = {
+     .reg_bits = 32,
+     .val_bits = 32,
+     .reg_stride = 4,
+     .fast_io = true,
+};
+
+static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+{
+     wait_queue_head_t *data_wait;
+     struct ths_device *tmdev = data;
+     int i, state;
+
+     regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             data_wait = &tmdev->sensor[i].wait_queue;
+
+             if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
+                     /* clear data irq pending */
+                     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
+                                  SUN50I_H6_THS_DATA_IRQ_STS(i));
+
+                     tmdev->data_ready |= BIT(i);
+                     wake_up(data_wait);
+             }
+     }
+
+     return IRQ_HANDLED;
+}
+
+static int sun8i_ths_resource_init(struct ths_device *tmdev)
+{
+     struct device *dev = tmdev->dev;
+     struct platform_device *pdev = to_platform_device(dev);
+     struct resource *mem;
+     void __iomem *base;
+     int ret, irq;
+
+     mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+     base = devm_ioremap_resource(dev, mem);
+     if (IS_ERR(base))
+             return PTR_ERR(base);
+
+     tmdev->regmap = devm_regmap_init_mmio(dev, base, &config);
+     if (IS_ERR(tmdev->regmap))
+             return PTR_ERR(tmdev->regmap);
+
+     tmdev->reset = devm_reset_control_get(dev, 0);
+     if (IS_ERR(tmdev->reset))
+             return PTR_ERR(tmdev->reset);
+
+     tmdev->bus_clk = devm_clk_get(&pdev->dev, "bus");
+     if (IS_ERR(tmdev->bus_clk))
+             return PTR_ERR(tmdev->bus_clk);
+
+     irq = platform_get_irq(pdev, 0);
+     if (irq < 0)
+             return irq;
+
+     ret = devm_request_threaded_irq(dev, irq, NULL,
+                                     tmdev->chip->irq_thread,
+                                     IRQF_ONESHOT, "ths", tmdev);
+     if (ret)
+             return ret;
+
+     ret = reset_control_deassert(tmdev->reset);
+     if (ret)
+             return ret;
+
+     ret = clk_prepare_enable(tmdev->bus_clk);
+     if (ret)
+             goto assert_reset;
+
+     ret = tmdev->chip->calibrate(tmdev);
+     if (ret)
+             goto bus_disable;
+
+     return 0;
+
+bus_disable:
+     clk_disable_unprepare(tmdev->bus_clk);
+assert_reset:
+     reset_control_assert(tmdev->reset);
+
+     return ret;
+}
+
+static int sun50i_ths_calibrate(struct ths_device *tmdev)
+{
+     struct nvmem_cell *calcell;
+     struct device *dev = tmdev->dev;
+     u16 *caldata;
+     size_t callen;
+     int ft_temp;
+     int i, ret = 0;
+
+     calcell = devm_nvmem_cell_get(dev, "calib");
+     if (IS_ERR(calcell)) {
+             if (PTR_ERR(calcell) == -EPROBE_DEFER)
+                     return -EPROBE_DEFER;
+             /*
+              * Even if the external calibration data stored in sid is
+              * not accessible, the THS hardware can still work, although
+              * the data won't be so accurate.
+              *
+              * The default value of calibration register is 0x800 for
+              * every sensor, and the calibration value is usually 0x7xx
+              * or 0x8xx, so they won't be away from the default value
+              * for a lot.
+              *
+              * So here we do not return error if the calibartion data is
+              * not available, except the probe needs deferring.
+              */
+             goto out;
+     }
+
+     caldata = nvmem_cell_read(calcell, &callen);
+     if (IS_ERR(caldata)) {
+             ret = PTR_ERR(caldata);
+             goto out;
+     }
+
+     if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
+             ret = -EINVAL;
+             goto out_free;
+     }
+
+     /*
+      * efuse layout:
+      *
+      *      0   11  16       32
+      *      +-------+-------+-------+
+      *      |temp|  |sensor0|sensor1|
+      *      +-------+-------+-------+
+      *
+      * The calibration data on the H6 is the ambient temperature and
+      * sensor values that are filled during the factory test stage.
+      *
+      * The unit of stored FT temperature is 0.1 degreee celusis.
+      * Through the stored ambient temperature and the data read
+      * by the sensor, after a certain calculation, the calibration
+      * value to be compensated can be obtained.
+      */
+     ft_temp = caldata[0] & FT_TEMP_MASK;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             int reg = (int)caldata[i + 1];
+             int sensor_temp = sun8i_ths_reg2temp(tmdev, reg);
+             int delta, cdata, calib_offest;
+
+             /*
+              * To calculate the calibration value:
+              *
+              * X(in Celsius) = Ts - ft_temp
+              * delta = X * 10000 / TEMP_TO_REG
+              * cdata = CALIBRATE_DEFAULT - delta
+              *
+              * cdata: calibration value
+              */
+             delta = (sensor_temp - ft_temp * 100) * 10 / TEMP_TO_REG;
+             cdata = CALIBRATE_DEFAULT - delta;
+             if (cdata & ~TEMP_CALIB_MASK) {
+                     /*
+                      * Calibration value more than 12-bit, but calibration
+                      * register is 12-bit. In this case, ths hardware can
+                      * still work without calibration, although the data
+                      * won't be so accurate.
+                      */
+                     dev_warn(dev, "sensor%d is not calibrated.\n", i);
+
+                     continue;
+             }
+
+             calib_offest = tmdev->chip->temp_calib_base + (i / 2) * 0x4;
+
+             if (i % 2) {
+                     int val;
+
+                     regmap_read(tmdev->regmap, calib_offest, &val);
+                     val = (val & TEMP_CALIB_MASK) | (cdata << 16);
+                     regmap_write(tmdev->regmap, calib_offest, val);
+             } else {
+                     regmap_write(tmdev->regmap, calib_offest, cdata);
+             }
+     }
+
+out_free:
+     kfree(caldata);
+out:
+     return ret;
+}
+
+static int sun8i_ths_register(struct ths_device *tmdev)
+{
+     struct thermal_zone_device *tzd;
+     int i;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             tmdev->sensor[i].tmdev = tmdev;
+             tmdev->sensor[i].id = i;
+             tmdev->sensor[i].tzd =
+                     devm_thermal_zone_of_sensor_register(tmdev->dev,
+                                                          i,
+                                                          &tmdev->sensor[i],
+                                                          &ths_ops);
+             if (IS_ERR(tmdev->sensor[i].tzd))
+                     return PTR_ERR(tzd);
+     }
+
+     return 0;
+}
+
+static int sun8i_ths_probe(struct platform_device *pdev)
+{
+     struct ths_device *tmdev;
+     struct device *dev = &pdev->dev;
+     int i, ret;
+
+     tmdev = devm_kzalloc(dev, sizeof(*tmdev), GFP_KERNEL);
+     if (!tmdev)
+             return -ENOMEM;
+
+     tmdev->dev = dev;
+     tmdev->chip = of_device_get_match_data(&pdev->dev);
+     if (!tmdev->chip)
+             return -EINVAL;
+
+     /*
+      * Initialize wait_queue in advance, to avoid calling wake_up
+      * before ths is registered in isr.
+      */
+     for (i = 0; i < tmdev->chip->sensor_num; i++)
+             init_waitqueue_head(&tmdev->sensor[i].wait_queue);
+
+     platform_set_drvdata(pdev, tmdev);
+
+     ret = sun8i_ths_resource_init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = tmdev->chip->init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = sun8i_ths_register(tmdev);
+     if (ret)
+             return ret;
+
+     return ret;
+}
+
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+     struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+     clk_disable_unprepare(tmdev->bus_clk);
+     reset_control_assert(tmdev->reset);
+
+     return 0;
+}
+
+static int sun50i_thermal_init(struct ths_device *tmdev)
+{
+     int val;
+
+     /*
+      * clkin = 24MHz
+      * T acquire = clkin / (x + 1)
+      *           = 20us
+      */
+     regmap_write(tmdev->regmap, SUN50I_THS_CTRL0,
+                  SUN50I_THS_CTRL0_T_ACQ(479));
+     /* average over 4 samples */
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_MFC,
+                  SUN50I_THS_FILTER_EN |
+                  SUN50I_THS_FILTER_TYPE(1));
+     /* period = (x + 1) * 4096 / clkin; ~10ms */
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_PC,
+                  SUN50I_H6_THS_PC_TEMP_PERIOD(58));
+     /* enable sensor */
+     val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_ENABLE, val);
+     /* thermal data interrupt enable */
+     val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIC, val);
+
+     return 0;
+}
+
+static const struct ths_thermal_chip sun50i_h6_ths = {
+     .sensor_num = 2,
+     .offset = -2794,
+     .scale = -67,
+     .ft_deviation = SUN50I_H6_FT_DEVIATION,
+     .temp_calib_base = SUN50I_H6_THS_TEMP_CALIB,
+     .temp_data_base = SUN50I_H6_THS_TEMP_DATA,
+     .calibrate = sun50i_ths_calibrate,
+     .init = sun50i_thermal_init,
+     .irq_thread = sun50i_h6_irq_thread,
+};
+
+static const struct of_device_id of_ths_match[] = {
+     { .compatible = "allwinner,sun50i-h6-ths", .data = &sun50i_h6_ths },
+     { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, of_ths_match);
+
+static struct platform_driver ths_driver = {
+     .probe = sun8i_ths_probe,
+     .remove = sun8i_ths_remove,
+     .driver = {
+             .name = "sun8i-thermal",
+             .of_match_table = of_ths_match,
+     },
+};
+module_platform_driver(ths_driver);
+
+MODULE_DESCRIPTION("Thermal sensor driver for Allwinner SOC");
+MODULE_LICENSE("GPL v2");
--

2.17.0

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#10 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Frank Lee

Hello Frank,

Quoted 180 lines · Frank Lee

HI Ondřej,

Quoted 167 lines · Ondřej Jirman

Hi Yangtao,

Quoted 163 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L:       [email protected]
 S:   Maintained
 F:   drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:   Yangtao Li <[email protected]>
+L:   [email protected]
+S:   Maintained
+F:   Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:   drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:   Maxime Ripard <[email protected]>
 M:   Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +14 -0
index 9966364a6deb..e5465053d66f 100644
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
        Enable this to plug the SPEAr thermal sensor driver into the Linux
        thermal framework.
 
+config SUN8I_THERMAL
+     tristate "Allwinner sun8i thermal driver"
+     depends on ARCH_SUNXI || COMPILE_TEST
+     depends on HAS_IOMEM
+     depends on NVMEM_SUNXI_SID
+     depends on OF
+     depends on RESET_CONTROLLER
+     help
+       Support for the sun8i thermal sensor driver into the Linux thermal
+       framework.
+
+       To compile this driver as a module, choose M here: the
+       module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
      tristate "Rockchip thermal driver"
      depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y                                += broadcom/
 obj-$(CONFIG_THERMAL_MMIO)           += thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)  += spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)       += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)   += rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)      += rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +89 -0
new file mode 100644
index 000000000000..a9cc2197f4cb
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Thermal sensor driver for Allwinner SOC
+ * Copyright (C) 2019 Yangtao Li
+ *
+ * Based on the work of Icenowy Zheng <[email protected]>
+ * Based on the work of Ondrej Jirman <[email protected]>
+ * Based on the work of Josef Gajdusek <[email protected]>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+
+#define MAX_SENSOR_NUM       4
+
+#define FT_TEMP_MASK                         GENMASK(11, 0)
+#define TEMP_CALIB_MASK                              GENMASK(11, 0)
+#define TEMP_TO_REG                          672
+#define CALIBRATE_DEFAULT                    0x800
+
+#define SUN50I_THS_CTRL0                     0x00
+#define SUN50I_H6_THS_ENABLE                 0x04
+#define SUN50I_H6_THS_PC                     0x08
+#define SUN50I_H6_THS_DIC                    0x10
+#define SUN50I_H6_THS_DIS                    0x20
+#define SUN50I_H6_THS_MFC                    0x30
+#define SUN50I_H6_THS_TEMP_CALIB             0xa0
+#define SUN50I_H6_THS_TEMP_DATA                      0xc0
+
+#define SUN50I_THS_CTRL0_T_ACQ(x)            ((GENMASK(15, 0) & (x)) << 16)
+#define SUN50I_THS_FILTER_EN                 BIT(2)
+#define SUN50I_THS_FILTER_TYPE(x)            (GENMASK(1, 0) & (x))
+#define SUN50I_H6_THS_PC_TEMP_PERIOD(x)              ((GENMASK(19, 0) & (x)) << 12)
+#define SUN50I_H6_THS_DATA_IRQ_STS(x)                BIT(x)
+
+/* millidegree celsius */
+#define SUN50I_H6_FT_DEVIATION                       7000
+
+struct ths_device;
+
+struct tsensor {
+     struct ths_device               *tmdev;
+     struct thermal_zone_device      *tzd;
+     int                             id;
+     wait_queue_head_t               wait_queue;
+};
+
+struct ths_thermal_chip {
+     int             sensor_num;
+     int             offset;
+     int             scale;
+     int             ft_deviation;
+     int             temp_calib_base;
+     int             temp_data_base;
+     int             (*calibrate)(struct ths_device *tmdev);
+     int             (*init)(struct ths_device *tmdev);
+     irqreturn_t     (*irq_thread)(int irq, void *data);
+};
+
+struct ths_device {
+     const struct ths_thermal_chip           *chip;
+     struct device                           *dev;
+     struct regmap                           *regmap;
+     struct reset_control                    *reset;
+     struct clk                              *bus_clk;
+     struct tsensor                          sensor[MAX_SENSOR_NUM];
+     int                                     data_ready;
+};
+
+/* Temp Unit: millidegree Celsius */
+static int sun8i_ths_reg2temp(struct ths_device *tmdev,
+                           int reg)
+{
+     return (reg + tmdev->chip->offset) * tmdev->chip->scale;
+}
+
+static int sun8i_ths_get_temp(void *data, int *temp)
+{
+     struct tsensor *s = data;
Quoted 8 lines

drivers/thermal/sun8i_thermal.c line 94

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+     struct ths_device *tmdev = s->tmdev;
+     int val;
+
+     wait_event(s->wait_queue, tmdev->data_ready & BIT(s->id));
+     tmdev->data_ready &= ~BIT(s->id);

I've looked at thermal_core.c and it looks like that the proper way to handle this situation is just returning -EAGAIN.

Quoted 2 lines

What we are doing now is to turn it into an interrupt-based program. Every time we use temperature data, we need to wait until new data is collected.

No you don't need to wait, and by waiting you're blocking a lot of tings in thermal_core.c for no reason.

Quoted 9 lines
Quoted 7 lines

See update_temperature() function in thermal_core.c.

That will suppress the warning about failure to read thermal zone. Also it's much simpler than this wait_queue stuff. No other thermal driver uses this either. Also get_temp is called under thermal_list_lock mutex and that would block cooling device registrations and god knows what else.

Since there is no valid temperature data, it cannot be blocked.

Sorry, I don't understand your meaning here. get_temp will block in wait_event, and the above mentioned lock in tz code will be held during all this time, until you get data_ready condition satisified sometimes in the future.

https://elixir.bootlin.com/linux/latest/source/drivers/thermal/thermal_core.c#L43

This will prevent all time zones in the system from being updated, regsitered, etc, because it's a driver level lock.

Given that this is called from __thermal_cooling_device_register:

https://elixir.bootlin.com/linux/latest/source/drivers/thermal/thermal_core.c#L997

This will stop all other thermal zones from registering for no reason.

Just return -EAGAIN, as expected here:

https://elixir.bootlin.com/linux/latest/source/drivers/thermal/thermal_core.c#L431

And the driver will work in both interrupt driven and polled mode just fine, without any warnings or delays or taking this lock for no reason for too long.

thank you and regards,

	o.
Quoted 364 lines

MBR,
Yangtao

Quoted 352 lines

Other than that, and what Maxime said, I don't see any more issues.

thank you,

        o.
Quoted 346 lines
drivers/thermal/sun8i_thermal.c new file +342 -1
+     regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
+                 0x4 * s->id, &val);
+
+     *temp = sun8i_ths_reg2temp(tmdev, val);
+     /*
+      * XX - According to the original sdk, there are some platforms(rarely)
+      * that add a fixed offset value after calculating the temperature
+      * value. We can't simply put it on the formula for calculating the
+      * temperature above, because the formula for calculating the
+      * temperature above is also used when the sensor is calibrated. If
+      * do this, the correct calibration formula is hard to know.
+      */
+     if (tmdev->chip->ft_deviation)
+             *temp += tmdev->chip->ft_deviation;
+
+     return 0;
+}
+
+static const struct thermal_zone_of_device_ops ths_ops = {
+     .get_temp = sun8i_ths_get_temp,
+};
+
+static const struct regmap_config config = {
+     .reg_bits = 32,
+     .val_bits = 32,
+     .reg_stride = 4,
+     .fast_io = true,
+};
+
+static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+{
+     wait_queue_head_t *data_wait;
+     struct ths_device *tmdev = data;
+     int i, state;
+
+     regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             data_wait = &tmdev->sensor[i].wait_queue;
+
+             if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
+                     /* clear data irq pending */
+                     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
+                                  SUN50I_H6_THS_DATA_IRQ_STS(i));
+
+                     tmdev->data_ready |= BIT(i);
+                     wake_up(data_wait);
+             }
+     }
+
+     return IRQ_HANDLED;
+}
+
+static int sun8i_ths_resource_init(struct ths_device *tmdev)
+{
+     struct device *dev = tmdev->dev;
+     struct platform_device *pdev = to_platform_device(dev);
+     struct resource *mem;
+     void __iomem *base;
+     int ret, irq;
+
+     mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+     base = devm_ioremap_resource(dev, mem);
+     if (IS_ERR(base))
+             return PTR_ERR(base);
+
+     tmdev->regmap = devm_regmap_init_mmio(dev, base, &config);
+     if (IS_ERR(tmdev->regmap))
+             return PTR_ERR(tmdev->regmap);
+
+     tmdev->reset = devm_reset_control_get(dev, 0);
+     if (IS_ERR(tmdev->reset))
+             return PTR_ERR(tmdev->reset);
+
+     tmdev->bus_clk = devm_clk_get(&pdev->dev, "bus");
+     if (IS_ERR(tmdev->bus_clk))
+             return PTR_ERR(tmdev->bus_clk);
+
+     irq = platform_get_irq(pdev, 0);
+     if (irq < 0)
+             return irq;
+
+     ret = devm_request_threaded_irq(dev, irq, NULL,
+                                     tmdev->chip->irq_thread,
+                                     IRQF_ONESHOT, "ths", tmdev);
+     if (ret)
+             return ret;
+
+     ret = reset_control_deassert(tmdev->reset);
+     if (ret)
+             return ret;
+
+     ret = clk_prepare_enable(tmdev->bus_clk);
+     if (ret)
+             goto assert_reset;
+
+     ret = tmdev->chip->calibrate(tmdev);
+     if (ret)
+             goto bus_disable;
+
+     return 0;
+
+bus_disable:
+     clk_disable_unprepare(tmdev->bus_clk);
+assert_reset:
+     reset_control_assert(tmdev->reset);
+
+     return ret;
+}
+
+static int sun50i_ths_calibrate(struct ths_device *tmdev)
+{
+     struct nvmem_cell *calcell;
+     struct device *dev = tmdev->dev;
+     u16 *caldata;
+     size_t callen;
+     int ft_temp;
+     int i, ret = 0;
+
+     calcell = devm_nvmem_cell_get(dev, "calib");
+     if (IS_ERR(calcell)) {
+             if (PTR_ERR(calcell) == -EPROBE_DEFER)
+                     return -EPROBE_DEFER;
+             /*
+              * Even if the external calibration data stored in sid is
+              * not accessible, the THS hardware can still work, although
+              * the data won't be so accurate.
+              *
+              * The default value of calibration register is 0x800 for
+              * every sensor, and the calibration value is usually 0x7xx
+              * or 0x8xx, so they won't be away from the default value
+              * for a lot.
+              *
+              * So here we do not return error if the calibartion data is
+              * not available, except the probe needs deferring.
+              */
+             goto out;
+     }
+
+     caldata = nvmem_cell_read(calcell, &callen);
+     if (IS_ERR(caldata)) {
+             ret = PTR_ERR(caldata);
+             goto out;
+     }
+
+     if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
+             ret = -EINVAL;
+             goto out_free;
+     }
+
+     /*
+      * efuse layout:
+      *
+      *      0   11  16       32
+      *      +-------+-------+-------+
+      *      |temp|  |sensor0|sensor1|
+      *      +-------+-------+-------+
+      *
+      * The calibration data on the H6 is the ambient temperature and
+      * sensor values that are filled during the factory test stage.
+      *
+      * The unit of stored FT temperature is 0.1 degreee celusis.
+      * Through the stored ambient temperature and the data read
+      * by the sensor, after a certain calculation, the calibration
+      * value to be compensated can be obtained.
+      */
+     ft_temp = caldata[0] & FT_TEMP_MASK;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             int reg = (int)caldata[i + 1];
+             int sensor_temp = sun8i_ths_reg2temp(tmdev, reg);
+             int delta, cdata, calib_offest;
+
+             /*
+              * To calculate the calibration value:
+              *
+              * X(in Celsius) = Ts - ft_temp
+              * delta = X * 10000 / TEMP_TO_REG
+              * cdata = CALIBRATE_DEFAULT - delta
+              *
+              * cdata: calibration value
+              */
+             delta = (sensor_temp - ft_temp * 100) * 10 / TEMP_TO_REG;
+             cdata = CALIBRATE_DEFAULT - delta;
+             if (cdata & ~TEMP_CALIB_MASK) {
+                     /*
+                      * Calibration value more than 12-bit, but calibration
+                      * register is 12-bit. In this case, ths hardware can
+                      * still work without calibration, although the data
+                      * won't be so accurate.
+                      */
+                     dev_warn(dev, "sensor%d is not calibrated.\n", i);
+
+                     continue;
+             }
+
+             calib_offest = tmdev->chip->temp_calib_base + (i / 2) * 0x4;
+
+             if (i % 2) {
+                     int val;
+
+                     regmap_read(tmdev->regmap, calib_offest, &val);
+                     val = (val & TEMP_CALIB_MASK) | (cdata << 16);
+                     regmap_write(tmdev->regmap, calib_offest, val);
+             } else {
+                     regmap_write(tmdev->regmap, calib_offest, cdata);
+             }
+     }
+
+out_free:
+     kfree(caldata);
+out:
+     return ret;
+}
+
+static int sun8i_ths_register(struct ths_device *tmdev)
+{
+     struct thermal_zone_device *tzd;
+     int i;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             tmdev->sensor[i].tmdev = tmdev;
+             tmdev->sensor[i].id = i;
+             tmdev->sensor[i].tzd =
+                     devm_thermal_zone_of_sensor_register(tmdev->dev,
+                                                          i,
+                                                          &tmdev->sensor[i],
+                                                          &ths_ops);
+             if (IS_ERR(tmdev->sensor[i].tzd))
+                     return PTR_ERR(tzd);
+     }
+
+     return 0;
+}
+
+static int sun8i_ths_probe(struct platform_device *pdev)
+{
+     struct ths_device *tmdev;
+     struct device *dev = &pdev->dev;
+     int i, ret;
+
+     tmdev = devm_kzalloc(dev, sizeof(*tmdev), GFP_KERNEL);
+     if (!tmdev)
+             return -ENOMEM;
+
+     tmdev->dev = dev;
+     tmdev->chip = of_device_get_match_data(&pdev->dev);
+     if (!tmdev->chip)
+             return -EINVAL;
+
+     /*
+      * Initialize wait_queue in advance, to avoid calling wake_up
+      * before ths is registered in isr.
+      */
+     for (i = 0; i < tmdev->chip->sensor_num; i++)
+             init_waitqueue_head(&tmdev->sensor[i].wait_queue);
+
+     platform_set_drvdata(pdev, tmdev);
+
+     ret = sun8i_ths_resource_init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = tmdev->chip->init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = sun8i_ths_register(tmdev);
+     if (ret)
+             return ret;
+
+     return ret;
+}
+
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+     struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+     clk_disable_unprepare(tmdev->bus_clk);
+     reset_control_assert(tmdev->reset);
+
+     return 0;
+}
+
+static int sun50i_thermal_init(struct ths_device *tmdev)
+{
+     int val;
+
+     /*
+      * clkin = 24MHz
+      * T acquire = clkin / (x + 1)
+      *           = 20us
+      */
+     regmap_write(tmdev->regmap, SUN50I_THS_CTRL0,
+                  SUN50I_THS_CTRL0_T_ACQ(479));
+     /* average over 4 samples */
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_MFC,
+                  SUN50I_THS_FILTER_EN |
+                  SUN50I_THS_FILTER_TYPE(1));
+     /* period = (x + 1) * 4096 / clkin; ~10ms */
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_PC,
+                  SUN50I_H6_THS_PC_TEMP_PERIOD(58));
+     /* enable sensor */
+     val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_ENABLE, val);
+     /* thermal data interrupt enable */
+     val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIC, val);
+
+     return 0;
+}
+
+static const struct ths_thermal_chip sun50i_h6_ths = {
+     .sensor_num = 2,
+     .offset = -2794,
+     .scale = -67,
+     .ft_deviation = SUN50I_H6_FT_DEVIATION,
+     .temp_calib_base = SUN50I_H6_THS_TEMP_CALIB,
+     .temp_data_base = SUN50I_H6_THS_TEMP_DATA,
+     .calibrate = sun50i_ths_calibrate,
+     .init = sun50i_thermal_init,
+     .irq_thread = sun50i_h6_irq_thread,
+};
+
+static const struct of_device_id of_ths_match[] = {
+     { .compatible = "allwinner,sun50i-h6-ths", .data = &sun50i_h6_ths },
+     { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, of_ths_match);
+
+static struct platform_driver ths_driver = {
+     .probe = sun8i_ths_probe,
+     .remove = sun8i_ths_remove,
+     .driver = {
+             .name = "sun8i-thermal",
+             .of_match_table = of_ths_match,
+     },
+};
+module_platform_driver(ths_driver);
+
+MODULE_DESCRIPTION("Thermal sensor driver for Allwinner SOC");
+MODULE_LICENSE("GPL v2");
--

2.17.0

Quoted 4 lines
Quoted 4 lines

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#11 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

Quoted 203 lines · verejna

Hello Frank,

Quoted 180 lines · Frank Lee

HI Ondřej,

Quoted 167 lines · Ondřej Jirman

Hi Yangtao,

Quoted 163 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L:       [email protected]
 S:   Maintained
 F:   drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:   Yangtao Li <[email protected]>
+L:   [email protected]
+S:   Maintained
+F:   Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:   drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:   Maxime Ripard <[email protected]>
 M:   Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +14 -0
index 9966364a6deb..e5465053d66f 100644
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
        Enable this to plug the SPEAr thermal sensor driver into the Linux
        thermal framework.
 
+config SUN8I_THERMAL
+     tristate "Allwinner sun8i thermal driver"
+     depends on ARCH_SUNXI || COMPILE_TEST
+     depends on HAS_IOMEM
+     depends on NVMEM_SUNXI_SID
+     depends on OF
+     depends on RESET_CONTROLLER
+     help
+       Support for the sun8i thermal sensor driver into the Linux thermal
+       framework.
+
+       To compile this driver as a module, choose M here: the
+       module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
      tristate "Rockchip thermal driver"
      depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y                                += broadcom/
 obj-$(CONFIG_THERMAL_MMIO)           += thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)  += spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)       += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)   += rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)      += rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +89 -0
new file mode 100644
index 000000000000..a9cc2197f4cb
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Thermal sensor driver for Allwinner SOC
+ * Copyright (C) 2019 Yangtao Li
+ *
+ * Based on the work of Icenowy Zheng <[email protected]>
+ * Based on the work of Ondrej Jirman <[email protected]>
+ * Based on the work of Josef Gajdusek <[email protected]>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+
+#define MAX_SENSOR_NUM       4
+
+#define FT_TEMP_MASK                         GENMASK(11, 0)
+#define TEMP_CALIB_MASK                              GENMASK(11, 0)
+#define TEMP_TO_REG                          672
+#define CALIBRATE_DEFAULT                    0x800
+
+#define SUN50I_THS_CTRL0                     0x00
+#define SUN50I_H6_THS_ENABLE                 0x04
+#define SUN50I_H6_THS_PC                     0x08
+#define SUN50I_H6_THS_DIC                    0x10
+#define SUN50I_H6_THS_DIS                    0x20
+#define SUN50I_H6_THS_MFC                    0x30
+#define SUN50I_H6_THS_TEMP_CALIB             0xa0
+#define SUN50I_H6_THS_TEMP_DATA                      0xc0
+
+#define SUN50I_THS_CTRL0_T_ACQ(x)            ((GENMASK(15, 0) & (x)) << 16)
+#define SUN50I_THS_FILTER_EN                 BIT(2)
+#define SUN50I_THS_FILTER_TYPE(x)            (GENMASK(1, 0) & (x))
+#define SUN50I_H6_THS_PC_TEMP_PERIOD(x)              ((GENMASK(19, 0) & (x)) << 12)
+#define SUN50I_H6_THS_DATA_IRQ_STS(x)                BIT(x)
+
+/* millidegree celsius */
+#define SUN50I_H6_FT_DEVIATION                       7000
+
+struct ths_device;
+
+struct tsensor {
+     struct ths_device               *tmdev;
+     struct thermal_zone_device      *tzd;
+     int                             id;
+     wait_queue_head_t               wait_queue;
+};
+
+struct ths_thermal_chip {
+     int             sensor_num;
+     int             offset;
+     int             scale;
+     int             ft_deviation;
+     int             temp_calib_base;
+     int             temp_data_base;
+     int             (*calibrate)(struct ths_device *tmdev);
+     int             (*init)(struct ths_device *tmdev);
+     irqreturn_t     (*irq_thread)(int irq, void *data);
+};
+
+struct ths_device {
+     const struct ths_thermal_chip           *chip;
+     struct device                           *dev;
+     struct regmap                           *regmap;
+     struct reset_control                    *reset;
+     struct clk                              *bus_clk;
+     struct tsensor                          sensor[MAX_SENSOR_NUM];
+     int                                     data_ready;
+};
+
+/* Temp Unit: millidegree Celsius */
+static int sun8i_ths_reg2temp(struct ths_device *tmdev,
+                           int reg)
+{
+     return (reg + tmdev->chip->offset) * tmdev->chip->scale;
+}
+
+static int sun8i_ths_get_temp(void *data, int *temp)
+{
+     struct tsensor *s = data;
Quoted 8 lines

drivers/thermal/sun8i_thermal.c line 94

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+     struct ths_device *tmdev = s->tmdev;
+     int val;
+
+     wait_event(s->wait_queue, tmdev->data_ready & BIT(s->id));
+     tmdev->data_ready &= ~BIT(s->id);

I've looked at thermal_core.c and it looks like that the proper way to handle this situation is just returning -EAGAIN.

Quoted 2 lines

What we are doing now is to turn it into an interrupt-based program. Every time we use temperature data, we need to wait until new data is collected.

No you don't need to wait, and by waiting you're blocking a lot of tings in thermal_core.c for no reason.

Quoted 9 lines
Quoted 7 lines

See update_temperature() function in thermal_core.c.

That will suppress the warning about failure to read thermal zone. Also it's much simpler than this wait_queue stuff. No other thermal driver uses this either. Also get_temp is called under thermal_list_lock mutex and that would block cooling device registrations and god knows what else.

Since there is no valid temperature data, it cannot be blocked.

Sorry, I don't understand your meaning here. get_temp will block in wait_event, and the above mentioned lock in tz code will be held during all this time, until you get data_ready condition satisified sometimes in the future.

Quoted 8 lines

https://elixir.bootlin.com/linux/latest/source/drivers/thermal/thermal_core.c#L43

This will prevent all time zones in the system from being updated, regsitered, etc, because it's a driver level lock.

Given that this is called from __thermal_cooling_device_register:

https://elixir.bootlin.com/linux/latest/source/drivers/thermal/thermal_core.c#L997

Other effect I guess, since this is a driver registration function is that this will end up blocking boot on the thermal_list_lock if you have more than 1 cooling device until you get the first sample, which is not really acceptable.

regards,

	o.
Quoted 381 lines

This will stop all other thermal zones from registering for no reason.

Just return -EAGAIN, as expected here:

https://elixir.bootlin.com/linux/latest/source/drivers/thermal/thermal_core.c#L431

And the driver will work in both interrupt driven and polled mode just fine, without any warnings or delays or taking this lock for no reason for too long.

thank you and regards,

	o.
Quoted 355 lines

MBR,
Yangtao

Quoted 352 lines

Other than that, and what Maxime said, I don't see any more issues.

thank you,

        o.
Quoted 346 lines
drivers/thermal/sun8i_thermal.c new file +342 -1
+     regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
+                 0x4 * s->id, &val);
+
+     *temp = sun8i_ths_reg2temp(tmdev, val);
+     /*
+      * XX - According to the original sdk, there are some platforms(rarely)
+      * that add a fixed offset value after calculating the temperature
+      * value. We can't simply put it on the formula for calculating the
+      * temperature above, because the formula for calculating the
+      * temperature above is also used when the sensor is calibrated. If
+      * do this, the correct calibration formula is hard to know.
+      */
+     if (tmdev->chip->ft_deviation)
+             *temp += tmdev->chip->ft_deviation;
+
+     return 0;
+}
+
+static const struct thermal_zone_of_device_ops ths_ops = {
+     .get_temp = sun8i_ths_get_temp,
+};
+
+static const struct regmap_config config = {
+     .reg_bits = 32,
+     .val_bits = 32,
+     .reg_stride = 4,
+     .fast_io = true,
+};
+
+static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+{
+     wait_queue_head_t *data_wait;
+     struct ths_device *tmdev = data;
+     int i, state;
+
+     regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             data_wait = &tmdev->sensor[i].wait_queue;
+
+             if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
+                     /* clear data irq pending */
+                     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
+                                  SUN50I_H6_THS_DATA_IRQ_STS(i));
+
+                     tmdev->data_ready |= BIT(i);
+                     wake_up(data_wait);
+             }
+     }
+
+     return IRQ_HANDLED;
+}
+
+static int sun8i_ths_resource_init(struct ths_device *tmdev)
+{
+     struct device *dev = tmdev->dev;
+     struct platform_device *pdev = to_platform_device(dev);
+     struct resource *mem;
+     void __iomem *base;
+     int ret, irq;
+
+     mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+     base = devm_ioremap_resource(dev, mem);
+     if (IS_ERR(base))
+             return PTR_ERR(base);
+
+     tmdev->regmap = devm_regmap_init_mmio(dev, base, &config);
+     if (IS_ERR(tmdev->regmap))
+             return PTR_ERR(tmdev->regmap);
+
+     tmdev->reset = devm_reset_control_get(dev, 0);
+     if (IS_ERR(tmdev->reset))
+             return PTR_ERR(tmdev->reset);
+
+     tmdev->bus_clk = devm_clk_get(&pdev->dev, "bus");
+     if (IS_ERR(tmdev->bus_clk))
+             return PTR_ERR(tmdev->bus_clk);
+
+     irq = platform_get_irq(pdev, 0);
+     if (irq < 0)
+             return irq;
+
+     ret = devm_request_threaded_irq(dev, irq, NULL,
+                                     tmdev->chip->irq_thread,
+                                     IRQF_ONESHOT, "ths", tmdev);
+     if (ret)
+             return ret;
+
+     ret = reset_control_deassert(tmdev->reset);
+     if (ret)
+             return ret;
+
+     ret = clk_prepare_enable(tmdev->bus_clk);
+     if (ret)
+             goto assert_reset;
+
+     ret = tmdev->chip->calibrate(tmdev);
+     if (ret)
+             goto bus_disable;
+
+     return 0;
+
+bus_disable:
+     clk_disable_unprepare(tmdev->bus_clk);
+assert_reset:
+     reset_control_assert(tmdev->reset);
+
+     return ret;
+}
+
+static int sun50i_ths_calibrate(struct ths_device *tmdev)
+{
+     struct nvmem_cell *calcell;
+     struct device *dev = tmdev->dev;
+     u16 *caldata;
+     size_t callen;
+     int ft_temp;
+     int i, ret = 0;
+
+     calcell = devm_nvmem_cell_get(dev, "calib");
+     if (IS_ERR(calcell)) {
+             if (PTR_ERR(calcell) == -EPROBE_DEFER)
+                     return -EPROBE_DEFER;
+             /*
+              * Even if the external calibration data stored in sid is
+              * not accessible, the THS hardware can still work, although
+              * the data won't be so accurate.
+              *
+              * The default value of calibration register is 0x800 for
+              * every sensor, and the calibration value is usually 0x7xx
+              * or 0x8xx, so they won't be away from the default value
+              * for a lot.
+              *
+              * So here we do not return error if the calibartion data is
+              * not available, except the probe needs deferring.
+              */
+             goto out;
+     }
+
+     caldata = nvmem_cell_read(calcell, &callen);
+     if (IS_ERR(caldata)) {
+             ret = PTR_ERR(caldata);
+             goto out;
+     }
+
+     if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
+             ret = -EINVAL;
+             goto out_free;
+     }
+
+     /*
+      * efuse layout:
+      *
+      *      0   11  16       32
+      *      +-------+-------+-------+
+      *      |temp|  |sensor0|sensor1|
+      *      +-------+-------+-------+
+      *
+      * The calibration data on the H6 is the ambient temperature and
+      * sensor values that are filled during the factory test stage.
+      *
+      * The unit of stored FT temperature is 0.1 degreee celusis.
+      * Through the stored ambient temperature and the data read
+      * by the sensor, after a certain calculation, the calibration
+      * value to be compensated can be obtained.
+      */
+     ft_temp = caldata[0] & FT_TEMP_MASK;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             int reg = (int)caldata[i + 1];
+             int sensor_temp = sun8i_ths_reg2temp(tmdev, reg);
+             int delta, cdata, calib_offest;
+
+             /*
+              * To calculate the calibration value:
+              *
+              * X(in Celsius) = Ts - ft_temp
+              * delta = X * 10000 / TEMP_TO_REG
+              * cdata = CALIBRATE_DEFAULT - delta
+              *
+              * cdata: calibration value
+              */
+             delta = (sensor_temp - ft_temp * 100) * 10 / TEMP_TO_REG;
+             cdata = CALIBRATE_DEFAULT - delta;
+             if (cdata & ~TEMP_CALIB_MASK) {
+                     /*
+                      * Calibration value more than 12-bit, but calibration
+                      * register is 12-bit. In this case, ths hardware can
+                      * still work without calibration, although the data
+                      * won't be so accurate.
+                      */
+                     dev_warn(dev, "sensor%d is not calibrated.\n", i);
+
+                     continue;
+             }
+
+             calib_offest = tmdev->chip->temp_calib_base + (i / 2) * 0x4;
+
+             if (i % 2) {
+                     int val;
+
+                     regmap_read(tmdev->regmap, calib_offest, &val);
+                     val = (val & TEMP_CALIB_MASK) | (cdata << 16);
+                     regmap_write(tmdev->regmap, calib_offest, val);
+             } else {
+                     regmap_write(tmdev->regmap, calib_offest, cdata);
+             }
+     }
+
+out_free:
+     kfree(caldata);
+out:
+     return ret;
+}
+
+static int sun8i_ths_register(struct ths_device *tmdev)
+{
+     struct thermal_zone_device *tzd;
+     int i;
+
+     for (i = 0; i < tmdev->chip->sensor_num; i++) {
+             tmdev->sensor[i].tmdev = tmdev;
+             tmdev->sensor[i].id = i;
+             tmdev->sensor[i].tzd =
+                     devm_thermal_zone_of_sensor_register(tmdev->dev,
+                                                          i,
+                                                          &tmdev->sensor[i],
+                                                          &ths_ops);
+             if (IS_ERR(tmdev->sensor[i].tzd))
+                     return PTR_ERR(tzd);
+     }
+
+     return 0;
+}
+
+static int sun8i_ths_probe(struct platform_device *pdev)
+{
+     struct ths_device *tmdev;
+     struct device *dev = &pdev->dev;
+     int i, ret;
+
+     tmdev = devm_kzalloc(dev, sizeof(*tmdev), GFP_KERNEL);
+     if (!tmdev)
+             return -ENOMEM;
+
+     tmdev->dev = dev;
+     tmdev->chip = of_device_get_match_data(&pdev->dev);
+     if (!tmdev->chip)
+             return -EINVAL;
+
+     /*
+      * Initialize wait_queue in advance, to avoid calling wake_up
+      * before ths is registered in isr.
+      */
+     for (i = 0; i < tmdev->chip->sensor_num; i++)
+             init_waitqueue_head(&tmdev->sensor[i].wait_queue);
+
+     platform_set_drvdata(pdev, tmdev);
+
+     ret = sun8i_ths_resource_init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = tmdev->chip->init(tmdev);
+     if (ret)
+             return ret;
+
+     ret = sun8i_ths_register(tmdev);
+     if (ret)
+             return ret;
+
+     return ret;
+}
+
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+     struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+     clk_disable_unprepare(tmdev->bus_clk);
+     reset_control_assert(tmdev->reset);
+
+     return 0;
+}
+
+static int sun50i_thermal_init(struct ths_device *tmdev)
+{
+     int val;
+
+     /*
+      * clkin = 24MHz
+      * T acquire = clkin / (x + 1)
+      *           = 20us
+      */
+     regmap_write(tmdev->regmap, SUN50I_THS_CTRL0,
+                  SUN50I_THS_CTRL0_T_ACQ(479));
+     /* average over 4 samples */
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_MFC,
+                  SUN50I_THS_FILTER_EN |
+                  SUN50I_THS_FILTER_TYPE(1));
+     /* period = (x + 1) * 4096 / clkin; ~10ms */
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_PC,
+                  SUN50I_H6_THS_PC_TEMP_PERIOD(58));
+     /* enable sensor */
+     val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_ENABLE, val);
+     /* thermal data interrupt enable */
+     val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+     regmap_write(tmdev->regmap, SUN50I_H6_THS_DIC, val);
+
+     return 0;
+}
+
+static const struct ths_thermal_chip sun50i_h6_ths = {
+     .sensor_num = 2,
+     .offset = -2794,
+     .scale = -67,
+     .ft_deviation = SUN50I_H6_FT_DEVIATION,
+     .temp_calib_base = SUN50I_H6_THS_TEMP_CALIB,
+     .temp_data_base = SUN50I_H6_THS_TEMP_DATA,
+     .calibrate = sun50i_ths_calibrate,
+     .init = sun50i_thermal_init,
+     .irq_thread = sun50i_h6_irq_thread,
+};
+
+static const struct of_device_id of_ths_match[] = {
+     { .compatible = "allwinner,sun50i-h6-ths", .data = &sun50i_h6_ths },
+     { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, of_ths_match);
+
+static struct platform_driver ths_driver = {
+     .probe = sun8i_ths_probe,
+     .remove = sun8i_ths_remove,
+     .driver = {
+             .name = "sun8i-thermal",
+             .of_match_table = of_ths_match,
+     },
+};
+module_platform_driver(ths_driver);
+
+MODULE_DESCRIPTION("Thermal sensor driver for Allwinner SOC");
+MODULE_LICENSE("GPL v2");
--

2.17.0

Quoted 9 lines
Quoted 4 lines
Quoted 4 lines

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#12 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Yangtao Li
Quoted 4 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

Hi Yangtao,

Any plans on v4 of this series?

Quoted 515 lines
---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 437 ++++++++++++++++++++++++++++++++
 4 files changed, 459 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index 2336dd26ece4..d312f9eecf0d 100644
@@ -674,6 +674,13 @@ L: [email protected]
 S:     Maintained
 F:     drivers/crypto/sunxi-ss/
 
+ALLWINNER THERMAL DRIVER
+M:     Yangtao Li <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     Documentation/devicetree/bindings/thermal/sun8i-thermal.yaml
+F:     drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:     Maxime Ripard <[email protected]>
 M:     Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +14 -0
index 9966364a6deb..e5465053d66f 100644
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
          Enable this to plug the SPEAr thermal sensor driver into the Linux
          thermal framework.
 
+config SUN8I_THERMAL
+       tristate "Allwinner sun8i thermal driver"
+       depends on ARCH_SUNXI || COMPILE_TEST
+       depends on HAS_IOMEM
+       depends on NVMEM_SUNXI_SID
+       depends on OF
+       depends on RESET_CONTROLLER
+       help
+         Support for the sun8i thermal sensor driver into the Linux thermal
+         framework.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
        tristate "Rockchip thermal driver"
        depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index 74a37c7f847a..fa6f8b206281 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y                          += broadcom/
 obj-$(CONFIG_THERMAL_MMIO)             += thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)    += spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL) += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)     += rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)        += rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +437 -1
new file mode 100644
index 000000000000..a9cc2197f4cb
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Thermal sensor driver for Allwinner SOC
+ * Copyright (C) 2019 Yangtao Li
+ *
+ * Based on the work of Icenowy Zheng <[email protected]>
+ * Based on the work of Ondrej Jirman <[email protected]>
+ * Based on the work of Josef Gajdusek <[email protected]>
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+
+#define MAX_SENSOR_NUM 4
+
+#define FT_TEMP_MASK                           GENMASK(11, 0)
+#define TEMP_CALIB_MASK                                GENMASK(11, 0)
+#define TEMP_TO_REG                            672
+#define CALIBRATE_DEFAULT                      0x800
+
+#define SUN50I_THS_CTRL0                       0x00
+#define SUN50I_H6_THS_ENABLE                   0x04
+#define SUN50I_H6_THS_PC                       0x08
+#define SUN50I_H6_THS_DIC                      0x10
+#define SUN50I_H6_THS_DIS                      0x20
+#define SUN50I_H6_THS_MFC                      0x30
+#define SUN50I_H6_THS_TEMP_CALIB               0xa0
+#define SUN50I_H6_THS_TEMP_DATA                        0xc0
+
+#define SUN50I_THS_CTRL0_T_ACQ(x)              ((GENMASK(15, 0) & (x)) << 16)
+#define SUN50I_THS_FILTER_EN                   BIT(2)
+#define SUN50I_THS_FILTER_TYPE(x)              (GENMASK(1, 0) & (x))
+#define SUN50I_H6_THS_PC_TEMP_PERIOD(x)                ((GENMASK(19, 0) & (x)) << 12)
+#define SUN50I_H6_THS_DATA_IRQ_STS(x)          BIT(x)
+
+/* millidegree celsius */
+#define SUN50I_H6_FT_DEVIATION                 7000
+
+struct ths_device;
+
+struct tsensor {
+       struct ths_device               *tmdev;
+       struct thermal_zone_device      *tzd;
+       int                             id;
+       wait_queue_head_t               wait_queue;
+};
+
+struct ths_thermal_chip {
+       int             sensor_num;
+       int             offset;
+       int             scale;
+       int             ft_deviation;
+       int             temp_calib_base;
+       int             temp_data_base;
+       int             (*calibrate)(struct ths_device *tmdev);
+       int             (*init)(struct ths_device *tmdev);
+       irqreturn_t     (*irq_thread)(int irq, void *data);
+};
+
+struct ths_device {
+       const struct ths_thermal_chip           *chip;
+       struct device                           *dev;
+       struct regmap                           *regmap;
+       struct reset_control                    *reset;
+       struct clk                              *bus_clk;
+       struct tsensor                          sensor[MAX_SENSOR_NUM];
+       int                                     data_ready;
+};
+
+/* Temp Unit: millidegree Celsius */
+static int sun8i_ths_reg2temp(struct ths_device *tmdev,
+                             int reg)
+{
+       return (reg + tmdev->chip->offset) * tmdev->chip->scale;
+}
+
+static int sun8i_ths_get_temp(void *data, int *temp)
+{
+       struct tsensor *s = data;
+       struct ths_device *tmdev = s->tmdev;
+       int val;
+
+       wait_event(s->wait_queue, tmdev->data_ready & BIT(s->id));
+       tmdev->data_ready &= ~BIT(s->id);
+
+       regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
+                   0x4 * s->id, &val);
+
+       *temp = sun8i_ths_reg2temp(tmdev, val);
+       /*
+        * XX - According to the original sdk, there are some platforms(rarely)
+        * that add a fixed offset value after calculating the temperature
+        * value. We can't simply put it on the formula for calculating the
+        * temperature above, because the formula for calculating the
+        * temperature above is also used when the sensor is calibrated. If
+        * do this, the correct calibration formula is hard to know.
+        */
+       if (tmdev->chip->ft_deviation)
+               *temp += tmdev->chip->ft_deviation;
+
+       return 0;
+}
+
+static const struct thermal_zone_of_device_ops ths_ops = {
+       .get_temp = sun8i_ths_get_temp,
+};
+
+static const struct regmap_config config = {
+       .reg_bits = 32,
+       .val_bits = 32,
+       .reg_stride = 4,
+       .fast_io = true,
+};
+
+static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+{
+       wait_queue_head_t *data_wait;
+       struct ths_device *tmdev = data;
+       int i, state;
+
+       regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
+
+       for (i = 0; i < tmdev->chip->sensor_num; i++) {
+               data_wait = &tmdev->sensor[i].wait_queue;
+
+               if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
+                       /* clear data irq pending */
+                       regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
+                                    SUN50I_H6_THS_DATA_IRQ_STS(i));
+
+                       tmdev->data_ready |= BIT(i);
+                       wake_up(data_wait);
+               }
+       }
+
+       return IRQ_HANDLED;
+}
+
+static int sun8i_ths_resource_init(struct ths_device *tmdev)
+{
+       struct device *dev = tmdev->dev;
+       struct platform_device *pdev = to_platform_device(dev);
+       struct resource *mem;
+       void __iomem *base;
+       int ret, irq;
+
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       base = devm_ioremap_resource(dev, mem);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
+
+       tmdev->regmap = devm_regmap_init_mmio(dev, base, &config);
+       if (IS_ERR(tmdev->regmap))
+               return PTR_ERR(tmdev->regmap);
+
+       tmdev->reset = devm_reset_control_get(dev, 0);
+       if (IS_ERR(tmdev->reset))
+               return PTR_ERR(tmdev->reset);
+
+       tmdev->bus_clk = devm_clk_get(&pdev->dev, "bus");
+       if (IS_ERR(tmdev->bus_clk))
+               return PTR_ERR(tmdev->bus_clk);
+
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0)
+               return irq;
+
+       ret = devm_request_threaded_irq(dev, irq, NULL,
+                                       tmdev->chip->irq_thread,
+                                       IRQF_ONESHOT, "ths", tmdev);
+       if (ret)
+               return ret;
+
+       ret = reset_control_deassert(tmdev->reset);
+       if (ret)
+               return ret;
+
+       ret = clk_prepare_enable(tmdev->bus_clk);
+       if (ret)
+               goto assert_reset;
+
+       ret = tmdev->chip->calibrate(tmdev);
+       if (ret)
+               goto bus_disable;
+
+       return 0;
+
+bus_disable:
+       clk_disable_unprepare(tmdev->bus_clk);
+assert_reset:
+       reset_control_assert(tmdev->reset);
+
+       return ret;
+}
+
+static int sun50i_ths_calibrate(struct ths_device *tmdev)
+{
+       struct nvmem_cell *calcell;
+       struct device *dev = tmdev->dev;
+       u16 *caldata;
+       size_t callen;
+       int ft_temp;
+       int i, ret = 0;
+
+       calcell = devm_nvmem_cell_get(dev, "calib");
+       if (IS_ERR(calcell)) {
+               if (PTR_ERR(calcell) == -EPROBE_DEFER)
+                       return -EPROBE_DEFER;
+               /*
+                * Even if the external calibration data stored in sid is
+                * not accessible, the THS hardware can still work, although
+                * the data won't be so accurate.
+                *
+                * The default value of calibration register is 0x800 for
+                * every sensor, and the calibration value is usually 0x7xx
+                * or 0x8xx, so they won't be away from the default value
+                * for a lot.
+                *
+                * So here we do not return error if the calibartion data is
+                * not available, except the probe needs deferring.
+                */
+               goto out;
+       }
+
+       caldata = nvmem_cell_read(calcell, &callen);
+       if (IS_ERR(caldata)) {
+               ret = PTR_ERR(caldata);
+               goto out;
+       }
+
+       if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
+               ret = -EINVAL;
+               goto out_free;
+       }
+
+       /*
+        * efuse layout:
+        *
+        *      0   11  16       32
+        *      +-------+-------+-------+
+        *      |temp|  |sensor0|sensor1|
+        *      +-------+-------+-------+
+        *
+        * The calibration data on the H6 is the ambient temperature and
+        * sensor values that are filled during the factory test stage.
+        *
+        * The unit of stored FT temperature is 0.1 degreee celusis.
+        * Through the stored ambient temperature and the data read
+        * by the sensor, after a certain calculation, the calibration
+        * value to be compensated can be obtained.
+        */
+       ft_temp = caldata[0] & FT_TEMP_MASK;
+
+       for (i = 0; i < tmdev->chip->sensor_num; i++) {
+               int reg = (int)caldata[i + 1];
+               int sensor_temp = sun8i_ths_reg2temp(tmdev, reg);
+               int delta, cdata, calib_offest;
+
+               /*
+                * To calculate the calibration value:
+                *
+                * X(in Celsius) = Ts - ft_temp
+                * delta = X * 10000 / TEMP_TO_REG
+                * cdata = CALIBRATE_DEFAULT - delta
+                *
+                * cdata: calibration value
+                */
+               delta = (sensor_temp - ft_temp * 100) * 10 / TEMP_TO_REG;
+               cdata = CALIBRATE_DEFAULT - delta;
+               if (cdata & ~TEMP_CALIB_MASK) {
+                       /*
+                        * Calibration value more than 12-bit, but calibration
+                        * register is 12-bit. In this case, ths hardware can
+                        * still work without calibration, although the data
+                        * won't be so accurate.
+                        */
+                       dev_warn(dev, "sensor%d is not calibrated.\n", i);
+
+                       continue;
+               }
+
+               calib_offest = tmdev->chip->temp_calib_base + (i / 2) * 0x4;
+
+               if (i % 2) {
+                       int val;
+
+                       regmap_read(tmdev->regmap, calib_offest, &val);
+                       val = (val & TEMP_CALIB_MASK) | (cdata << 16);
+                       regmap_write(tmdev->regmap, calib_offest, val);
+               } else {
+                       regmap_write(tmdev->regmap, calib_offest, cdata);
+               }
+       }
+
+out_free:
+       kfree(caldata);
+out:
+       return ret;
+}
+
+static int sun8i_ths_register(struct ths_device *tmdev)
+{
+       struct thermal_zone_device *tzd;
+       int i;
+
+       for (i = 0; i < tmdev->chip->sensor_num; i++) {
+               tmdev->sensor[i].tmdev = tmdev;
+               tmdev->sensor[i].id = i;
+               tmdev->sensor[i].tzd =
+                       devm_thermal_zone_of_sensor_register(tmdev->dev,
+                                                            i,
+                                                            &tmdev->sensor[i],
+                                                            &ths_ops);
+               if (IS_ERR(tmdev->sensor[i].tzd))
+                       return PTR_ERR(tzd);
+       }
+
+       return 0;
+}
+
+static int sun8i_ths_probe(struct platform_device *pdev)
+{
+       struct ths_device *tmdev;
+       struct device *dev = &pdev->dev;
+       int i, ret;
+
+       tmdev = devm_kzalloc(dev, sizeof(*tmdev), GFP_KERNEL);
+       if (!tmdev)
+               return -ENOMEM;
+
+       tmdev->dev = dev;
+       tmdev->chip = of_device_get_match_data(&pdev->dev);
+       if (!tmdev->chip)
+               return -EINVAL;
+
+       /*
+        * Initialize wait_queue in advance, to avoid calling wake_up
+        * before ths is registered in isr.
+        */
+       for (i = 0; i < tmdev->chip->sensor_num; i++)
+               init_waitqueue_head(&tmdev->sensor[i].wait_queue);
+
+       platform_set_drvdata(pdev, tmdev);
+
+       ret = sun8i_ths_resource_init(tmdev);
+       if (ret)
+               return ret;
+
+       ret = tmdev->chip->init(tmdev);
+       if (ret)
+               return ret;
+
+       ret = sun8i_ths_register(tmdev);
+       if (ret)
+               return ret;
+
+       return ret;
+}
+
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+       struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+       clk_disable_unprepare(tmdev->bus_clk);
+       reset_control_assert(tmdev->reset);
+
+       return 0;
+}
+
+static int sun50i_thermal_init(struct ths_device *tmdev)
+{
+       int val;
+
+       /*
+        * clkin = 24MHz
+        * T acquire = clkin / (x + 1)
+        *           = 20us
+        */
+       regmap_write(tmdev->regmap, SUN50I_THS_CTRL0,
+                    SUN50I_THS_CTRL0_T_ACQ(479));
+       /* average over 4 samples */
+       regmap_write(tmdev->regmap, SUN50I_H6_THS_MFC,
+                    SUN50I_THS_FILTER_EN |
+                    SUN50I_THS_FILTER_TYPE(1));
+       /* period = (x + 1) * 4096 / clkin; ~10ms */
+       regmap_write(tmdev->regmap, SUN50I_H6_THS_PC,
+                    SUN50I_H6_THS_PC_TEMP_PERIOD(58));
+       /* enable sensor */
+       val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+       regmap_write(tmdev->regmap, SUN50I_H6_THS_ENABLE, val);
+       /* thermal data interrupt enable */
+       val = GENMASK(tmdev->chip->sensor_num - 1, 0);
+       regmap_write(tmdev->regmap, SUN50I_H6_THS_DIC, val);
+
+       return 0;
+}
+
+static const struct ths_thermal_chip sun50i_h6_ths = {
+       .sensor_num = 2,
+       .offset = -2794,
+       .scale = -67,
+       .ft_deviation = SUN50I_H6_FT_DEVIATION,
+       .temp_calib_base = SUN50I_H6_THS_TEMP_CALIB,
+       .temp_data_base = SUN50I_H6_THS_TEMP_DATA,
+       .calibrate = sun50i_ths_calibrate,
+       .init = sun50i_thermal_init,
+       .irq_thread = sun50i_h6_irq_thread,
+};
+
+static const struct of_device_id of_ths_match[] = {
+       { .compatible = "allwinner,sun50i-h6-ths", .data = &sun50i_h6_ths },
+       { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, of_ths_match);
+
+static struct platform_driver ths_driver = {
+       .probe = sun8i_ths_probe,
+       .remove = sun8i_ths_remove,
+       .driver = {
+               .name = "sun8i-thermal",
+               .of_match_table = of_ths_match,
+       },
+};
+module_platform_driver(ths_driver);
+
+MODULE_DESCRIPTION("Thermal sensor driver for Allwinner SOC");
+MODULE_LICENSE("GPL v2");
--

2.17.0

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer
#13 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

Quoted 11 lines · Vasily Khoruzhick
Quoted 4 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

Hi Yangtao,

Any plans on v4 of this series?

I am waiting for comment from Maxime.

I’ll support both h3 and h6 in v4.

Yangtao

#14 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

Quoted 9 lines · Frank Lee
Quoted 7 lines · Vasily Khoruzhick
Quoted 4 lines · Yangtao Li

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

Quoted 8 lines
Quoted 4 lines

Hi Yangtao,

Any plans on v4 of this series?

I am waiting for comment from Maxime.

I’ll support both h3 and h6 in v4.

If you have a git tree I'll be happy to contribute A64 support. IIRC it was quite similar to H3.

Quoted 1 line

Yangtao

#4 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Frank Lee
Quoted 10 lines · Frank Lee
Quoted 7 lines · Maxime Ripard

drivers/thermal/sun8i_thermal.c line 182

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+     ret = devm_request_threaded_irq(dev, irq, NULL,
+                                     tmdev->chip->irq_thread,
+                                     IRQF_ONESHOT, "ths", tmdev);
+     if (ret)
+             return ret;

Is there any particular reason to use a threaded interrupt?

Just to improve real-time.

What do you mean by real-time here? If anything, that will increase the latency of the interrupts here.

And in preempt-rt, regular top-half interrupts will be forced into a threaded interrupt anyway.

Quoted 10 lines
Quoted 9 lines

drivers/thermal/sun8i_thermal.c line 374

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+     struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+     clk_disable_unprepare(tmdev->bus_clk);

I know that we discussed that already, but I'm not sure why you switch back to a regular call to regmap_init_mmio, while regmap_init_mmio_clk will take care of enabling and disabling the bus clock for you?

Quoted 2 lines

It seems that regmap_init_mmio_clk just get clk and prepare clk but no enable.

At init time, yes. But it will enable it only when you access the registers, which is what you want anyway.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer
#5 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Maxime Ripard
Quoted 29 lines · Maxime Ripard
Quoted 10 lines · Frank Lee
Quoted 7 lines · Maxime Ripard

drivers/thermal/sun8i_thermal.c line 182

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+     ret = devm_request_threaded_irq(dev, irq, NULL,
+                                     tmdev->chip->irq_thread,
+                                     IRQF_ONESHOT, "ths", tmdev);
+     if (ret)
+             return ret;

Is there any particular reason to use a threaded interrupt?

Just to improve real-time.

What do you mean by real-time here? If anything, that will increase the latency of the interrupts here.

And in preempt-rt, regular top-half interrupts will be forced into a threaded interrupt anyway.

Quoted 10 lines
Quoted 9 lines

drivers/thermal/sun8i_thermal.c line 374

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+     struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+     clk_disable_unprepare(tmdev->bus_clk);

I know that we discussed that already, but I'm not sure why you switch back to a regular call to regmap_init_mmio, while regmap_init_mmio_clk will take care of enabling and disabling the bus clock for you?

Quoted 5 lines
Quoted 2 lines

It seems that regmap_init_mmio_clk just get clk and prepare clk but no enable.

At init time, yes. But it will enable it only when you access the registers, which is what you want anyway.

But after accessing the register, it turns the clock off, which affects the ad conversion and the occurrence of the interrupt.

In addition, when resuming from suspend, we need to enable the clock, so I think it is necessary to have a clock pointer.

Yangtao

Quoted 7 lines

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#6 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

Hi,

Quoted 30 lines · Frank Lee
Quoted 29 lines · Maxime Ripard
Quoted 10 lines · Frank Lee
Quoted 7 lines · Maxime Ripard

drivers/thermal/sun8i_thermal.c line 182

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+     ret = devm_request_threaded_irq(dev, irq, NULL,
+                                     tmdev->chip->irq_thread,
+                                     IRQF_ONESHOT, "ths", tmdev);
+     if (ret)
+             return ret;

Is there any particular reason to use a threaded interrupt?

Just to improve real-time.

What do you mean by real-time here? If anything, that will increase the latency of the interrupts here.

And in preempt-rt, regular top-half interrupts will be forced into a threaded interrupt anyway.

Quoted 10 lines
Quoted 9 lines

drivers/thermal/sun8i_thermal.c line 374

Quoted 5 lines
drivers/thermal/sun8i_thermal.c new file +5 -0
+static int sun8i_ths_remove(struct platform_device *pdev)
+{
+     struct ths_device *tmdev = platform_get_drvdata(pdev);
+
+     clk_disable_unprepare(tmdev->bus_clk);

I know that we discussed that already, but I'm not sure why you switch back to a regular call to regmap_init_mmio, while regmap_init_mmio_clk will take care of enabling and disabling the bus clock for you?

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

It seems that regmap_init_mmio_clk just get clk and prepare clk but no enable.

At init time, yes. But it will enable it only when you access the registers, which is what you want anyway.

But after accessing the register, it turns the clock off, which affects the ad conversion and the occurrence of the interrupt.

Ah, so that's how it works. Yeah, it makes sense then.

Quoted 2 lines

In addition, when resuming from suspend, we need to enable the clock, so I think it is necessary to have a clock pointer.

Yep, indeed.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

author maintainer
#17 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

Quoted 11 lines · Vasily Khoruzhick
Quoted 7 lines · Frank Lee
Quoted 3 lines

If you have a git tree I'll be happy to contribute A64 support. IIRC it was quite similar to H3.

I built a ths branch and I will do some work later.

https://github.com/TinyWindzz/linux/tree/ths

Looks like you forgot to add your patches to this branch.

Frankly, I started the new version this weekend. There is still a small part of the
hand that has not been completed, and I will push patches to my branch these two days.

MBR,
Yangtao

author maintainer
#18 lore raw

Re: [PATCH v3 1/3] thermal: sun8i: add thermal driver for h6

In reply to Vasily Khoruzhick
Quoted 11 lines · Vasily Khoruzhick
Quoted 7 lines · Frank Lee
Quoted 3 lines

If you have a git tree I'll be happy to contribute A64 support. IIRC it was quite similar to H3.

I built a ths branch and I will do some work later.

https://github.com/TinyWindzz/linux/tree/ths

Looks like you forgot to add your patches to this branch.

Done.