* [PATCH 0/4] add UniPhier thermal support
@ 2017-05-29 9:15 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: rui.zhang, edubezval
Cc: linux-pm, linux-arm-kernel, linux-kernel, robh+dt, mark.rutland,
devicetree, yamada.masahiro, masami.hiramatsu, jaswinder.singh,
Kunihiko Hayashi
This patch series adds support for thermal monitor implemented on UniPhier LD20
and PXs2 SoCs. This driver supports temperature monitoring and alert function.
Kunihiko Hayashi (4):
thermal: uniphier: add UniPhier thermal driver
dt-bindings: thermal: add binding documentation for UniPhier thermal
monitor
ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for
PXs2
arm64: dts: uniphier: add nodes of thermal monitor and thermal zone
for LD20
.../bindings/thermal/uniphier-thermal.txt | 54 +++
arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 ++
arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 ++
arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 +
.../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 25 ++
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 6 +
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++
9 files changed, 532 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
create mode 100644 drivers/thermal/uniphier_thermal.c
--
2.7.4
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 0/4] add UniPhier thermal support
@ 2017-05-29 9:15 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: linux-arm-kernel
This patch series adds support for thermal monitor implemented on UniPhier LD20
and PXs2 SoCs. This driver supports temperature monitoring and alert function.
Kunihiko Hayashi (4):
thermal: uniphier: add UniPhier thermal driver
dt-bindings: thermal: add binding documentation for UniPhier thermal
monitor
ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for
PXs2
arm64: dts: uniphier: add nodes of thermal monitor and thermal zone
for LD20
.../bindings/thermal/uniphier-thermal.txt | 54 +++
arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 ++
arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 ++
arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 +
.../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 25 ++
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 6 +
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++
9 files changed, 532 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
create mode 100644 drivers/thermal/uniphier_thermal.c
--
2.7.4
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
2017-05-29 9:15 ` Kunihiko Hayashi
(?)
@ 2017-05-29 9:15 ` Kunihiko Hayashi
-1 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: rui.zhang, edubezval
Cc: linux-pm, linux-arm-kernel, linux-kernel, robh+dt, mark.rutland,
devicetree, yamada.masahiro, masami.hiramatsu, jaswinder.singh,
Kunihiko Hayashi
Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
monitoring unit implemented on UniPhier SoCs. This driver supports
temperature monitoring and alert function.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
3 files changed, 399 insertions(+)
create mode 100644 drivers/thermal/uniphier_thermal.c
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 776b343..93ccf25 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -453,4 +453,12 @@ config ZX2967_THERMAL
the primitive temperature sensor embedded in zx2967 SoCs.
This sensor generates the real time die temperature.
+config UNIPHIER_THERMAL
+ tristate "Socionext UniPhier thermal driver"
+ depends on ARCH_UNIPHIER || COMPILE_TEST
+ help
+ Enable this to support thermal reporting on UniPhier SoC.
+ This driver supports CPU thermal zone to reports the temperture
+ and trip points.
+
endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 7adae20..05b6e7c 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -58,3 +58,4 @@ 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
+obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
new file mode 100644
index 0000000..ae7e5ce
--- /dev/null
+++ b/drivers/thermal/uniphier_thermal.c
@@ -0,0 +1,390 @@
+/**
+ * uniphier_thermal.c - Socionext UniPhier thermal driver
+ *
+ * Copyright 2014 Panasonic Corporation
+ * Copyright 2016 Socionext Inc.
+ * All rights reserved.
+ *
+ * Author:
+ * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 of
+ * the License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/bitops.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/thermal.h>
+
+#include "thermal_core.h"
+
+/*
+ * block registers
+ * addresses are the offset from .block_base
+ */
+#define PVTCTLEN 0x0000
+#define PVTCTLEN_EN BIT(0)
+
+#define PVTCTLMODE 0x0004
+#define PVTCTLMODE_MASK 0xf
+#define PVTCTLMODE_TEMPMON 0x5
+
+#define EMONREPEAT 0x0040
+#define EMONREPEAT_ENDLESS BIT(24)
+#define EMONREPEAT_PERIOD 0xf
+#define EMONREPEAT_PERIOD_1000000 0x9
+
+/*
+ * common registers
+ * addresses are the offset from .map_base
+ */
+#define PVTCTLSEL 0x0900
+#define PVTCTLSEL_MASK 0x7
+#define PVTCTLSEL_MONITOR 0
+
+#define SETALERT0 0x0910
+#define SETALERT1 0x0914
+#define SETALERT2 0x0918
+#define SETALERT_TEMP_OVF (0xff << 16)
+#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
+#define SETALERT_EN BIT(0)
+
+#define PMALERTINTCTL 0x0920
+#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
+#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
+#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
+#define PMALERTINTCTL_MASK 0x777
+
+#define TMOD 0x0928
+#define TMOD_MASK 0x1ff
+
+#define TMODCOEF 0x0e5c
+
+#define TMODSETUP0_EN BIT(30)
+#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
+#define TMODSETUP1_EN BIT(15)
+#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
+
+/* SoC critical temperature is 95 degrees Celsius */
+#define CRITICAL_TEMP_LIMIT (95 * 1000)
+
+/* Max # of alert channels */
+#define ALERT_CH_NUM 3
+
+/* SoC specific thermal sensor data */
+struct uniphier_tm_soc_data {
+ u32 map_base;
+ u32 block_base;
+ u32 tmod_setup_addr;
+};
+
+struct uniphier_tm_dev {
+ struct regmap *regmap;
+ bool alert_en[ALERT_CH_NUM];
+ u32 tmod_calib0;
+ u32 tmod_calib1;
+ struct thermal_zone_device *tz_dev;
+ const struct uniphier_tm_soc_data *data;
+};
+
+static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+ u32 val;
+ int ret;
+
+ /* stop PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, 0);
+
+ /*
+ * set default value if missing calibrated value
+ *
+ * Since SoC has a calibrated value that was set in advance,
+ * TMODCOEF shows non-zero and PVT refers the value internally.
+ *
+ * However, there is the case that some SoCs might not have the
+ * calibrated value. In that case, TMODCOEF shows zero and the driver
+ * has to set default value manually.
+ */
+ ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
+ if (ret)
+ return ret;
+ if (!val)
+ regmap_write(map,
+ tdev->data->tmod_setup_addr,
+ TMODSETUP0_EN |
+ TMODSETUP0_VAL(tdev->tmod_calib0) |
+ TMODSETUP1_EN |
+ TMODSETUP1_VAL(tdev->tmod_calib1));
+
+ /* select temperature mode */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLMODE,
+ PVTCTLMODE_MASK,
+ PVTCTLMODE_TEMPMON);
+
+ /* set monitoring period */
+ regmap_write_bits(map,
+ tdev->data->block_base + EMONREPEAT,
+ EMONREPEAT_ENDLESS |
+ EMONREPEAT_PERIOD,
+ EMONREPEAT_ENDLESS |
+ EMONREPEAT_PERIOD_1000000);
+
+ /* set monitor mode */
+ regmap_write_bits(map,
+ tdev->data->map_base + PVTCTLSEL,
+ PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
+
+ return 0;
+}
+
+static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
+ u32 temp)
+{
+ struct regmap *map = tdev->regmap;
+
+ /* set alert temperature */
+ regmap_write_bits(map,
+ tdev->data->map_base + SETALERT0 + (ch << 2),
+ SETALERT_EN |
+ SETALERT_TEMP_OVF,
+ SETALERT_EN |
+ SETALERT_TEMP_OVF_VALUE(temp / 1000));
+}
+
+static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+ int i;
+ u32 bits = 0;
+
+ for (i = 0; i < ALERT_CH_NUM; i++)
+ if (tdev->alert_en[i])
+ bits |= PMALERTINTCTL_EN(i);
+
+ /* enable alert interrupt */
+ regmap_write_bits(map,
+ tdev->data->map_base + PMALERTINTCTL,
+ PMALERTINTCTL_MASK, bits);
+
+ /* start PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, PVTCTLEN_EN);
+}
+
+static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+
+ /* disable alert interrupt */
+ regmap_write_bits(map,
+ tdev->data->map_base + PMALERTINTCTL,
+ PMALERTINTCTL_MASK, 0);
+
+ /* stop PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, 0);
+}
+
+static int uniphier_tm_get_temp(void *data, int *out_temp)
+{
+ struct uniphier_tm_dev *tdev = data;
+ struct regmap *map = tdev->regmap;
+ int ret;
+ u32 temp;
+
+ ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
+ if (ret)
+ return ret;
+
+ temp &= TMOD_MASK;
+ *out_temp = temp * 1000; /* millicelsius */
+
+ return 0;
+}
+
+static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
+ .get_temp = uniphier_tm_get_temp,
+};
+
+static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
+{
+ u32 mask = 0, bits = 0;
+ int i;
+
+ for (i = 0; i < ALERT_CH_NUM; i++) {
+ mask |= (PMALERTINTCTL_CLR(i) |
+ PMALERTINTCTL_SET(i));
+ bits |= PMALERTINTCTL_CLR(i);
+ }
+
+ /* clear alert interrupt */
+ regmap_write_bits(tdev->regmap,
+ tdev->data->map_base + PMALERTINTCTL, mask, bits);
+}
+
+static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
+{
+ struct uniphier_tm_dev *tdev = _tdev;
+
+ uniphier_tm_irq_clear(tdev);
+ thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
+
+ return IRQ_HANDLED;
+}
+
+static int uniphier_tm_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct regmap *regmap;
+ struct device_node *parent;
+ struct uniphier_tm_dev *tdev;
+ const struct thermal_trip *trips;
+ const u32 *calib;
+ int i, ret, irq, ntrips, crit_temp = INT_MAX;
+
+ tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
+ if (!tdev)
+ return -ENOMEM;
+
+ tdev->data = of_device_get_match_data(dev);
+ if (WARN_ON(!tdev->data))
+ return -EINVAL;
+
+ /* get irq */
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0)
+ return irq;
+
+ /* get tmod-calibration values */
+ calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
+ NULL);
+ if (calib) {
+ tdev->tmod_calib0 = of_read_number(calib, 1);
+ tdev->tmod_calib1 = of_read_number(calib + 1, 1);
+ }
+
+ /* get regmap from syscon node */
+ parent = of_get_parent(dev->of_node); /* parent should be syscon node */
+ regmap = syscon_node_to_regmap(parent);
+ of_node_put(parent);
+ if (IS_ERR(regmap)) {
+ dev_err(dev, "failed to get regmap (error %ld)\n",
+ PTR_ERR(regmap));
+ return PTR_ERR(regmap);
+ }
+ tdev->regmap = regmap;
+
+ /* register sensor */
+ tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
+ &uniphier_of_thermal_ops);
+ if (IS_ERR(tdev->tz_dev)) {
+ dev_err(dev, "failed to register sensor device\n");
+ return PTR_ERR(tdev->tz_dev);
+ }
+
+ /* get trip points */
+ trips = of_thermal_get_trip_points(tdev->tz_dev);
+ ntrips = of_thermal_get_ntrips(tdev->tz_dev);
+ if (ntrips > ALERT_CH_NUM) {
+ dev_err(dev, "thermal zone has too many trips\n");
+ return -E2BIG;
+ }
+
+ /* initialize sensor */
+ ret = uniphier_tm_initialize_sensor(tdev);
+ if (ret) {
+ dev_err(dev, "failed to initialize sensor\n");
+ return ret;
+ }
+ for (i = 0; i < ntrips; i++) {
+ if (trips[i].type == THERMAL_TRIP_CRITICAL &&
+ trips[i].temperature < crit_temp)
+ crit_temp = trips[i].temperature;
+ uniphier_tm_set_alert(tdev, i, trips[i].temperature);
+ tdev->alert_en[i] = true;
+ }
+ if (crit_temp > CRITICAL_TEMP_LIMIT) {
+ dev_err(dev, "critical trip is over limit(>%d), or not set\n",
+ CRITICAL_TEMP_LIMIT);
+ return -EINVAL;
+ }
+
+ ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
+ 0, "thermal", tdev);
+ if (ret)
+ return ret;
+
+ /* enable sensor */
+ uniphier_tm_enable_sensor(tdev);
+
+ platform_set_drvdata(pdev, tdev);
+
+ return 0;
+}
+
+static int uniphier_tm_remove(struct platform_device *pdev)
+{
+ struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
+
+ /* disable sensor */
+ uniphier_tm_disable_sensor(tdev);
+
+ return 0;
+}
+
+static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
+ .map_base = 0xe000,
+ .block_base = 0xe000,
+ .tmod_setup_addr = 0xe904,
+};
+
+static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
+ .map_base = 0xe000,
+ .block_base = 0xe800,
+ .tmod_setup_addr = 0xe938,
+};
+
+static const struct of_device_id uniphier_tm_dt_ids[] = {
+ {
+ .compatible = "socionext,uniphier-pxs2-thermal",
+ .data = &uniphier_pxs2_tm_data,
+ },
+ {
+ .compatible = "socionext,uniphier-ld20-thermal",
+ .data = &uniphier_ld20_tm_data,
+ },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
+
+static struct platform_driver uniphier_tm_driver = {
+ .probe = uniphier_tm_probe,
+ .remove = uniphier_tm_remove,
+ .driver = {
+ .name = "uniphier-thermal",
+ .of_match_table = uniphier_tm_dt_ids,
+ },
+};
+module_platform_driver(uniphier_tm_driver);
+
+MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
+MODULE_DESCRIPTION("UniPhier thermal driver");
+MODULE_LICENSE("GPL v2");
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-29 9:15 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: rui.zhang, edubezval
Cc: mark.rutland, devicetree, Kunihiko Hayashi, masami.hiramatsu,
linux-pm, linux-kernel, yamada.masahiro, robh+dt,
jaswinder.singh, linux-arm-kernel
Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
monitoring unit implemented on UniPhier SoCs. This driver supports
temperature monitoring and alert function.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
3 files changed, 399 insertions(+)
create mode 100644 drivers/thermal/uniphier_thermal.c
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 776b343..93ccf25 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -453,4 +453,12 @@ config ZX2967_THERMAL
the primitive temperature sensor embedded in zx2967 SoCs.
This sensor generates the real time die temperature.
+config UNIPHIER_THERMAL
+ tristate "Socionext UniPhier thermal driver"
+ depends on ARCH_UNIPHIER || COMPILE_TEST
+ help
+ Enable this to support thermal reporting on UniPhier SoC.
+ This driver supports CPU thermal zone to reports the temperture
+ and trip points.
+
endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 7adae20..05b6e7c 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -58,3 +58,4 @@ 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
+obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
new file mode 100644
index 0000000..ae7e5ce
--- /dev/null
+++ b/drivers/thermal/uniphier_thermal.c
@@ -0,0 +1,390 @@
+/**
+ * uniphier_thermal.c - Socionext UniPhier thermal driver
+ *
+ * Copyright 2014 Panasonic Corporation
+ * Copyright 2016 Socionext Inc.
+ * All rights reserved.
+ *
+ * Author:
+ * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 of
+ * the License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/bitops.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/thermal.h>
+
+#include "thermal_core.h"
+
+/*
+ * block registers
+ * addresses are the offset from .block_base
+ */
+#define PVTCTLEN 0x0000
+#define PVTCTLEN_EN BIT(0)
+
+#define PVTCTLMODE 0x0004
+#define PVTCTLMODE_MASK 0xf
+#define PVTCTLMODE_TEMPMON 0x5
+
+#define EMONREPEAT 0x0040
+#define EMONREPEAT_ENDLESS BIT(24)
+#define EMONREPEAT_PERIOD 0xf
+#define EMONREPEAT_PERIOD_1000000 0x9
+
+/*
+ * common registers
+ * addresses are the offset from .map_base
+ */
+#define PVTCTLSEL 0x0900
+#define PVTCTLSEL_MASK 0x7
+#define PVTCTLSEL_MONITOR 0
+
+#define SETALERT0 0x0910
+#define SETALERT1 0x0914
+#define SETALERT2 0x0918
+#define SETALERT_TEMP_OVF (0xff << 16)
+#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
+#define SETALERT_EN BIT(0)
+
+#define PMALERTINTCTL 0x0920
+#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
+#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
+#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
+#define PMALERTINTCTL_MASK 0x777
+
+#define TMOD 0x0928
+#define TMOD_MASK 0x1ff
+
+#define TMODCOEF 0x0e5c
+
+#define TMODSETUP0_EN BIT(30)
+#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
+#define TMODSETUP1_EN BIT(15)
+#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
+
+/* SoC critical temperature is 95 degrees Celsius */
+#define CRITICAL_TEMP_LIMIT (95 * 1000)
+
+/* Max # of alert channels */
+#define ALERT_CH_NUM 3
+
+/* SoC specific thermal sensor data */
+struct uniphier_tm_soc_data {
+ u32 map_base;
+ u32 block_base;
+ u32 tmod_setup_addr;
+};
+
+struct uniphier_tm_dev {
+ struct regmap *regmap;
+ bool alert_en[ALERT_CH_NUM];
+ u32 tmod_calib0;
+ u32 tmod_calib1;
+ struct thermal_zone_device *tz_dev;
+ const struct uniphier_tm_soc_data *data;
+};
+
+static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+ u32 val;
+ int ret;
+
+ /* stop PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, 0);
+
+ /*
+ * set default value if missing calibrated value
+ *
+ * Since SoC has a calibrated value that was set in advance,
+ * TMODCOEF shows non-zero and PVT refers the value internally.
+ *
+ * However, there is the case that some SoCs might not have the
+ * calibrated value. In that case, TMODCOEF shows zero and the driver
+ * has to set default value manually.
+ */
+ ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
+ if (ret)
+ return ret;
+ if (!val)
+ regmap_write(map,
+ tdev->data->tmod_setup_addr,
+ TMODSETUP0_EN |
+ TMODSETUP0_VAL(tdev->tmod_calib0) |
+ TMODSETUP1_EN |
+ TMODSETUP1_VAL(tdev->tmod_calib1));
+
+ /* select temperature mode */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLMODE,
+ PVTCTLMODE_MASK,
+ PVTCTLMODE_TEMPMON);
+
+ /* set monitoring period */
+ regmap_write_bits(map,
+ tdev->data->block_base + EMONREPEAT,
+ EMONREPEAT_ENDLESS |
+ EMONREPEAT_PERIOD,
+ EMONREPEAT_ENDLESS |
+ EMONREPEAT_PERIOD_1000000);
+
+ /* set monitor mode */
+ regmap_write_bits(map,
+ tdev->data->map_base + PVTCTLSEL,
+ PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
+
+ return 0;
+}
+
+static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
+ u32 temp)
+{
+ struct regmap *map = tdev->regmap;
+
+ /* set alert temperature */
+ regmap_write_bits(map,
+ tdev->data->map_base + SETALERT0 + (ch << 2),
+ SETALERT_EN |
+ SETALERT_TEMP_OVF,
+ SETALERT_EN |
+ SETALERT_TEMP_OVF_VALUE(temp / 1000));
+}
+
+static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+ int i;
+ u32 bits = 0;
+
+ for (i = 0; i < ALERT_CH_NUM; i++)
+ if (tdev->alert_en[i])
+ bits |= PMALERTINTCTL_EN(i);
+
+ /* enable alert interrupt */
+ regmap_write_bits(map,
+ tdev->data->map_base + PMALERTINTCTL,
+ PMALERTINTCTL_MASK, bits);
+
+ /* start PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, PVTCTLEN_EN);
+}
+
+static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+
+ /* disable alert interrupt */
+ regmap_write_bits(map,
+ tdev->data->map_base + PMALERTINTCTL,
+ PMALERTINTCTL_MASK, 0);
+
+ /* stop PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, 0);
+}
+
+static int uniphier_tm_get_temp(void *data, int *out_temp)
+{
+ struct uniphier_tm_dev *tdev = data;
+ struct regmap *map = tdev->regmap;
+ int ret;
+ u32 temp;
+
+ ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
+ if (ret)
+ return ret;
+
+ temp &= TMOD_MASK;
+ *out_temp = temp * 1000; /* millicelsius */
+
+ return 0;
+}
+
+static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
+ .get_temp = uniphier_tm_get_temp,
+};
+
+static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
+{
+ u32 mask = 0, bits = 0;
+ int i;
+
+ for (i = 0; i < ALERT_CH_NUM; i++) {
+ mask |= (PMALERTINTCTL_CLR(i) |
+ PMALERTINTCTL_SET(i));
+ bits |= PMALERTINTCTL_CLR(i);
+ }
+
+ /* clear alert interrupt */
+ regmap_write_bits(tdev->regmap,
+ tdev->data->map_base + PMALERTINTCTL, mask, bits);
+}
+
+static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
+{
+ struct uniphier_tm_dev *tdev = _tdev;
+
+ uniphier_tm_irq_clear(tdev);
+ thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
+
+ return IRQ_HANDLED;
+}
+
+static int uniphier_tm_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct regmap *regmap;
+ struct device_node *parent;
+ struct uniphier_tm_dev *tdev;
+ const struct thermal_trip *trips;
+ const u32 *calib;
+ int i, ret, irq, ntrips, crit_temp = INT_MAX;
+
+ tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
+ if (!tdev)
+ return -ENOMEM;
+
+ tdev->data = of_device_get_match_data(dev);
+ if (WARN_ON(!tdev->data))
+ return -EINVAL;
+
+ /* get irq */
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0)
+ return irq;
+
+ /* get tmod-calibration values */
+ calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
+ NULL);
+ if (calib) {
+ tdev->tmod_calib0 = of_read_number(calib, 1);
+ tdev->tmod_calib1 = of_read_number(calib + 1, 1);
+ }
+
+ /* get regmap from syscon node */
+ parent = of_get_parent(dev->of_node); /* parent should be syscon node */
+ regmap = syscon_node_to_regmap(parent);
+ of_node_put(parent);
+ if (IS_ERR(regmap)) {
+ dev_err(dev, "failed to get regmap (error %ld)\n",
+ PTR_ERR(regmap));
+ return PTR_ERR(regmap);
+ }
+ tdev->regmap = regmap;
+
+ /* register sensor */
+ tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
+ &uniphier_of_thermal_ops);
+ if (IS_ERR(tdev->tz_dev)) {
+ dev_err(dev, "failed to register sensor device\n");
+ return PTR_ERR(tdev->tz_dev);
+ }
+
+ /* get trip points */
+ trips = of_thermal_get_trip_points(tdev->tz_dev);
+ ntrips = of_thermal_get_ntrips(tdev->tz_dev);
+ if (ntrips > ALERT_CH_NUM) {
+ dev_err(dev, "thermal zone has too many trips\n");
+ return -E2BIG;
+ }
+
+ /* initialize sensor */
+ ret = uniphier_tm_initialize_sensor(tdev);
+ if (ret) {
+ dev_err(dev, "failed to initialize sensor\n");
+ return ret;
+ }
+ for (i = 0; i < ntrips; i++) {
+ if (trips[i].type == THERMAL_TRIP_CRITICAL &&
+ trips[i].temperature < crit_temp)
+ crit_temp = trips[i].temperature;
+ uniphier_tm_set_alert(tdev, i, trips[i].temperature);
+ tdev->alert_en[i] = true;
+ }
+ if (crit_temp > CRITICAL_TEMP_LIMIT) {
+ dev_err(dev, "critical trip is over limit(>%d), or not set\n",
+ CRITICAL_TEMP_LIMIT);
+ return -EINVAL;
+ }
+
+ ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
+ 0, "thermal", tdev);
+ if (ret)
+ return ret;
+
+ /* enable sensor */
+ uniphier_tm_enable_sensor(tdev);
+
+ platform_set_drvdata(pdev, tdev);
+
+ return 0;
+}
+
+static int uniphier_tm_remove(struct platform_device *pdev)
+{
+ struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
+
+ /* disable sensor */
+ uniphier_tm_disable_sensor(tdev);
+
+ return 0;
+}
+
+static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
+ .map_base = 0xe000,
+ .block_base = 0xe000,
+ .tmod_setup_addr = 0xe904,
+};
+
+static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
+ .map_base = 0xe000,
+ .block_base = 0xe800,
+ .tmod_setup_addr = 0xe938,
+};
+
+static const struct of_device_id uniphier_tm_dt_ids[] = {
+ {
+ .compatible = "socionext,uniphier-pxs2-thermal",
+ .data = &uniphier_pxs2_tm_data,
+ },
+ {
+ .compatible = "socionext,uniphier-ld20-thermal",
+ .data = &uniphier_ld20_tm_data,
+ },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
+
+static struct platform_driver uniphier_tm_driver = {
+ .probe = uniphier_tm_probe,
+ .remove = uniphier_tm_remove,
+ .driver = {
+ .name = "uniphier-thermal",
+ .of_match_table = uniphier_tm_dt_ids,
+ },
+};
+module_platform_driver(uniphier_tm_driver);
+
+MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
+MODULE_DESCRIPTION("UniPhier thermal driver");
+MODULE_LICENSE("GPL v2");
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-29 9:15 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: linux-arm-kernel
Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
monitoring unit implemented on UniPhier SoCs. This driver supports
temperature monitoring and alert function.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
3 files changed, 399 insertions(+)
create mode 100644 drivers/thermal/uniphier_thermal.c
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 776b343..93ccf25 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -453,4 +453,12 @@ config ZX2967_THERMAL
the primitive temperature sensor embedded in zx2967 SoCs.
This sensor generates the real time die temperature.
+config UNIPHIER_THERMAL
+ tristate "Socionext UniPhier thermal driver"
+ depends on ARCH_UNIPHIER || COMPILE_TEST
+ help
+ Enable this to support thermal reporting on UniPhier SoC.
+ This driver supports CPU thermal zone to reports the temperture
+ and trip points.
+
endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 7adae20..05b6e7c 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -58,3 +58,4 @@ 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
+obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
new file mode 100644
index 0000000..ae7e5ce
--- /dev/null
+++ b/drivers/thermal/uniphier_thermal.c
@@ -0,0 +1,390 @@
+/**
+ * uniphier_thermal.c - Socionext UniPhier thermal driver
+ *
+ * Copyright 2014 Panasonic Corporation
+ * Copyright 2016 Socionext Inc.
+ * All rights reserved.
+ *
+ * Author:
+ * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 of
+ * the License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/bitops.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/thermal.h>
+
+#include "thermal_core.h"
+
+/*
+ * block registers
+ * addresses are the offset from .block_base
+ */
+#define PVTCTLEN 0x0000
+#define PVTCTLEN_EN BIT(0)
+
+#define PVTCTLMODE 0x0004
+#define PVTCTLMODE_MASK 0xf
+#define PVTCTLMODE_TEMPMON 0x5
+
+#define EMONREPEAT 0x0040
+#define EMONREPEAT_ENDLESS BIT(24)
+#define EMONREPEAT_PERIOD 0xf
+#define EMONREPEAT_PERIOD_1000000 0x9
+
+/*
+ * common registers
+ * addresses are the offset from .map_base
+ */
+#define PVTCTLSEL 0x0900
+#define PVTCTLSEL_MASK 0x7
+#define PVTCTLSEL_MONITOR 0
+
+#define SETALERT0 0x0910
+#define SETALERT1 0x0914
+#define SETALERT2 0x0918
+#define SETALERT_TEMP_OVF (0xff << 16)
+#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
+#define SETALERT_EN BIT(0)
+
+#define PMALERTINTCTL 0x0920
+#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
+#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
+#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
+#define PMALERTINTCTL_MASK 0x777
+
+#define TMOD 0x0928
+#define TMOD_MASK 0x1ff
+
+#define TMODCOEF 0x0e5c
+
+#define TMODSETUP0_EN BIT(30)
+#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
+#define TMODSETUP1_EN BIT(15)
+#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
+
+/* SoC critical temperature is 95 degrees Celsius */
+#define CRITICAL_TEMP_LIMIT (95 * 1000)
+
+/* Max # of alert channels */
+#define ALERT_CH_NUM 3
+
+/* SoC specific thermal sensor data */
+struct uniphier_tm_soc_data {
+ u32 map_base;
+ u32 block_base;
+ u32 tmod_setup_addr;
+};
+
+struct uniphier_tm_dev {
+ struct regmap *regmap;
+ bool alert_en[ALERT_CH_NUM];
+ u32 tmod_calib0;
+ u32 tmod_calib1;
+ struct thermal_zone_device *tz_dev;
+ const struct uniphier_tm_soc_data *data;
+};
+
+static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+ u32 val;
+ int ret;
+
+ /* stop PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, 0);
+
+ /*
+ * set default value if missing calibrated value
+ *
+ * Since SoC has a calibrated value that was set in advance,
+ * TMODCOEF shows non-zero and PVT refers the value internally.
+ *
+ * However, there is the case that some SoCs might not have the
+ * calibrated value. In that case, TMODCOEF shows zero and the driver
+ * has to set default value manually.
+ */
+ ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
+ if (ret)
+ return ret;
+ if (!val)
+ regmap_write(map,
+ tdev->data->tmod_setup_addr,
+ TMODSETUP0_EN |
+ TMODSETUP0_VAL(tdev->tmod_calib0) |
+ TMODSETUP1_EN |
+ TMODSETUP1_VAL(tdev->tmod_calib1));
+
+ /* select temperature mode */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLMODE,
+ PVTCTLMODE_MASK,
+ PVTCTLMODE_TEMPMON);
+
+ /* set monitoring period */
+ regmap_write_bits(map,
+ tdev->data->block_base + EMONREPEAT,
+ EMONREPEAT_ENDLESS |
+ EMONREPEAT_PERIOD,
+ EMONREPEAT_ENDLESS |
+ EMONREPEAT_PERIOD_1000000);
+
+ /* set monitor mode */
+ regmap_write_bits(map,
+ tdev->data->map_base + PVTCTLSEL,
+ PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
+
+ return 0;
+}
+
+static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
+ u32 temp)
+{
+ struct regmap *map = tdev->regmap;
+
+ /* set alert temperature */
+ regmap_write_bits(map,
+ tdev->data->map_base + SETALERT0 + (ch << 2),
+ SETALERT_EN |
+ SETALERT_TEMP_OVF,
+ SETALERT_EN |
+ SETALERT_TEMP_OVF_VALUE(temp / 1000));
+}
+
+static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+ int i;
+ u32 bits = 0;
+
+ for (i = 0; i < ALERT_CH_NUM; i++)
+ if (tdev->alert_en[i])
+ bits |= PMALERTINTCTL_EN(i);
+
+ /* enable alert interrupt */
+ regmap_write_bits(map,
+ tdev->data->map_base + PMALERTINTCTL,
+ PMALERTINTCTL_MASK, bits);
+
+ /* start PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, PVTCTLEN_EN);
+}
+
+static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
+{
+ struct regmap *map = tdev->regmap;
+
+ /* disable alert interrupt */
+ regmap_write_bits(map,
+ tdev->data->map_base + PMALERTINTCTL,
+ PMALERTINTCTL_MASK, 0);
+
+ /* stop PVT */
+ regmap_write_bits(map,
+ tdev->data->block_base + PVTCTLEN,
+ PVTCTLEN_EN, 0);
+}
+
+static int uniphier_tm_get_temp(void *data, int *out_temp)
+{
+ struct uniphier_tm_dev *tdev = data;
+ struct regmap *map = tdev->regmap;
+ int ret;
+ u32 temp;
+
+ ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
+ if (ret)
+ return ret;
+
+ temp &= TMOD_MASK;
+ *out_temp = temp * 1000; /* millicelsius */
+
+ return 0;
+}
+
+static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
+ .get_temp = uniphier_tm_get_temp,
+};
+
+static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
+{
+ u32 mask = 0, bits = 0;
+ int i;
+
+ for (i = 0; i < ALERT_CH_NUM; i++) {
+ mask |= (PMALERTINTCTL_CLR(i) |
+ PMALERTINTCTL_SET(i));
+ bits |= PMALERTINTCTL_CLR(i);
+ }
+
+ /* clear alert interrupt */
+ regmap_write_bits(tdev->regmap,
+ tdev->data->map_base + PMALERTINTCTL, mask, bits);
+}
+
+static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
+{
+ struct uniphier_tm_dev *tdev = _tdev;
+
+ uniphier_tm_irq_clear(tdev);
+ thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
+
+ return IRQ_HANDLED;
+}
+
+static int uniphier_tm_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct regmap *regmap;
+ struct device_node *parent;
+ struct uniphier_tm_dev *tdev;
+ const struct thermal_trip *trips;
+ const u32 *calib;
+ int i, ret, irq, ntrips, crit_temp = INT_MAX;
+
+ tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
+ if (!tdev)
+ return -ENOMEM;
+
+ tdev->data = of_device_get_match_data(dev);
+ if (WARN_ON(!tdev->data))
+ return -EINVAL;
+
+ /* get irq */
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0)
+ return irq;
+
+ /* get tmod-calibration values */
+ calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
+ NULL);
+ if (calib) {
+ tdev->tmod_calib0 = of_read_number(calib, 1);
+ tdev->tmod_calib1 = of_read_number(calib + 1, 1);
+ }
+
+ /* get regmap from syscon node */
+ parent = of_get_parent(dev->of_node); /* parent should be syscon node */
+ regmap = syscon_node_to_regmap(parent);
+ of_node_put(parent);
+ if (IS_ERR(regmap)) {
+ dev_err(dev, "failed to get regmap (error %ld)\n",
+ PTR_ERR(regmap));
+ return PTR_ERR(regmap);
+ }
+ tdev->regmap = regmap;
+
+ /* register sensor */
+ tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
+ &uniphier_of_thermal_ops);
+ if (IS_ERR(tdev->tz_dev)) {
+ dev_err(dev, "failed to register sensor device\n");
+ return PTR_ERR(tdev->tz_dev);
+ }
+
+ /* get trip points */
+ trips = of_thermal_get_trip_points(tdev->tz_dev);
+ ntrips = of_thermal_get_ntrips(tdev->tz_dev);
+ if (ntrips > ALERT_CH_NUM) {
+ dev_err(dev, "thermal zone has too many trips\n");
+ return -E2BIG;
+ }
+
+ /* initialize sensor */
+ ret = uniphier_tm_initialize_sensor(tdev);
+ if (ret) {
+ dev_err(dev, "failed to initialize sensor\n");
+ return ret;
+ }
+ for (i = 0; i < ntrips; i++) {
+ if (trips[i].type == THERMAL_TRIP_CRITICAL &&
+ trips[i].temperature < crit_temp)
+ crit_temp = trips[i].temperature;
+ uniphier_tm_set_alert(tdev, i, trips[i].temperature);
+ tdev->alert_en[i] = true;
+ }
+ if (crit_temp > CRITICAL_TEMP_LIMIT) {
+ dev_err(dev, "critical trip is over limit(>%d), or not set\n",
+ CRITICAL_TEMP_LIMIT);
+ return -EINVAL;
+ }
+
+ ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
+ 0, "thermal", tdev);
+ if (ret)
+ return ret;
+
+ /* enable sensor */
+ uniphier_tm_enable_sensor(tdev);
+
+ platform_set_drvdata(pdev, tdev);
+
+ return 0;
+}
+
+static int uniphier_tm_remove(struct platform_device *pdev)
+{
+ struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
+
+ /* disable sensor */
+ uniphier_tm_disable_sensor(tdev);
+
+ return 0;
+}
+
+static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
+ .map_base = 0xe000,
+ .block_base = 0xe000,
+ .tmod_setup_addr = 0xe904,
+};
+
+static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
+ .map_base = 0xe000,
+ .block_base = 0xe800,
+ .tmod_setup_addr = 0xe938,
+};
+
+static const struct of_device_id uniphier_tm_dt_ids[] = {
+ {
+ .compatible = "socionext,uniphier-pxs2-thermal",
+ .data = &uniphier_pxs2_tm_data,
+ },
+ {
+ .compatible = "socionext,uniphier-ld20-thermal",
+ .data = &uniphier_ld20_tm_data,
+ },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
+
+static struct platform_driver uniphier_tm_driver = {
+ .probe = uniphier_tm_probe,
+ .remove = uniphier_tm_remove,
+ .driver = {
+ .name = "uniphier-thermal",
+ .of_match_table = uniphier_tm_dt_ids,
+ },
+};
+module_platform_driver(uniphier_tm_driver);
+
+MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
+MODULE_DESCRIPTION("UniPhier thermal driver");
+MODULE_LICENSE("GPL v2");
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 2/4] dt-bindings: thermal: add binding documentation for UniPhier thermal monitor
2017-05-29 9:15 ` Kunihiko Hayashi
@ 2017-05-29 9:15 ` Kunihiko Hayashi
-1 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: rui.zhang, edubezval
Cc: linux-pm, linux-arm-kernel, linux-kernel, robh+dt, mark.rutland,
devicetree, yamada.masahiro, masami.hiramatsu, jaswinder.singh,
Kunihiko Hayashi
Add devicetree binding documentation for thermal monitor implemented on
Socionext UniPhier SoCs.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../bindings/thermal/uniphier-thermal.txt | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
diff --git a/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt b/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
new file mode 100644
index 0000000..72834e1
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
@@ -0,0 +1,54 @@
+* UniPhier Thermal bindings
+
+This describes the devicetree bindings for thermal monitor supported by
+PVT(Process, Voltage and Temperature) monitoring unit implemented on Socionext
+UniPhier SoCs.
+
+Required properties:
+- compatible :
+ - "socionext,uniphier-pxs2-thermal" : For UniPhier PXs2 SoC
+ - "socionext,uniphier-ld20-thermal" : For UniPhier LD20 SoC
+- reg : Offset address of the thermal registers from sysctrl
+- interrupts : IRQ for the temperature alarm
+- #thermal-sensor-cells : Should be 0. See ./thermal.txt for details.
+
+Optional properties:
+- socionext,tmod-calibration: A pair of calibrated values referred from PVT,
+ in case that the values aren't set on SoC,
+ like a reference board.
+
+Example:
+
+ sysctrl@61840000 {
+ compatible = "socionext,uniphier-ld20-sysctrl",
+ "simple-mfd", "syscon";
+ reg = <0x61840000 0x10000>;
+ ...
+ pvtctl: pvtctl {
+ compatible = "socionext,uniphier-ld20-thermal";
+ interrupts = <0 3 1>;
+ #thermal-sensor-cells = <0>;
+ };
+ ...
+ };
+
+ thermal-zones {
+ cpu_thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+ thermal-sensors = <&pvtctl>;
+
+ trips {
+ cpu_crit: cpu_crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu_alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+ };
+ };
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 2/4] dt-bindings: thermal: add binding documentation for UniPhier thermal monitor
@ 2017-05-29 9:15 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: linux-arm-kernel
Add devicetree binding documentation for thermal monitor implemented on
Socionext UniPhier SoCs.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../bindings/thermal/uniphier-thermal.txt | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
diff --git a/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt b/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
new file mode 100644
index 0000000..72834e1
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
@@ -0,0 +1,54 @@
+* UniPhier Thermal bindings
+
+This describes the devicetree bindings for thermal monitor supported by
+PVT(Process, Voltage and Temperature) monitoring unit implemented on Socionext
+UniPhier SoCs.
+
+Required properties:
+- compatible :
+ - "socionext,uniphier-pxs2-thermal" : For UniPhier PXs2 SoC
+ - "socionext,uniphier-ld20-thermal" : For UniPhier LD20 SoC
+- reg : Offset address of the thermal registers from sysctrl
+- interrupts : IRQ for the temperature alarm
+- #thermal-sensor-cells : Should be 0. See ./thermal.txt for details.
+
+Optional properties:
+- socionext,tmod-calibration: A pair of calibrated values referred from PVT,
+ in case that the values aren't set on SoC,
+ like a reference board.
+
+Example:
+
+ sysctrl at 61840000 {
+ compatible = "socionext,uniphier-ld20-sysctrl",
+ "simple-mfd", "syscon";
+ reg = <0x61840000 0x10000>;
+ ...
+ pvtctl: pvtctl {
+ compatible = "socionext,uniphier-ld20-thermal";
+ interrupts = <0 3 1>;
+ #thermal-sensor-cells = <0>;
+ };
+ ...
+ };
+
+ thermal-zones {
+ cpu_thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+ thermal-sensors = <&pvtctl>;
+
+ trips {
+ cpu_crit: cpu_crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu_alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+ };
+ };
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 3/4] ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
2017-05-29 9:15 ` Kunihiko Hayashi
@ 2017-05-29 9:15 ` Kunihiko Hayashi
-1 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: rui.zhang, edubezval
Cc: linux-pm, linux-arm-kernel, linux-kernel, robh+dt, mark.rutland,
devicetree, yamada.masahiro, masami.hiramatsu, jaswinder.singh,
Kunihiko Hayashi
Add nodes of thermal monitor and thermal zone for UniPhier PXs2 SoC.
The thermal monitor is included in sysctrl.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 +++++++++++++++++++++
arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 +++++++++++++++++++++
arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 ++++++
3 files changed, 48 insertions(+)
diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
index 373818a..89ccb88 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
@@ -70,6 +70,27 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
+
+ thermal-zones {
+ cpu_thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+ thermal-sensors = <&pvtctl>;
+
+ trips {
+ cpu_crit: cpu_crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu_alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+ };
+ };
};
&serial2 {
diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
index 51a3eac..0201584 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
@@ -68,6 +68,27 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
+
+ thermal-zones {
+ cpu_thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+ thermal-sensors = <&pvtctl>;
+
+ trips {
+ cpu_crit: cpu_crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu_alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+ };
+ };
};
&serial2 {
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index e9e031d..072e3b4 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -387,6 +387,12 @@
compatible = "socionext,uniphier-pxs2-reset";
#reset-cells = <1>;
};
+
+ pvtctl: pvtctl {
+ compatible = "socionext,uniphier-pxs2-thermal";
+ interrupts = <0 3 1>;
+ #thermal-sensor-cells = <0>;
+ };
};
};
};
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 3/4] ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
@ 2017-05-29 9:15 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: linux-arm-kernel
Add nodes of thermal monitor and thermal zone for UniPhier PXs2 SoC.
The thermal monitor is included in sysctrl.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 +++++++++++++++++++++
arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 +++++++++++++++++++++
arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 ++++++
3 files changed, 48 insertions(+)
diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
index 373818a..89ccb88 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
@@ -70,6 +70,27 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
+
+ thermal-zones {
+ cpu_thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+ thermal-sensors = <&pvtctl>;
+
+ trips {
+ cpu_crit: cpu_crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu_alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+ };
+ };
};
&serial2 {
diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
index 51a3eac..0201584 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
@@ -68,6 +68,27 @@
i2c5 = &i2c5;
i2c6 = &i2c6;
};
+
+ thermal-zones {
+ cpu_thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+ thermal-sensors = <&pvtctl>;
+
+ trips {
+ cpu_crit: cpu_crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu_alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+ };
+ };
};
&serial2 {
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index e9e031d..072e3b4 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -387,6 +387,12 @@
compatible = "socionext,uniphier-pxs2-reset";
#reset-cells = <1>;
};
+
+ pvtctl: pvtctl {
+ compatible = "socionext,uniphier-pxs2-thermal";
+ interrupts = <0 3 1>;
+ #thermal-sensor-cells = <0>;
+ };
};
};
};
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 4/4] arm64: dts: uniphier: add nodes of thermal monitor and thermal zone for LD20
2017-05-29 9:15 ` Kunihiko Hayashi
@ 2017-05-29 9:15 ` Kunihiko Hayashi
-1 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: rui.zhang, edubezval
Cc: linux-pm, linux-arm-kernel, linux-kernel, robh+dt, mark.rutland,
devicetree, yamada.masahiro, masami.hiramatsu, jaswinder.singh,
Kunihiko Hayashi
Add nodes of thermal monitor and thermal zone for UniPhier LD20 SoC.
The thermal monitor is included in sysctrl.
Furthermore, since SoC installed in the reference board doesn't have a
calibrated value of thermal monitor, this patch gives the default value
for LD20 Reference board via device-tree property.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 25 ++++++++++++++++++++++
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 6 ++++++
2 files changed, 31 insertions(+)
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index 609162a..79e1363 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@ -73,6 +73,27 @@
i2c4 = &i2c4;
i2c5 = &i2c5;
};
+
+ thermal-zones {
+ cpu_thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+ thermal-sensors = <&pvtctl>;
+
+ trips {
+ cpu_crit: cpu_crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu_alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+ };
+ };
};
ðsc {
@@ -86,3 +107,7 @@
&i2c0 {
status = "okay";
};
+
+&pvtctl {
+ socionext,tmod-calibration = <0x0f22 0x68ee>;
+};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index a6b3a70..effa2e3 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -417,6 +417,12 @@
compatible = "socionext,uniphier-ld20-reset";
#reset-cells = <1>;
};
+
+ pvtctl: pvtctl {
+ compatible = "socionext,uniphier-ld20-thermal";
+ interrupts = <0 3 1>;
+ #thermal-sensor-cells = <0>;
+ };
};
};
};
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [PATCH 4/4] arm64: dts: uniphier: add nodes of thermal monitor and thermal zone for LD20
@ 2017-05-29 9:15 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-29 9:15 UTC (permalink / raw)
To: linux-arm-kernel
Add nodes of thermal monitor and thermal zone for UniPhier LD20 SoC.
The thermal monitor is included in sysctrl.
Furthermore, since SoC installed in the reference board doesn't have a
calibrated value of thermal monitor, this patch gives the default value
for LD20 Reference board via device-tree property.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
.../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 25 ++++++++++++++++++++++
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 6 ++++++
2 files changed, 31 insertions(+)
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index 609162a..79e1363 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@ -73,6 +73,27 @@
i2c4 = &i2c4;
i2c5 = &i2c5;
};
+
+ thermal-zones {
+ cpu_thermal {
+ polling-delay-passive = <250>; /* 250ms */
+ polling-delay = <1000>; /* 1000ms */
+ thermal-sensors = <&pvtctl>;
+
+ trips {
+ cpu_crit: cpu_crit {
+ temperature = <95000>; /* 95C */
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ cpu_alert: cpu_alert {
+ temperature = <85000>; /* 85C */
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ };
+ };
+ };
};
ðsc {
@@ -86,3 +107,7 @@
&i2c0 {
status = "okay";
};
+
+&pvtctl {
+ socionext,tmod-calibration = <0x0f22 0x68ee>;
+};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index a6b3a70..effa2e3 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -417,6 +417,12 @@
compatible = "socionext,uniphier-ld20-reset";
#reset-cells = <1>;
};
+
+ pvtctl: pvtctl {
+ compatible = "socionext,uniphier-ld20-thermal";
+ interrupts = <0 3 1>;
+ #thermal-sensor-cells = <0>;
+ };
};
};
};
--
2.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
2017-05-29 9:15 ` Kunihiko Hayashi
(?)
@ 2017-05-29 10:23 ` Keerthy
-1 siblings, 0 replies; 41+ messages in thread
From: Keerthy @ 2017-05-29 10:23 UTC (permalink / raw)
To: Kunihiko Hayashi, rui.zhang, edubezval
Cc: linux-pm, linux-arm-kernel, linux-kernel, robh+dt, mark.rutland,
devicetree, yamada.masahiro, masami.hiramatsu, jaswinder.singh
On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> monitoring unit implemented on UniPhier SoCs. This driver supports
> temperature monitoring and alert function.
The Documentation in patch 2/4 should be squashed into this patch.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 399 insertions(+)
> create mode 100644 drivers/thermal/uniphier_thermal.c
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 776b343..93ccf25 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> the primitive temperature sensor embedded in zx2967 SoCs.
> This sensor generates the real time die temperature.
>
> +config UNIPHIER_THERMAL
> + tristate "Socionext UniPhier thermal driver"
> + depends on ARCH_UNIPHIER || COMPILE_TEST
> + help
> + Enable this to support thermal reporting on UniPhier SoC.
> + This driver supports CPU thermal zone to reports the temperture
/s/temperture/temperature
Or consider re-wording to
"Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
thermal framework. The driver supports CPU thermal zone temperature
reporting and a couple of trip points."
> + and trip points.
> +
> endif
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 7adae20..05b6e7c 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -58,3 +58,4 @@ 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
> +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> new file mode 100644
> index 0000000..ae7e5ce
> --- /dev/null
> +++ b/drivers/thermal/uniphier_thermal.c
> @@ -0,0 +1,390 @@
> +/**
> + * uniphier_thermal.c - Socionext UniPhier thermal driver
> + *
> + * Copyright 2014 Panasonic Corporation
> + * Copyright 2016 Socionext Inc.
Update this please.
> + * All rights reserved.
> + *
> + * Author:
> + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 of
> + * the License as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/thermal.h>
> +
> +#include "thermal_core.h"
> +
> +/*
> + * block registers
> + * addresses are the offset from .block_base
> + */
> +#define PVTCTLEN 0x0000
> +#define PVTCTLEN_EN BIT(0)
> +
> +#define PVTCTLMODE 0x0004
> +#define PVTCTLMODE_MASK 0xf
> +#define PVTCTLMODE_TEMPMON 0x5
> +
> +#define EMONREPEAT 0x0040
> +#define EMONREPEAT_ENDLESS BIT(24)
> +#define EMONREPEAT_PERIOD 0xf
> +#define EMONREPEAT_PERIOD_1000000 0x9
> +
> +/*
> + * common registers
> + * addresses are the offset from .map_base
> + */
> +#define PVTCTLSEL 0x0900
> +#define PVTCTLSEL_MASK 0x7
> +#define PVTCTLSEL_MONITOR 0
> +
> +#define SETALERT0 0x0910
> +#define SETALERT1 0x0914
> +#define SETALERT2 0x0918
> +#define SETALERT_TEMP_OVF (0xff << 16)
> +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> +#define SETALERT_EN BIT(0)
> +
> +#define PMALERTINTCTL 0x0920
> +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> +#define PMALERTINTCTL_MASK 0x777
> +
> +#define TMOD 0x0928
> +#define TMOD_MASK 0x1ff
> +
> +#define TMODCOEF 0x0e5c
> +
> +#define TMODSETUP0_EN BIT(30)
> +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> +#define TMODSETUP1_EN BIT(15)
> +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
> +
> +/* SoC critical temperature is 95 degrees Celsius */
> +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> +
> +/* Max # of alert channels */
> +#define ALERT_CH_NUM 3
> +
> +/* SoC specific thermal sensor data */
> +struct uniphier_tm_soc_data {
> + u32 map_base;
> + u32 block_base;
> + u32 tmod_setup_addr;
> +};
> +
> +struct uniphier_tm_dev {
> + struct regmap *regmap;
> + bool alert_en[ALERT_CH_NUM];
> + u32 tmod_calib0;
> + u32 tmod_calib1;
> + struct thermal_zone_device *tz_dev;
> + const struct uniphier_tm_soc_data *data;
> +};
> +
> +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + u32 val;
> + int ret;
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +
> + /*
> + * set default value if missing calibrated value
> + *
> + * Since SoC has a calibrated value that was set in advance,
> + * TMODCOEF shows non-zero and PVT refers the value internally.
> + *
> + * However, there is the case that some SoCs might not have the
> + * calibrated value. In that case, TMODCOEF shows zero and the driver
> + * has to set default value manually.
> + */
> + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> + if (ret)
> + return ret;
> + if (!val)
> + regmap_write(map,
> + tdev->data->tmod_setup_addr,
> + TMODSETUP0_EN |
I guess the above parameter could be included in the previous line. Here
and else where can save a number of lines.
Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
Can go in a single line.
> + TMODSETUP0_VAL(tdev->tmod_calib0) |
> + TMODSETUP1_EN |
> + TMODSETUP1_VAL(tdev->tmod_calib1));
> +
> + /* select temperature mode */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLMODE,
> + PVTCTLMODE_MASK,
> + PVTCTLMODE_TEMPMON);
> +
> + /* set monitoring period */
> + regmap_write_bits(map,
> + tdev->data->block_base + EMONREPEAT,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD_1000000);
> +
> + /* set monitor mode */
> + regmap_write_bits(map,
> + tdev->data->map_base + PVTCTLSEL,
> + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> +
> + return 0;
> +}
> +
> +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> + u32 temp)
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* set alert temperature */
> + regmap_write_bits(map,
> + tdev->data->map_base + SETALERT0 + (ch << 2),
> + SETALERT_EN |
> + SETALERT_TEMP_OVF,
> + SETALERT_EN |
> + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> +}
> +
> +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + int i;
> + u32 bits = 0;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++)
> + if (tdev->alert_en[i])
> + bits |= PMALERTINTCTL_EN(i);
> +
> + /* enable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, bits);
> +
> + /* start PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, PVTCTLEN_EN);
> +}
> +
> +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* disable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, 0);
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +}
> +
> +static int uniphier_tm_get_temp(void *data, int *out_temp)
> +{
> + struct uniphier_tm_dev *tdev = data;
> + struct regmap *map = tdev->regmap;
> + int ret;
> + u32 temp;
> +
> + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> + if (ret)
> + return ret;
> +
> + temp &= TMOD_MASK;
> + *out_temp = temp * 1000; /* millicelsius */
> +
> + return 0;
> +}
> +
> +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> + .get_temp = uniphier_tm_get_temp,
> +};
> +
> +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> +{
> + u32 mask = 0, bits = 0;
> + int i;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++) {
> + mask |= (PMALERTINTCTL_CLR(i) |
> + PMALERTINTCTL_SET(i));
> + bits |= PMALERTINTCTL_CLR(i);
> + }
> +
> + /* clear alert interrupt */
> + regmap_write_bits(tdev->regmap,
> + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> +}
> +
> +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> +{
> + struct uniphier_tm_dev *tdev = _tdev;
> +
> + uniphier_tm_irq_clear(tdev);
> + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int uniphier_tm_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct regmap *regmap;
> + struct device_node *parent;
> + struct uniphier_tm_dev *tdev;
> + const struct thermal_trip *trips;
> + const u32 *calib;
> + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> +
> + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> + if (!tdev)
> + return -ENOMEM;
> +
> + tdev->data = of_device_get_match_data(dev);
> + if (WARN_ON(!tdev->data))
> + return -EINVAL;
> +
> + /* get irq */
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0)
> + return irq;
> +
> + /* get tmod-calibration values */
> + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> + NULL);
> + if (calib) {
> + tdev->tmod_calib0 = of_read_number(calib, 1);
> + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> + }
> +
> + /* get regmap from syscon node */
> + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> + regmap = syscon_node_to_regmap(parent);
> + of_node_put(parent);
> + if (IS_ERR(regmap)) {
> + dev_err(dev, "failed to get regmap (error %ld)\n",
> + PTR_ERR(regmap));
> + return PTR_ERR(regmap);
> + }
> + tdev->regmap = regmap;
> +
> + /* register sensor */
> + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> + &uniphier_of_thermal_ops);
> + if (IS_ERR(tdev->tz_dev)) {
> + dev_err(dev, "failed to register sensor device\n");
> + return PTR_ERR(tdev->tz_dev);
> + }
> +
> + /* get trip points */
> + trips = of_thermal_get_trip_points(tdev->tz_dev);
> + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> + if (ntrips > ALERT_CH_NUM) {
> + dev_err(dev, "thermal zone has too many trips\n");
> + return -E2BIG;
> + }
> +
> + /* initialize sensor */
> + ret = uniphier_tm_initialize_sensor(tdev);
> + if (ret) {
> + dev_err(dev, "failed to initialize sensor\n");
> + return ret;
> + }
> + for (i = 0; i < ntrips; i++) {
> + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> + trips[i].temperature < crit_temp)
> + crit_temp = trips[i].temperature;
> + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> + tdev->alert_en[i] = true;
> + }
> + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> + CRITICAL_TEMP_LIMIT);
> + return -EINVAL;
> + }
> +
> + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> + 0, "thermal", tdev);
> + if (ret)
> + return ret;
> +
> + /* enable sensor */
> + uniphier_tm_enable_sensor(tdev);
> +
> + platform_set_drvdata(pdev, tdev);
> +
> + return 0;
> +}
> +
> +static int uniphier_tm_remove(struct platform_device *pdev)
> +{
> + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> +
> + /* disable sensor */
> + uniphier_tm_disable_sensor(tdev);
> +
> + return 0;
> +}
> +
> +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe000,
> + .tmod_setup_addr = 0xe904,
> +};
> +
> +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe800,
> + .tmod_setup_addr = 0xe938,
> +};
> +
> +static const struct of_device_id uniphier_tm_dt_ids[] = {
> + {
> + .compatible = "socionext,uniphier-pxs2-thermal",
> + .data = &uniphier_pxs2_tm_data,
> + },
> + {
> + .compatible = "socionext,uniphier-ld20-thermal",
> + .data = &uniphier_ld20_tm_data,
> + },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> +
> +static struct platform_driver uniphier_tm_driver = {
> + .probe = uniphier_tm_probe,
> + .remove = uniphier_tm_remove,
> + .driver = {
> + .name = "uniphier-thermal",
> + .of_match_table = uniphier_tm_dt_ids,
> + },
> +};
> +module_platform_driver(uniphier_tm_driver);
> +
> +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> +MODULE_DESCRIPTION("UniPhier thermal driver");
> +MODULE_LICENSE("GPL v2");
>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-29 10:23 ` Keerthy
0 siblings, 0 replies; 41+ messages in thread
From: Keerthy @ 2017-05-29 10:23 UTC (permalink / raw)
To: Kunihiko Hayashi, rui.zhang, edubezval
Cc: linux-pm, linux-arm-kernel, linux-kernel, robh+dt, mark.rutland,
devicetree, yamada.masahiro, masami.hiramatsu, jaswinder.singh
On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> monitoring unit implemented on UniPhier SoCs. This driver supports
> temperature monitoring and alert function.
The Documentation in patch 2/4 should be squashed into this patch.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 399 insertions(+)
> create mode 100644 drivers/thermal/uniphier_thermal.c
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 776b343..93ccf25 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> the primitive temperature sensor embedded in zx2967 SoCs.
> This sensor generates the real time die temperature.
>
> +config UNIPHIER_THERMAL
> + tristate "Socionext UniPhier thermal driver"
> + depends on ARCH_UNIPHIER || COMPILE_TEST
> + help
> + Enable this to support thermal reporting on UniPhier SoC.
> + This driver supports CPU thermal zone to reports the temperture
/s/temperture/temperature
Or consider re-wording to
"Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
thermal framework. The driver supports CPU thermal zone temperature
reporting and a couple of trip points."
> + and trip points.
> +
> endif
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 7adae20..05b6e7c 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -58,3 +58,4 @@ 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
> +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> new file mode 100644
> index 0000000..ae7e5ce
> --- /dev/null
> +++ b/drivers/thermal/uniphier_thermal.c
> @@ -0,0 +1,390 @@
> +/**
> + * uniphier_thermal.c - Socionext UniPhier thermal driver
> + *
> + * Copyright 2014 Panasonic Corporation
> + * Copyright 2016 Socionext Inc.
Update this please.
> + * All rights reserved.
> + *
> + * Author:
> + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 of
> + * the License as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/thermal.h>
> +
> +#include "thermal_core.h"
> +
> +/*
> + * block registers
> + * addresses are the offset from .block_base
> + */
> +#define PVTCTLEN 0x0000
> +#define PVTCTLEN_EN BIT(0)
> +
> +#define PVTCTLMODE 0x0004
> +#define PVTCTLMODE_MASK 0xf
> +#define PVTCTLMODE_TEMPMON 0x5
> +
> +#define EMONREPEAT 0x0040
> +#define EMONREPEAT_ENDLESS BIT(24)
> +#define EMONREPEAT_PERIOD 0xf
> +#define EMONREPEAT_PERIOD_1000000 0x9
> +
> +/*
> + * common registers
> + * addresses are the offset from .map_base
> + */
> +#define PVTCTLSEL 0x0900
> +#define PVTCTLSEL_MASK 0x7
> +#define PVTCTLSEL_MONITOR 0
> +
> +#define SETALERT0 0x0910
> +#define SETALERT1 0x0914
> +#define SETALERT2 0x0918
> +#define SETALERT_TEMP_OVF (0xff << 16)
> +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> +#define SETALERT_EN BIT(0)
> +
> +#define PMALERTINTCTL 0x0920
> +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> +#define PMALERTINTCTL_MASK 0x777
> +
> +#define TMOD 0x0928
> +#define TMOD_MASK 0x1ff
> +
> +#define TMODCOEF 0x0e5c
> +
> +#define TMODSETUP0_EN BIT(30)
> +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> +#define TMODSETUP1_EN BIT(15)
> +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
> +
> +/* SoC critical temperature is 95 degrees Celsius */
> +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> +
> +/* Max # of alert channels */
> +#define ALERT_CH_NUM 3
> +
> +/* SoC specific thermal sensor data */
> +struct uniphier_tm_soc_data {
> + u32 map_base;
> + u32 block_base;
> + u32 tmod_setup_addr;
> +};
> +
> +struct uniphier_tm_dev {
> + struct regmap *regmap;
> + bool alert_en[ALERT_CH_NUM];
> + u32 tmod_calib0;
> + u32 tmod_calib1;
> + struct thermal_zone_device *tz_dev;
> + const struct uniphier_tm_soc_data *data;
> +};
> +
> +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + u32 val;
> + int ret;
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +
> + /*
> + * set default value if missing calibrated value
> + *
> + * Since SoC has a calibrated value that was set in advance,
> + * TMODCOEF shows non-zero and PVT refers the value internally.
> + *
> + * However, there is the case that some SoCs might not have the
> + * calibrated value. In that case, TMODCOEF shows zero and the driver
> + * has to set default value manually.
> + */
> + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> + if (ret)
> + return ret;
> + if (!val)
> + regmap_write(map,
> + tdev->data->tmod_setup_addr,
> + TMODSETUP0_EN |
I guess the above parameter could be included in the previous line. Here
and else where can save a number of lines.
Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
Can go in a single line.
> + TMODSETUP0_VAL(tdev->tmod_calib0) |
> + TMODSETUP1_EN |
> + TMODSETUP1_VAL(tdev->tmod_calib1));
> +
> + /* select temperature mode */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLMODE,
> + PVTCTLMODE_MASK,
> + PVTCTLMODE_TEMPMON);
> +
> + /* set monitoring period */
> + regmap_write_bits(map,
> + tdev->data->block_base + EMONREPEAT,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD_1000000);
> +
> + /* set monitor mode */
> + regmap_write_bits(map,
> + tdev->data->map_base + PVTCTLSEL,
> + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> +
> + return 0;
> +}
> +
> +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> + u32 temp)
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* set alert temperature */
> + regmap_write_bits(map,
> + tdev->data->map_base + SETALERT0 + (ch << 2),
> + SETALERT_EN |
> + SETALERT_TEMP_OVF,
> + SETALERT_EN |
> + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> +}
> +
> +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + int i;
> + u32 bits = 0;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++)
> + if (tdev->alert_en[i])
> + bits |= PMALERTINTCTL_EN(i);
> +
> + /* enable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, bits);
> +
> + /* start PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, PVTCTLEN_EN);
> +}
> +
> +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* disable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, 0);
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +}
> +
> +static int uniphier_tm_get_temp(void *data, int *out_temp)
> +{
> + struct uniphier_tm_dev *tdev = data;
> + struct regmap *map = tdev->regmap;
> + int ret;
> + u32 temp;
> +
> + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> + if (ret)
> + return ret;
> +
> + temp &= TMOD_MASK;
> + *out_temp = temp * 1000; /* millicelsius */
> +
> + return 0;
> +}
> +
> +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> + .get_temp = uniphier_tm_get_temp,
> +};
> +
> +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> +{
> + u32 mask = 0, bits = 0;
> + int i;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++) {
> + mask |= (PMALERTINTCTL_CLR(i) |
> + PMALERTINTCTL_SET(i));
> + bits |= PMALERTINTCTL_CLR(i);
> + }
> +
> + /* clear alert interrupt */
> + regmap_write_bits(tdev->regmap,
> + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> +}
> +
> +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> +{
> + struct uniphier_tm_dev *tdev = _tdev;
> +
> + uniphier_tm_irq_clear(tdev);
> + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int uniphier_tm_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct regmap *regmap;
> + struct device_node *parent;
> + struct uniphier_tm_dev *tdev;
> + const struct thermal_trip *trips;
> + const u32 *calib;
> + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> +
> + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> + if (!tdev)
> + return -ENOMEM;
> +
> + tdev->data = of_device_get_match_data(dev);
> + if (WARN_ON(!tdev->data))
> + return -EINVAL;
> +
> + /* get irq */
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0)
> + return irq;
> +
> + /* get tmod-calibration values */
> + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> + NULL);
> + if (calib) {
> + tdev->tmod_calib0 = of_read_number(calib, 1);
> + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> + }
> +
> + /* get regmap from syscon node */
> + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> + regmap = syscon_node_to_regmap(parent);
> + of_node_put(parent);
> + if (IS_ERR(regmap)) {
> + dev_err(dev, "failed to get regmap (error %ld)\n",
> + PTR_ERR(regmap));
> + return PTR_ERR(regmap);
> + }
> + tdev->regmap = regmap;
> +
> + /* register sensor */
> + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> + &uniphier_of_thermal_ops);
> + if (IS_ERR(tdev->tz_dev)) {
> + dev_err(dev, "failed to register sensor device\n");
> + return PTR_ERR(tdev->tz_dev);
> + }
> +
> + /* get trip points */
> + trips = of_thermal_get_trip_points(tdev->tz_dev);
> + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> + if (ntrips > ALERT_CH_NUM) {
> + dev_err(dev, "thermal zone has too many trips\n");
> + return -E2BIG;
> + }
> +
> + /* initialize sensor */
> + ret = uniphier_tm_initialize_sensor(tdev);
> + if (ret) {
> + dev_err(dev, "failed to initialize sensor\n");
> + return ret;
> + }
> + for (i = 0; i < ntrips; i++) {
> + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> + trips[i].temperature < crit_temp)
> + crit_temp = trips[i].temperature;
> + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> + tdev->alert_en[i] = true;
> + }
> + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> + CRITICAL_TEMP_LIMIT);
> + return -EINVAL;
> + }
> +
> + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> + 0, "thermal", tdev);
> + if (ret)
> + return ret;
> +
> + /* enable sensor */
> + uniphier_tm_enable_sensor(tdev);
> +
> + platform_set_drvdata(pdev, tdev);
> +
> + return 0;
> +}
> +
> +static int uniphier_tm_remove(struct platform_device *pdev)
> +{
> + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> +
> + /* disable sensor */
> + uniphier_tm_disable_sensor(tdev);
> +
> + return 0;
> +}
> +
> +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe000,
> + .tmod_setup_addr = 0xe904,
> +};
> +
> +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe800,
> + .tmod_setup_addr = 0xe938,
> +};
> +
> +static const struct of_device_id uniphier_tm_dt_ids[] = {
> + {
> + .compatible = "socionext,uniphier-pxs2-thermal",
> + .data = &uniphier_pxs2_tm_data,
> + },
> + {
> + .compatible = "socionext,uniphier-ld20-thermal",
> + .data = &uniphier_ld20_tm_data,
> + },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> +
> +static struct platform_driver uniphier_tm_driver = {
> + .probe = uniphier_tm_probe,
> + .remove = uniphier_tm_remove,
> + .driver = {
> + .name = "uniphier-thermal",
> + .of_match_table = uniphier_tm_dt_ids,
> + },
> +};
> +module_platform_driver(uniphier_tm_driver);
> +
> +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> +MODULE_DESCRIPTION("UniPhier thermal driver");
> +MODULE_LICENSE("GPL v2");
>
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-29 10:23 ` Keerthy
0 siblings, 0 replies; 41+ messages in thread
From: Keerthy @ 2017-05-29 10:23 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> monitoring unit implemented on UniPhier SoCs. This driver supports
> temperature monitoring and alert function.
The Documentation in patch 2/4 should be squashed into this patch.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 399 insertions(+)
> create mode 100644 drivers/thermal/uniphier_thermal.c
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 776b343..93ccf25 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> the primitive temperature sensor embedded in zx2967 SoCs.
> This sensor generates the real time die temperature.
>
> +config UNIPHIER_THERMAL
> + tristate "Socionext UniPhier thermal driver"
> + depends on ARCH_UNIPHIER || COMPILE_TEST
> + help
> + Enable this to support thermal reporting on UniPhier SoC.
> + This driver supports CPU thermal zone to reports the temperture
/s/temperture/temperature
Or consider re-wording to
"Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
thermal framework. The driver supports CPU thermal zone temperature
reporting and a couple of trip points."
> + and trip points.
> +
> endif
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 7adae20..05b6e7c 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -58,3 +58,4 @@ 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
> +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> new file mode 100644
> index 0000000..ae7e5ce
> --- /dev/null
> +++ b/drivers/thermal/uniphier_thermal.c
> @@ -0,0 +1,390 @@
> +/**
> + * uniphier_thermal.c - Socionext UniPhier thermal driver
> + *
> + * Copyright 2014 Panasonic Corporation
> + * Copyright 2016 Socionext Inc.
Update this please.
> + * All rights reserved.
> + *
> + * Author:
> + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 of
> + * the License as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/thermal.h>
> +
> +#include "thermal_core.h"
> +
> +/*
> + * block registers
> + * addresses are the offset from .block_base
> + */
> +#define PVTCTLEN 0x0000
> +#define PVTCTLEN_EN BIT(0)
> +
> +#define PVTCTLMODE 0x0004
> +#define PVTCTLMODE_MASK 0xf
> +#define PVTCTLMODE_TEMPMON 0x5
> +
> +#define EMONREPEAT 0x0040
> +#define EMONREPEAT_ENDLESS BIT(24)
> +#define EMONREPEAT_PERIOD 0xf
> +#define EMONREPEAT_PERIOD_1000000 0x9
> +
> +/*
> + * common registers
> + * addresses are the offset from .map_base
> + */
> +#define PVTCTLSEL 0x0900
> +#define PVTCTLSEL_MASK 0x7
> +#define PVTCTLSEL_MONITOR 0
> +
> +#define SETALERT0 0x0910
> +#define SETALERT1 0x0914
> +#define SETALERT2 0x0918
> +#define SETALERT_TEMP_OVF (0xff << 16)
> +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> +#define SETALERT_EN BIT(0)
> +
> +#define PMALERTINTCTL 0x0920
> +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> +#define PMALERTINTCTL_MASK 0x777
> +
> +#define TMOD 0x0928
> +#define TMOD_MASK 0x1ff
> +
> +#define TMODCOEF 0x0e5c
> +
> +#define TMODSETUP0_EN BIT(30)
> +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> +#define TMODSETUP1_EN BIT(15)
> +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
> +
> +/* SoC critical temperature is 95 degrees Celsius */
> +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> +
> +/* Max # of alert channels */
> +#define ALERT_CH_NUM 3
> +
> +/* SoC specific thermal sensor data */
> +struct uniphier_tm_soc_data {
> + u32 map_base;
> + u32 block_base;
> + u32 tmod_setup_addr;
> +};
> +
> +struct uniphier_tm_dev {
> + struct regmap *regmap;
> + bool alert_en[ALERT_CH_NUM];
> + u32 tmod_calib0;
> + u32 tmod_calib1;
> + struct thermal_zone_device *tz_dev;
> + const struct uniphier_tm_soc_data *data;
> +};
> +
> +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + u32 val;
> + int ret;
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +
> + /*
> + * set default value if missing calibrated value
> + *
> + * Since SoC has a calibrated value that was set in advance,
> + * TMODCOEF shows non-zero and PVT refers the value internally.
> + *
> + * However, there is the case that some SoCs might not have the
> + * calibrated value. In that case, TMODCOEF shows zero and the driver
> + * has to set default value manually.
> + */
> + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> + if (ret)
> + return ret;
> + if (!val)
> + regmap_write(map,
> + tdev->data->tmod_setup_addr,
> + TMODSETUP0_EN |
I guess the above parameter could be included in the previous line. Here
and else where can save a number of lines.
Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
Can go in a single line.
> + TMODSETUP0_VAL(tdev->tmod_calib0) |
> + TMODSETUP1_EN |
> + TMODSETUP1_VAL(tdev->tmod_calib1));
> +
> + /* select temperature mode */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLMODE,
> + PVTCTLMODE_MASK,
> + PVTCTLMODE_TEMPMON);
> +
> + /* set monitoring period */
> + regmap_write_bits(map,
> + tdev->data->block_base + EMONREPEAT,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD_1000000);
> +
> + /* set monitor mode */
> + regmap_write_bits(map,
> + tdev->data->map_base + PVTCTLSEL,
> + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> +
> + return 0;
> +}
> +
> +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> + u32 temp)
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* set alert temperature */
> + regmap_write_bits(map,
> + tdev->data->map_base + SETALERT0 + (ch << 2),
> + SETALERT_EN |
> + SETALERT_TEMP_OVF,
> + SETALERT_EN |
> + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> +}
> +
> +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + int i;
> + u32 bits = 0;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++)
> + if (tdev->alert_en[i])
> + bits |= PMALERTINTCTL_EN(i);
> +
> + /* enable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, bits);
> +
> + /* start PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, PVTCTLEN_EN);
> +}
> +
> +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* disable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, 0);
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +}
> +
> +static int uniphier_tm_get_temp(void *data, int *out_temp)
> +{
> + struct uniphier_tm_dev *tdev = data;
> + struct regmap *map = tdev->regmap;
> + int ret;
> + u32 temp;
> +
> + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> + if (ret)
> + return ret;
> +
> + temp &= TMOD_MASK;
> + *out_temp = temp * 1000; /* millicelsius */
> +
> + return 0;
> +}
> +
> +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> + .get_temp = uniphier_tm_get_temp,
> +};
> +
> +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> +{
> + u32 mask = 0, bits = 0;
> + int i;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++) {
> + mask |= (PMALERTINTCTL_CLR(i) |
> + PMALERTINTCTL_SET(i));
> + bits |= PMALERTINTCTL_CLR(i);
> + }
> +
> + /* clear alert interrupt */
> + regmap_write_bits(tdev->regmap,
> + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> +}
> +
> +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> +{
> + struct uniphier_tm_dev *tdev = _tdev;
> +
> + uniphier_tm_irq_clear(tdev);
> + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int uniphier_tm_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct regmap *regmap;
> + struct device_node *parent;
> + struct uniphier_tm_dev *tdev;
> + const struct thermal_trip *trips;
> + const u32 *calib;
> + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> +
> + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> + if (!tdev)
> + return -ENOMEM;
> +
> + tdev->data = of_device_get_match_data(dev);
> + if (WARN_ON(!tdev->data))
> + return -EINVAL;
> +
> + /* get irq */
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0)
> + return irq;
> +
> + /* get tmod-calibration values */
> + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> + NULL);
> + if (calib) {
> + tdev->tmod_calib0 = of_read_number(calib, 1);
> + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> + }
> +
> + /* get regmap from syscon node */
> + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> + regmap = syscon_node_to_regmap(parent);
> + of_node_put(parent);
> + if (IS_ERR(regmap)) {
> + dev_err(dev, "failed to get regmap (error %ld)\n",
> + PTR_ERR(regmap));
> + return PTR_ERR(regmap);
> + }
> + tdev->regmap = regmap;
> +
> + /* register sensor */
> + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> + &uniphier_of_thermal_ops);
> + if (IS_ERR(tdev->tz_dev)) {
> + dev_err(dev, "failed to register sensor device\n");
> + return PTR_ERR(tdev->tz_dev);
> + }
> +
> + /* get trip points */
> + trips = of_thermal_get_trip_points(tdev->tz_dev);
> + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> + if (ntrips > ALERT_CH_NUM) {
> + dev_err(dev, "thermal zone has too many trips\n");
> + return -E2BIG;
> + }
> +
> + /* initialize sensor */
> + ret = uniphier_tm_initialize_sensor(tdev);
> + if (ret) {
> + dev_err(dev, "failed to initialize sensor\n");
> + return ret;
> + }
> + for (i = 0; i < ntrips; i++) {
> + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> + trips[i].temperature < crit_temp)
> + crit_temp = trips[i].temperature;
> + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> + tdev->alert_en[i] = true;
> + }
> + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> + CRITICAL_TEMP_LIMIT);
> + return -EINVAL;
> + }
> +
> + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> + 0, "thermal", tdev);
> + if (ret)
> + return ret;
> +
> + /* enable sensor */
> + uniphier_tm_enable_sensor(tdev);
> +
> + platform_set_drvdata(pdev, tdev);
> +
> + return 0;
> +}
> +
> +static int uniphier_tm_remove(struct platform_device *pdev)
> +{
> + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> +
> + /* disable sensor */
> + uniphier_tm_disable_sensor(tdev);
> +
> + return 0;
> +}
> +
> +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe000,
> + .tmod_setup_addr = 0xe904,
> +};
> +
> +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe800,
> + .tmod_setup_addr = 0xe938,
> +};
> +
> +static const struct of_device_id uniphier_tm_dt_ids[] = {
> + {
> + .compatible = "socionext,uniphier-pxs2-thermal",
> + .data = &uniphier_pxs2_tm_data,
> + },
> + {
> + .compatible = "socionext,uniphier-ld20-thermal",
> + .data = &uniphier_ld20_tm_data,
> + },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> +
> +static struct platform_driver uniphier_tm_driver = {
> + .probe = uniphier_tm_probe,
> + .remove = uniphier_tm_remove,
> + .driver = {
> + .name = "uniphier-thermal",
> + .of_match_table = uniphier_tm_dt_ids,
> + },
> +};
> +module_platform_driver(uniphier_tm_driver);
> +
> +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> +MODULE_DESCRIPTION("UniPhier thermal driver");
> +MODULE_LICENSE("GPL v2");
>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 3/4] ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
2017-05-29 9:15 ` Kunihiko Hayashi
@ 2017-05-29 16:30 ` Eduardo Valentin
-1 siblings, 0 replies; 41+ messages in thread
From: Eduardo Valentin @ 2017-05-29 16:30 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: rui.zhang, linux-pm, linux-arm-kernel, linux-kernel, robh+dt,
mark.rutland, devicetree, yamada.masahiro, masami.hiramatsu,
jaswinder.singh
[-- Attachment #1: Type: text/plain, Size: 2790 bytes --]
On Mon, May 29, 2017 at 06:15:44PM +0900, Kunihiko Hayashi wrote:
> Add nodes of thermal monitor and thermal zone for UniPhier PXs2 SoC.
> The thermal monitor is included in sysctrl.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 +++++++++++++++++++++
> arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 +++++++++++++++++++++
> arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 ++++++
> 3 files changed, 48 insertions(+)
>
> diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> index 373818a..89ccb88 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> @@ -70,6 +70,27 @@
> i2c5 = &i2c5;
> i2c6 = &i2c6;
> };
> +
> + thermal-zones {
> + cpu_thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> + thermal-sensors = <&pvtctl>;
> +
> + trips {
> + cpu_crit: cpu_crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu_alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
These are missing cooling-maps section.
> + };
> + };
> };
>
> &serial2 {
> diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> index 51a3eac..0201584 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> @@ -68,6 +68,27 @@
> i2c5 = &i2c5;
> i2c6 = &i2c6;
> };
> +
> + thermal-zones {
> + cpu_thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> + thermal-sensors = <&pvtctl>;
> +
> + trips {
> + cpu_crit: cpu_crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu_alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
same
> + };
> + };
> };
>
> &serial2 {
> diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> index e9e031d..072e3b4 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> @@ -387,6 +387,12 @@
> compatible = "socionext,uniphier-pxs2-reset";
> #reset-cells = <1>;
> };
> +
> + pvtctl: pvtctl {
> + compatible = "socionext,uniphier-pxs2-thermal";
> + interrupts = <0 3 1>;
> + #thermal-sensor-cells = <0>;
> + };
> };
> };
> };
> --
> 2.7.4
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 3/4] ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
@ 2017-05-29 16:30 ` Eduardo Valentin
0 siblings, 0 replies; 41+ messages in thread
From: Eduardo Valentin @ 2017-05-29 16:30 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 29, 2017 at 06:15:44PM +0900, Kunihiko Hayashi wrote:
> Add nodes of thermal monitor and thermal zone for UniPhier PXs2 SoC.
> The thermal monitor is included in sysctrl.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 +++++++++++++++++++++
> arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 +++++++++++++++++++++
> arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 ++++++
> 3 files changed, 48 insertions(+)
>
> diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> index 373818a..89ccb88 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> @@ -70,6 +70,27 @@
> i2c5 = &i2c5;
> i2c6 = &i2c6;
> };
> +
> + thermal-zones {
> + cpu_thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> + thermal-sensors = <&pvtctl>;
> +
> + trips {
> + cpu_crit: cpu_crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu_alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
These are missing cooling-maps section.
> + };
> + };
> };
>
> &serial2 {
> diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> index 51a3eac..0201584 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> @@ -68,6 +68,27 @@
> i2c5 = &i2c5;
> i2c6 = &i2c6;
> };
> +
> + thermal-zones {
> + cpu_thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> + thermal-sensors = <&pvtctl>;
> +
> + trips {
> + cpu_crit: cpu_crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu_alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
same
> + };
> + };
> };
>
> &serial2 {
> diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> index e9e031d..072e3b4 100644
> --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
> +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> @@ -387,6 +387,12 @@
> compatible = "socionext,uniphier-pxs2-reset";
> #reset-cells = <1>;
> };
> +
> + pvtctl: pvtctl {
> + compatible = "socionext,uniphier-pxs2-thermal";
> + interrupts = <0 3 1>;
> + #thermal-sensor-cells = <0>;
> + };
> };
> };
> };
> --
> 2.7.4
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170529/ea25df8e/attachment.sig>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
2017-05-29 9:15 ` Kunihiko Hayashi
@ 2017-05-29 16:48 ` Eduardo Valentin
-1 siblings, 0 replies; 41+ messages in thread
From: Eduardo Valentin @ 2017-05-29 16:48 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: rui.zhang, linux-pm, linux-arm-kernel, linux-kernel, robh+dt,
mark.rutland, devicetree, yamada.masahiro, masami.hiramatsu,
jaswinder.singh
[-- Attachment #1: Type: text/plain, Size: 14204 bytes --]
Knihiko,
On Mon, May 29, 2017 at 06:15:42PM +0900, Kunihiko Hayashi wrote:
> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> monitoring unit implemented on UniPhier SoCs. This driver supports
> temperature monitoring and alert function.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 399 insertions(+)
> create mode 100644 drivers/thermal/uniphier_thermal.c
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 776b343..93ccf25 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> the primitive temperature sensor embedded in zx2967 SoCs.
> This sensor generates the real time die temperature.
>
> +config UNIPHIER_THERMAL
> + tristate "Socionext UniPhier thermal driver"
> + depends on ARCH_UNIPHIER || COMPILE_TEST
> + help
> + Enable this to support thermal reporting on UniPhier SoC.
> + This driver supports CPU thermal zone to reports the temperture
> + and trip points.
> +
> endif
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 7adae20..05b6e7c 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -58,3 +58,4 @@ 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
> +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> new file mode 100644
> index 0000000..ae7e5ce
> --- /dev/null
> +++ b/drivers/thermal/uniphier_thermal.c
> @@ -0,0 +1,390 @@
> +/**
> + * uniphier_thermal.c - Socionext UniPhier thermal driver
> + *
> + * Copyright 2014 Panasonic Corporation
> + * Copyright 2016 Socionext Inc.
> + * All rights reserved.
> + *
> + * Author:
> + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 of
> + * the License as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/thermal.h>
> +
> +#include "thermal_core.h"
> +
> +/*
> + * block registers
> + * addresses are the offset from .block_base
> + */
> +#define PVTCTLEN 0x0000
> +#define PVTCTLEN_EN BIT(0)
> +
> +#define PVTCTLMODE 0x0004
> +#define PVTCTLMODE_MASK 0xf
> +#define PVTCTLMODE_TEMPMON 0x5
> +
> +#define EMONREPEAT 0x0040
> +#define EMONREPEAT_ENDLESS BIT(24)
> +#define EMONREPEAT_PERIOD 0xf
> +#define EMONREPEAT_PERIOD_1000000 0x9
> +
> +/*
> + * common registers
> + * addresses are the offset from .map_base
> + */
> +#define PVTCTLSEL 0x0900
> +#define PVTCTLSEL_MASK 0x7
> +#define PVTCTLSEL_MONITOR 0
> +
> +#define SETALERT0 0x0910
> +#define SETALERT1 0x0914
> +#define SETALERT2 0x0918
> +#define SETALERT_TEMP_OVF (0xff << 16)
> +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> +#define SETALERT_EN BIT(0)
> +
> +#define PMALERTINTCTL 0x0920
> +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> +#define PMALERTINTCTL_MASK 0x777
> +
> +#define TMOD 0x0928
> +#define TMOD_MASK 0x1ff
> +
> +#define TMODCOEF 0x0e5c
> +
> +#define TMODSETUP0_EN BIT(30)
> +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> +#define TMODSETUP1_EN BIT(15)
> +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
Maybe use use GENMASK for some of the above macros?
> +
> +/* SoC critical temperature is 95 degrees Celsius */
> +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> +
> +/* Max # of alert channels */
> +#define ALERT_CH_NUM 3
> +
> +/* SoC specific thermal sensor data */
> +struct uniphier_tm_soc_data {
> + u32 map_base;
> + u32 block_base;
> + u32 tmod_setup_addr;
> +};
> +
> +struct uniphier_tm_dev {
> + struct regmap *regmap;
> + bool alert_en[ALERT_CH_NUM];
> + u32 tmod_calib0;
> + u32 tmod_calib1;
> + struct thermal_zone_device *tz_dev;
> + const struct uniphier_tm_soc_data *data;
> +};
> +
> +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + u32 val;
> + int ret;
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +
> + /*
> + * set default value if missing calibrated value
> + *
> + * Since SoC has a calibrated value that was set in advance,
> + * TMODCOEF shows non-zero and PVT refers the value internally.
> + *
> + * However, there is the case that some SoCs might not have the
> + * calibrated value. In that case, TMODCOEF shows zero and the driver
> + * has to set default value manually.
Is this a common case or a corner case? Do we really need to care of it?
How accurate would be the sensor if it is missing calib values?
Should we let the user know?
> + */
> + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> + if (ret)
> + return ret;
> + if (!val)
> + regmap_write(map,
> + tdev->data->tmod_setup_addr,
> + TMODSETUP0_EN |
> + TMODSETUP0_VAL(tdev->tmod_calib0) |
> + TMODSETUP1_EN |
> + TMODSETUP1_VAL(tdev->tmod_calib1));
> +
> + /* select temperature mode */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLMODE,
> + PVTCTLMODE_MASK,
> + PVTCTLMODE_TEMPMON);
> +
> + /* set monitoring period */
> + regmap_write_bits(map,
> + tdev->data->block_base + EMONREPEAT,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD_1000000);
> +
> + /* set monitor mode */
> + regmap_write_bits(map,
> + tdev->data->map_base + PVTCTLSEL,
> + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> +
> + return 0;
> +}
> +
> +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> + u32 temp)
Does your sensor support negative values? The subsystem does.
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* set alert temperature */
> + regmap_write_bits(map,
> + tdev->data->map_base + SETALERT0 + (ch << 2),
> + SETALERT_EN |
> + SETALERT_TEMP_OVF,
> + SETALERT_EN |
> + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> +}
> +
> +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + int i;
> + u32 bits = 0;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++)
> + if (tdev->alert_en[i])
> + bits |= PMALERTINTCTL_EN(i);
> +
> + /* enable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, bits);
> +
> + /* start PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, PVTCTLEN_EN);
> +}
> +
> +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* disable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, 0);
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +}
> +
> +static int uniphier_tm_get_temp(void *data, int *out_temp)
> +{
> + struct uniphier_tm_dev *tdev = data;
> + struct regmap *map = tdev->regmap;
> + int ret;
> + u32 temp;
> +
> + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> + if (ret)
> + return ret;
> +
> + temp &= TMOD_MASK;
> + *out_temp = temp * 1000; /* millicelsius */
> +
Are you sure you are not loosing in this conversion?
> + return 0;
> +}
> +
> +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> + .get_temp = uniphier_tm_get_temp,
> +};
> +
> +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> +{
> + u32 mask = 0, bits = 0;
> + int i;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++) {
> + mask |= (PMALERTINTCTL_CLR(i) |
> + PMALERTINTCTL_SET(i));
> + bits |= PMALERTINTCTL_CLR(i);
> + }
> +
> + /* clear alert interrupt */
> + regmap_write_bits(tdev->regmap,
> + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> +}
> +
> +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> +{
> + struct uniphier_tm_dev *tdev = _tdev;
> +
> + uniphier_tm_irq_clear(tdev);
> + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> +
This is executed in a top half, rigth? The above function uses mutexes
and should not be called within atomic context.
> + return IRQ_HANDLED;
> +}
> +
> +static int uniphier_tm_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct regmap *regmap;
> + struct device_node *parent;
> + struct uniphier_tm_dev *tdev;
> + const struct thermal_trip *trips;
> + const u32 *calib;
> + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> +
> + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> + if (!tdev)
> + return -ENOMEM;
> +
> + tdev->data = of_device_get_match_data(dev);
> + if (WARN_ON(!tdev->data))
> + return -EINVAL;
> +
> + /* get irq */
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0)
> + return irq;
> +
> + /* get tmod-calibration values */
> + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> + NULL);
> + if (calib) {
> + tdev->tmod_calib0 = of_read_number(calib, 1);
> + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> + }
> +
> + /* get regmap from syscon node */
> + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> + regmap = syscon_node_to_regmap(parent);
> + of_node_put(parent);
> + if (IS_ERR(regmap)) {
> + dev_err(dev, "failed to get regmap (error %ld)\n",
> + PTR_ERR(regmap));
> + return PTR_ERR(regmap);
> + }
> + tdev->regmap = regmap;
> +
> + /* register sensor */
> + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> + &uniphier_of_thermal_ops);
From this point on, your driver should be ready to serve calls from the
thermal subsystem. Looks like you are missing a lot of initialization,
still to come from below, aren't you?. I would suggest moving the above
registration further to a point when the sensor is ready to be used.
> + if (IS_ERR(tdev->tz_dev)) {
> + dev_err(dev, "failed to register sensor device\n");
> + return PTR_ERR(tdev->tz_dev);
> + }
> +
> + /* get trip points */
> + trips = of_thermal_get_trip_points(tdev->tz_dev);
> + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> + if (ntrips > ALERT_CH_NUM) {
> + dev_err(dev, "thermal zone has too many trips\n");
> + return -E2BIG;
> + }
> +
> + /* initialize sensor */
> + ret = uniphier_tm_initialize_sensor(tdev);
> + if (ret) {
> + dev_err(dev, "failed to initialize sensor\n");
> + return ret;
> + }
> + for (i = 0; i < ntrips; i++) {
> + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> + trips[i].temperature < crit_temp)
> + crit_temp = trips[i].temperature;
> + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> + tdev->alert_en[i] = true;
> + }
> + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> + CRITICAL_TEMP_LIMIT);
> + return -EINVAL;
> + }
> +
> + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> + 0, "thermal", tdev);
> + if (ret)
> + return ret;
> +
> + /* enable sensor */
> + uniphier_tm_enable_sensor(tdev);
> +
> + platform_set_drvdata(pdev, tdev);
> +
> + return 0;
> +}
> +
> +static int uniphier_tm_remove(struct platform_device *pdev)
> +{
> + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> +
> + /* disable sensor */
> + uniphier_tm_disable_sensor(tdev);
> +
> + return 0;
> +}
> +
> +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe000,
> + .tmod_setup_addr = 0xe904,
> +};
> +
> +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe800,
> + .tmod_setup_addr = 0xe938,
Shouldn't these be in your device tree using the register properties?
I see at least the map base as possible to be done in DT.
> +};
> +
> +static const struct of_device_id uniphier_tm_dt_ids[] = {
> + {
> + .compatible = "socionext,uniphier-pxs2-thermal",
> + .data = &uniphier_pxs2_tm_data,
> + },
> + {
> + .compatible = "socionext,uniphier-ld20-thermal",
> + .data = &uniphier_ld20_tm_data,
> + },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> +
> +static struct platform_driver uniphier_tm_driver = {
> + .probe = uniphier_tm_probe,
> + .remove = uniphier_tm_remove,
> + .driver = {
> + .name = "uniphier-thermal",
> + .of_match_table = uniphier_tm_dt_ids,
> + },
> +};
> +module_platform_driver(uniphier_tm_driver);
> +
> +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> +MODULE_DESCRIPTION("UniPhier thermal driver");
> +MODULE_LICENSE("GPL v2");
> --
> 2.7.4
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-29 16:48 ` Eduardo Valentin
0 siblings, 0 replies; 41+ messages in thread
From: Eduardo Valentin @ 2017-05-29 16:48 UTC (permalink / raw)
To: linux-arm-kernel
Knihiko,
On Mon, May 29, 2017 at 06:15:42PM +0900, Kunihiko Hayashi wrote:
> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> monitoring unit implemented on UniPhier SoCs. This driver supports
> temperature monitoring and alert function.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 399 insertions(+)
> create mode 100644 drivers/thermal/uniphier_thermal.c
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 776b343..93ccf25 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> the primitive temperature sensor embedded in zx2967 SoCs.
> This sensor generates the real time die temperature.
>
> +config UNIPHIER_THERMAL
> + tristate "Socionext UniPhier thermal driver"
> + depends on ARCH_UNIPHIER || COMPILE_TEST
> + help
> + Enable this to support thermal reporting on UniPhier SoC.
> + This driver supports CPU thermal zone to reports the temperture
> + and trip points.
> +
> endif
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 7adae20..05b6e7c 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -58,3 +58,4 @@ 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
> +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> new file mode 100644
> index 0000000..ae7e5ce
> --- /dev/null
> +++ b/drivers/thermal/uniphier_thermal.c
> @@ -0,0 +1,390 @@
> +/**
> + * uniphier_thermal.c - Socionext UniPhier thermal driver
> + *
> + * Copyright 2014 Panasonic Corporation
> + * Copyright 2016 Socionext Inc.
> + * All rights reserved.
> + *
> + * Author:
> + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 of
> + * the License as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/thermal.h>
> +
> +#include "thermal_core.h"
> +
> +/*
> + * block registers
> + * addresses are the offset from .block_base
> + */
> +#define PVTCTLEN 0x0000
> +#define PVTCTLEN_EN BIT(0)
> +
> +#define PVTCTLMODE 0x0004
> +#define PVTCTLMODE_MASK 0xf
> +#define PVTCTLMODE_TEMPMON 0x5
> +
> +#define EMONREPEAT 0x0040
> +#define EMONREPEAT_ENDLESS BIT(24)
> +#define EMONREPEAT_PERIOD 0xf
> +#define EMONREPEAT_PERIOD_1000000 0x9
> +
> +/*
> + * common registers
> + * addresses are the offset from .map_base
> + */
> +#define PVTCTLSEL 0x0900
> +#define PVTCTLSEL_MASK 0x7
> +#define PVTCTLSEL_MONITOR 0
> +
> +#define SETALERT0 0x0910
> +#define SETALERT1 0x0914
> +#define SETALERT2 0x0918
> +#define SETALERT_TEMP_OVF (0xff << 16)
> +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> +#define SETALERT_EN BIT(0)
> +
> +#define PMALERTINTCTL 0x0920
> +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> +#define PMALERTINTCTL_MASK 0x777
> +
> +#define TMOD 0x0928
> +#define TMOD_MASK 0x1ff
> +
> +#define TMODCOEF 0x0e5c
> +
> +#define TMODSETUP0_EN BIT(30)
> +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> +#define TMODSETUP1_EN BIT(15)
> +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
Maybe use use GENMASK for some of the above macros?
> +
> +/* SoC critical temperature is 95 degrees Celsius */
> +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> +
> +/* Max # of alert channels */
> +#define ALERT_CH_NUM 3
> +
> +/* SoC specific thermal sensor data */
> +struct uniphier_tm_soc_data {
> + u32 map_base;
> + u32 block_base;
> + u32 tmod_setup_addr;
> +};
> +
> +struct uniphier_tm_dev {
> + struct regmap *regmap;
> + bool alert_en[ALERT_CH_NUM];
> + u32 tmod_calib0;
> + u32 tmod_calib1;
> + struct thermal_zone_device *tz_dev;
> + const struct uniphier_tm_soc_data *data;
> +};
> +
> +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + u32 val;
> + int ret;
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +
> + /*
> + * set default value if missing calibrated value
> + *
> + * Since SoC has a calibrated value that was set in advance,
> + * TMODCOEF shows non-zero and PVT refers the value internally.
> + *
> + * However, there is the case that some SoCs might not have the
> + * calibrated value. In that case, TMODCOEF shows zero and the driver
> + * has to set default value manually.
Is this a common case or a corner case? Do we really need to care of it?
How accurate would be the sensor if it is missing calib values?
Should we let the user know?
> + */
> + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> + if (ret)
> + return ret;
> + if (!val)
> + regmap_write(map,
> + tdev->data->tmod_setup_addr,
> + TMODSETUP0_EN |
> + TMODSETUP0_VAL(tdev->tmod_calib0) |
> + TMODSETUP1_EN |
> + TMODSETUP1_VAL(tdev->tmod_calib1));
> +
> + /* select temperature mode */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLMODE,
> + PVTCTLMODE_MASK,
> + PVTCTLMODE_TEMPMON);
> +
> + /* set monitoring period */
> + regmap_write_bits(map,
> + tdev->data->block_base + EMONREPEAT,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD,
> + EMONREPEAT_ENDLESS |
> + EMONREPEAT_PERIOD_1000000);
> +
> + /* set monitor mode */
> + regmap_write_bits(map,
> + tdev->data->map_base + PVTCTLSEL,
> + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> +
> + return 0;
> +}
> +
> +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> + u32 temp)
Does your sensor support negative values? The subsystem does.
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* set alert temperature */
> + regmap_write_bits(map,
> + tdev->data->map_base + SETALERT0 + (ch << 2),
> + SETALERT_EN |
> + SETALERT_TEMP_OVF,
> + SETALERT_EN |
> + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> +}
> +
> +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> + int i;
> + u32 bits = 0;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++)
> + if (tdev->alert_en[i])
> + bits |= PMALERTINTCTL_EN(i);
> +
> + /* enable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, bits);
> +
> + /* start PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, PVTCTLEN_EN);
> +}
> +
> +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> +{
> + struct regmap *map = tdev->regmap;
> +
> + /* disable alert interrupt */
> + regmap_write_bits(map,
> + tdev->data->map_base + PMALERTINTCTL,
> + PMALERTINTCTL_MASK, 0);
> +
> + /* stop PVT */
> + regmap_write_bits(map,
> + tdev->data->block_base + PVTCTLEN,
> + PVTCTLEN_EN, 0);
> +}
> +
> +static int uniphier_tm_get_temp(void *data, int *out_temp)
> +{
> + struct uniphier_tm_dev *tdev = data;
> + struct regmap *map = tdev->regmap;
> + int ret;
> + u32 temp;
> +
> + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> + if (ret)
> + return ret;
> +
> + temp &= TMOD_MASK;
> + *out_temp = temp * 1000; /* millicelsius */
> +
Are you sure you are not loosing in this conversion?
> + return 0;
> +}
> +
> +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> + .get_temp = uniphier_tm_get_temp,
> +};
> +
> +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> +{
> + u32 mask = 0, bits = 0;
> + int i;
> +
> + for (i = 0; i < ALERT_CH_NUM; i++) {
> + mask |= (PMALERTINTCTL_CLR(i) |
> + PMALERTINTCTL_SET(i));
> + bits |= PMALERTINTCTL_CLR(i);
> + }
> +
> + /* clear alert interrupt */
> + regmap_write_bits(tdev->regmap,
> + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> +}
> +
> +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> +{
> + struct uniphier_tm_dev *tdev = _tdev;
> +
> + uniphier_tm_irq_clear(tdev);
> + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> +
This is executed in a top half, rigth? The above function uses mutexes
and should not be called within atomic context.
> + return IRQ_HANDLED;
> +}
> +
> +static int uniphier_tm_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct regmap *regmap;
> + struct device_node *parent;
> + struct uniphier_tm_dev *tdev;
> + const struct thermal_trip *trips;
> + const u32 *calib;
> + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> +
> + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> + if (!tdev)
> + return -ENOMEM;
> +
> + tdev->data = of_device_get_match_data(dev);
> + if (WARN_ON(!tdev->data))
> + return -EINVAL;
> +
> + /* get irq */
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0)
> + return irq;
> +
> + /* get tmod-calibration values */
> + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> + NULL);
> + if (calib) {
> + tdev->tmod_calib0 = of_read_number(calib, 1);
> + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> + }
> +
> + /* get regmap from syscon node */
> + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> + regmap = syscon_node_to_regmap(parent);
> + of_node_put(parent);
> + if (IS_ERR(regmap)) {
> + dev_err(dev, "failed to get regmap (error %ld)\n",
> + PTR_ERR(regmap));
> + return PTR_ERR(regmap);
> + }
> + tdev->regmap = regmap;
> +
> + /* register sensor */
> + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> + &uniphier_of_thermal_ops);
>From this point on, your driver should be ready to serve calls from the
thermal subsystem. Looks like you are missing a lot of initialization,
still to come from below, aren't you?. I would suggest moving the above
registration further to a point when the sensor is ready to be used.
> + if (IS_ERR(tdev->tz_dev)) {
> + dev_err(dev, "failed to register sensor device\n");
> + return PTR_ERR(tdev->tz_dev);
> + }
> +
> + /* get trip points */
> + trips = of_thermal_get_trip_points(tdev->tz_dev);
> + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> + if (ntrips > ALERT_CH_NUM) {
> + dev_err(dev, "thermal zone has too many trips\n");
> + return -E2BIG;
> + }
> +
> + /* initialize sensor */
> + ret = uniphier_tm_initialize_sensor(tdev);
> + if (ret) {
> + dev_err(dev, "failed to initialize sensor\n");
> + return ret;
> + }
> + for (i = 0; i < ntrips; i++) {
> + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> + trips[i].temperature < crit_temp)
> + crit_temp = trips[i].temperature;
> + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> + tdev->alert_en[i] = true;
> + }
> + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> + CRITICAL_TEMP_LIMIT);
> + return -EINVAL;
> + }
> +
> + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> + 0, "thermal", tdev);
> + if (ret)
> + return ret;
> +
> + /* enable sensor */
> + uniphier_tm_enable_sensor(tdev);
> +
> + platform_set_drvdata(pdev, tdev);
> +
> + return 0;
> +}
> +
> +static int uniphier_tm_remove(struct platform_device *pdev)
> +{
> + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> +
> + /* disable sensor */
> + uniphier_tm_disable_sensor(tdev);
> +
> + return 0;
> +}
> +
> +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe000,
> + .tmod_setup_addr = 0xe904,
> +};
> +
> +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> + .map_base = 0xe000,
> + .block_base = 0xe800,
> + .tmod_setup_addr = 0xe938,
Shouldn't these be in your device tree using the register properties?
I see at least the map base as possible to be done in DT.
> +};
> +
> +static const struct of_device_id uniphier_tm_dt_ids[] = {
> + {
> + .compatible = "socionext,uniphier-pxs2-thermal",
> + .data = &uniphier_pxs2_tm_data,
> + },
> + {
> + .compatible = "socionext,uniphier-ld20-thermal",
> + .data = &uniphier_ld20_tm_data,
> + },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> +
> +static struct platform_driver uniphier_tm_driver = {
> + .probe = uniphier_tm_probe,
> + .remove = uniphier_tm_remove,
> + .driver = {
> + .name = "uniphier-thermal",
> + .of_match_table = uniphier_tm_dt_ids,
> + },
> +};
> +module_platform_driver(uniphier_tm_driver);
> +
> +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> +MODULE_DESCRIPTION("UniPhier thermal driver");
> +MODULE_LICENSE("GPL v2");
> --
> 2.7.4
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170529/86f915ef/attachment.sig>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
2017-05-29 10:23 ` Keerthy
(?)
@ 2017-05-30 2:47 ` Kunihiko Hayashi
-1 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 2:47 UTC (permalink / raw)
To: Keerthy
Cc: rui.zhang, edubezval, linux-pm, linux-arm-kernel, linux-kernel,
robh+dt, mark.rutland, devicetree, yamada.masahiro,
masami.hiramatsu, jaswinder.singh
Hi Keerthy,
Thank you for your comment.
On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy@ti.com> wrote:
>
>
> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> > Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> > monitoring unit implemented on UniPhier SoCs. This driver supports
> > temperature monitoring and alert function.
>
> The Documentation in patch 2/4 should be squashed into this patch.
According to the following guide,
http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
1) The Documentation/ portion of the patch should be a separate patch.
I think it should be separated, how about that?
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> > drivers/thermal/Kconfig | 8 +
> > drivers/thermal/Makefile | 1 +
> > drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> > 3 files changed, 399 insertions(+)
> > create mode 100644 drivers/thermal/uniphier_thermal.c
> >
> > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> > index 776b343..93ccf25 100644
> > --- a/drivers/thermal/Kconfig
> > +++ b/drivers/thermal/Kconfig
> > @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> > the primitive temperature sensor embedded in zx2967 SoCs.
> > This sensor generates the real time die temperature.
> >
> > +config UNIPHIER_THERMAL
> > + tristate "Socionext UniPhier thermal driver"
> > + depends on ARCH_UNIPHIER || COMPILE_TEST
> > + help
> > + Enable this to support thermal reporting on UniPhier SoC.
> > + This driver supports CPU thermal zone to reports the temperture
>
> /s/temperture/temperature
>
> Or consider re-wording to
>
> "Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
> thermal framework. The driver supports CPU thermal zone temperature
> reporting and a couple of trip points."
Thanks for finding a typo and your re-wording. I'll fix it.
> > + and trip points.
> > +
> > endif
> > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> > index 7adae20..05b6e7c 100644
> > --- a/drivers/thermal/Makefile
> > +++ b/drivers/thermal/Makefile
> > @@ -58,3 +58,4 @@ 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
> > +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> > diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> > new file mode 100644
> > index 0000000..ae7e5ce
> > --- /dev/null
> > +++ b/drivers/thermal/uniphier_thermal.c
> > @@ -0,0 +1,390 @@
> > +/**
> > + * uniphier_thermal.c - Socionext UniPhier thermal driver
> > + *
> > + * Copyright 2014 Panasonic Corporation
> > + * Copyright 2016 Socionext Inc.
>
> Update this please.
I see. I'll update it.
> > + * All rights reserved.
> > + *
> > + * Author:
> > + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > + *
> > + * This program is free software: you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 of
> > + * the License as published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/regmap.h>
> > +#include <linux/thermal.h>
> > +
> > +#include "thermal_core.h"
> > +
> > +/*
> > + * block registers
> > + * addresses are the offset from .block_base
> > + */
> > +#define PVTCTLEN 0x0000
> > +#define PVTCTLEN_EN BIT(0)
> > +
> > +#define PVTCTLMODE 0x0004
> > +#define PVTCTLMODE_MASK 0xf
> > +#define PVTCTLMODE_TEMPMON 0x5
> > +
> > +#define EMONREPEAT 0x0040
> > +#define EMONREPEAT_ENDLESS BIT(24)
> > +#define EMONREPEAT_PERIOD 0xf
> > +#define EMONREPEAT_PERIOD_1000000 0x9
> > +
> > +/*
> > + * common registers
> > + * addresses are the offset from .map_base
> > + */
> > +#define PVTCTLSEL 0x0900
> > +#define PVTCTLSEL_MASK 0x7
> > +#define PVTCTLSEL_MONITOR 0
> > +
> > +#define SETALERT0 0x0910
> > +#define SETALERT1 0x0914
> > +#define SETALERT2 0x0918
> > +#define SETALERT_TEMP_OVF (0xff << 16)
> > +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> > +#define SETALERT_EN BIT(0)
> > +
> > +#define PMALERTINTCTL 0x0920
> > +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> > +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> > +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> > +#define PMALERTINTCTL_MASK 0x777
> > +
> > +#define TMOD 0x0928
> > +#define TMOD_MASK 0x1ff
> > +
> > +#define TMODCOEF 0x0e5c
> > +
> > +#define TMODSETUP0_EN BIT(30)
> > +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> > +#define TMODSETUP1_EN BIT(15)
> > +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
> > +
> > +/* SoC critical temperature is 95 degrees Celsius */
> > +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> > +
> > +/* Max # of alert channels */
> > +#define ALERT_CH_NUM 3
> > +
> > +/* SoC specific thermal sensor data */
> > +struct uniphier_tm_soc_data {
> > + u32 map_base;
> > + u32 block_base;
> > + u32 tmod_setup_addr;
> > +};
> > +
> > +struct uniphier_tm_dev {
> > + struct regmap *regmap;
> > + bool alert_en[ALERT_CH_NUM];
> > + u32 tmod_calib0;
> > + u32 tmod_calib1;
> > + struct thermal_zone_device *tz_dev;
> > + const struct uniphier_tm_soc_data *data;
> > +};
> > +
> > +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + u32 val;
> > + int ret;
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +
> > + /*
> > + * set default value if missing calibrated value
> > + *
> > + * Since SoC has a calibrated value that was set in advance,
> > + * TMODCOEF shows non-zero and PVT refers the value internally.
> > + *
> > + * However, there is the case that some SoCs might not have the
> > + * calibrated value. In that case, TMODCOEF shows zero and the driver
> > + * has to set default value manually.
> > + */
> > + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> > + if (ret)
> > + return ret;
> > + if (!val)
> > + regmap_write(map,
> > + tdev->data->tmod_setup_addr,
> > + TMODSETUP0_EN |
>
> I guess the above parameter could be included in the previous line. Here
> and else where can save a number of lines.
>
> Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
>
> Can go in a single line.
OK, I'll make an effort to save a number of lines including other lines.
> > + TMODSETUP0_VAL(tdev->tmod_calib0) |
> > + TMODSETUP1_EN |
> > + TMODSETUP1_VAL(tdev->tmod_calib1));
> > +
> > + /* select temperature mode */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLMODE,
> > + PVTCTLMODE_MASK,
> > + PVTCTLMODE_TEMPMON);
> > +
> > + /* set monitoring period */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + EMONREPEAT,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD_1000000);
> > +
> > + /* set monitor mode */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PVTCTLSEL,
> > + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> > +
> > + return 0;
> > +}
> > +
> > +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> > + u32 temp)
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* set alert temperature */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + SETALERT0 + (ch << 2),
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF,
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> > +}
> > +
> > +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + int i;
> > + u32 bits = 0;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++)
> > + if (tdev->alert_en[i])
> > + bits |= PMALERTINTCTL_EN(i);
> > +
> > + /* enable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, bits);
> > +
> > + /* start PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, PVTCTLEN_EN);
> > +}
> > +
> > +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* disable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, 0);
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +}
> > +
> > +static int uniphier_tm_get_temp(void *data, int *out_temp)
> > +{
> > + struct uniphier_tm_dev *tdev = data;
> > + struct regmap *map = tdev->regmap;
> > + int ret;
> > + u32 temp;
> > +
> > + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> > + if (ret)
> > + return ret;
> > +
> > + temp &= TMOD_MASK;
> > + *out_temp = temp * 1000; /* millicelsius */
> > +
> > + return 0;
> > +}
> > +
> > +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> > + .get_temp = uniphier_tm_get_temp,
> > +};
> > +
> > +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> > +{
> > + u32 mask = 0, bits = 0;
> > + int i;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++) {
> > + mask |= (PMALERTINTCTL_CLR(i) |
> > + PMALERTINTCTL_SET(i));
> > + bits |= PMALERTINTCTL_CLR(i);
> > + }
> > +
> > + /* clear alert interrupt */
> > + regmap_write_bits(tdev->regmap,
> > + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> > +}
> > +
> > +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> > +{
> > + struct uniphier_tm_dev *tdev = _tdev;
> > +
> > + uniphier_tm_irq_clear(tdev);
> > + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static int uniphier_tm_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct regmap *regmap;
> > + struct device_node *parent;
> > + struct uniphier_tm_dev *tdev;
> > + const struct thermal_trip *trips;
> > + const u32 *calib;
> > + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> > +
> > + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> > + if (!tdev)
> > + return -ENOMEM;
> > +
> > + tdev->data = of_device_get_match_data(dev);
> > + if (WARN_ON(!tdev->data))
> > + return -EINVAL;
> > +
> > + /* get irq */
> > + irq = platform_get_irq(pdev, 0);
> > + if (irq < 0)
> > + return irq;
> > +
> > + /* get tmod-calibration values */
> > + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> > + NULL);
> > + if (calib) {
> > + tdev->tmod_calib0 = of_read_number(calib, 1);
> > + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> > + }
> > +
> > + /* get regmap from syscon node */
> > + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> > + regmap = syscon_node_to_regmap(parent);
> > + of_node_put(parent);
> > + if (IS_ERR(regmap)) {
> > + dev_err(dev, "failed to get regmap (error %ld)\n",
> > + PTR_ERR(regmap));
> > + return PTR_ERR(regmap);
> > + }
> > + tdev->regmap = regmap;
> > +
> > + /* register sensor */
> > + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> > + &uniphier_of_thermal_ops);
> > + if (IS_ERR(tdev->tz_dev)) {
> > + dev_err(dev, "failed to register sensor device\n");
> > + return PTR_ERR(tdev->tz_dev);
> > + }
> > +
> > + /* get trip points */
> > + trips = of_thermal_get_trip_points(tdev->tz_dev);
> > + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> > + if (ntrips > ALERT_CH_NUM) {
> > + dev_err(dev, "thermal zone has too many trips\n");
> > + return -E2BIG;
> > + }
> > +
> > + /* initialize sensor */
> > + ret = uniphier_tm_initialize_sensor(tdev);
> > + if (ret) {
> > + dev_err(dev, "failed to initialize sensor\n");
> > + return ret;
> > + }
> > + for (i = 0; i < ntrips; i++) {
> > + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> > + trips[i].temperature < crit_temp)
> > + crit_temp = trips[i].temperature;
> > + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> > + tdev->alert_en[i] = true;
> > + }
> > + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> > + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> > + CRITICAL_TEMP_LIMIT);
> > + return -EINVAL;
> > + }
> > +
> > + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> > + 0, "thermal", tdev);
> > + if (ret)
> > + return ret;
> > +
> > + /* enable sensor */
> > + uniphier_tm_enable_sensor(tdev);
> > +
> > + platform_set_drvdata(pdev, tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static int uniphier_tm_remove(struct platform_device *pdev)
> > +{
> > + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> > +
> > + /* disable sensor */
> > + uniphier_tm_disable_sensor(tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe000,
> > + .tmod_setup_addr = 0xe904,
> > +};
> > +
> > +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe800,
> > + .tmod_setup_addr = 0xe938,
> > +};
> > +
> > +static const struct of_device_id uniphier_tm_dt_ids[] = {
> > + {
> > + .compatible = "socionext,uniphier-pxs2-thermal",
> > + .data = &uniphier_pxs2_tm_data,
> > + },
> > + {
> > + .compatible = "socionext,uniphier-ld20-thermal",
> > + .data = &uniphier_ld20_tm_data,
> > + },
> > + { /* sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> > +
> > +static struct platform_driver uniphier_tm_driver = {
> > + .probe = uniphier_tm_probe,
> > + .remove = uniphier_tm_remove,
> > + .driver = {
> > + .name = "uniphier-thermal",
> > + .of_match_table = uniphier_tm_dt_ids,
> > + },
> > +};
> > +module_platform_driver(uniphier_tm_driver);
> > +
> > +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> > +MODULE_DESCRIPTION("UniPhier thermal driver");
> > +MODULE_LICENSE("GPL v2");
> >
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-30 2:47 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 2:47 UTC (permalink / raw)
To: Keerthy
Cc: rui.zhang, edubezval, linux-pm, linux-arm-kernel, linux-kernel,
robh+dt, mark.rutland, devicetree, yamada.masahiro,
masami.hiramatsu, jaswinder.singh
Hi Keerthy,
Thank you for your comment.
On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy@ti.com> wrote:
>
>
> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> > Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> > monitoring unit implemented on UniPhier SoCs. This driver supports
> > temperature monitoring and alert function.
>
> The Documentation in patch 2/4 should be squashed into this patch.
According to the following guide,
http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
1) The Documentation/ portion of the patch should be a separate patch.
I think it should be separated, how about that?
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> > drivers/thermal/Kconfig | 8 +
> > drivers/thermal/Makefile | 1 +
> > drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> > 3 files changed, 399 insertions(+)
> > create mode 100644 drivers/thermal/uniphier_thermal.c
> >
> > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> > index 776b343..93ccf25 100644
> > --- a/drivers/thermal/Kconfig
> > +++ b/drivers/thermal/Kconfig
> > @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> > the primitive temperature sensor embedded in zx2967 SoCs.
> > This sensor generates the real time die temperature.
> >
> > +config UNIPHIER_THERMAL
> > + tristate "Socionext UniPhier thermal driver"
> > + depends on ARCH_UNIPHIER || COMPILE_TEST
> > + help
> > + Enable this to support thermal reporting on UniPhier SoC.
> > + This driver supports CPU thermal zone to reports the temperture
>
> /s/temperture/temperature
>
> Or consider re-wording to
>
> "Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
> thermal framework. The driver supports CPU thermal zone temperature
> reporting and a couple of trip points."
Thanks for finding a typo and your re-wording. I'll fix it.
> > + and trip points.
> > +
> > endif
> > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> > index 7adae20..05b6e7c 100644
> > --- a/drivers/thermal/Makefile
> > +++ b/drivers/thermal/Makefile
> > @@ -58,3 +58,4 @@ 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
> > +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> > diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> > new file mode 100644
> > index 0000000..ae7e5ce
> > --- /dev/null
> > +++ b/drivers/thermal/uniphier_thermal.c
> > @@ -0,0 +1,390 @@
> > +/**
> > + * uniphier_thermal.c - Socionext UniPhier thermal driver
> > + *
> > + * Copyright 2014 Panasonic Corporation
> > + * Copyright 2016 Socionext Inc.
>
> Update this please.
I see. I'll update it.
> > + * All rights reserved.
> > + *
> > + * Author:
> > + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > + *
> > + * This program is free software: you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 of
> > + * the License as published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/regmap.h>
> > +#include <linux/thermal.h>
> > +
> > +#include "thermal_core.h"
> > +
> > +/*
> > + * block registers
> > + * addresses are the offset from .block_base
> > + */
> > +#define PVTCTLEN 0x0000
> > +#define PVTCTLEN_EN BIT(0)
> > +
> > +#define PVTCTLMODE 0x0004
> > +#define PVTCTLMODE_MASK 0xf
> > +#define PVTCTLMODE_TEMPMON 0x5
> > +
> > +#define EMONREPEAT 0x0040
> > +#define EMONREPEAT_ENDLESS BIT(24)
> > +#define EMONREPEAT_PERIOD 0xf
> > +#define EMONREPEAT_PERIOD_1000000 0x9
> > +
> > +/*
> > + * common registers
> > + * addresses are the offset from .map_base
> > + */
> > +#define PVTCTLSEL 0x0900
> > +#define PVTCTLSEL_MASK 0x7
> > +#define PVTCTLSEL_MONITOR 0
> > +
> > +#define SETALERT0 0x0910
> > +#define SETALERT1 0x0914
> > +#define SETALERT2 0x0918
> > +#define SETALERT_TEMP_OVF (0xff << 16)
> > +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> > +#define SETALERT_EN BIT(0)
> > +
> > +#define PMALERTINTCTL 0x0920
> > +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> > +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> > +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> > +#define PMALERTINTCTL_MASK 0x777
> > +
> > +#define TMOD 0x0928
> > +#define TMOD_MASK 0x1ff
> > +
> > +#define TMODCOEF 0x0e5c
> > +
> > +#define TMODSETUP0_EN BIT(30)
> > +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> > +#define TMODSETUP1_EN BIT(15)
> > +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
> > +
> > +/* SoC critical temperature is 95 degrees Celsius */
> > +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> > +
> > +/* Max # of alert channels */
> > +#define ALERT_CH_NUM 3
> > +
> > +/* SoC specific thermal sensor data */
> > +struct uniphier_tm_soc_data {
> > + u32 map_base;
> > + u32 block_base;
> > + u32 tmod_setup_addr;
> > +};
> > +
> > +struct uniphier_tm_dev {
> > + struct regmap *regmap;
> > + bool alert_en[ALERT_CH_NUM];
> > + u32 tmod_calib0;
> > + u32 tmod_calib1;
> > + struct thermal_zone_device *tz_dev;
> > + const struct uniphier_tm_soc_data *data;
> > +};
> > +
> > +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + u32 val;
> > + int ret;
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +
> > + /*
> > + * set default value if missing calibrated value
> > + *
> > + * Since SoC has a calibrated value that was set in advance,
> > + * TMODCOEF shows non-zero and PVT refers the value internally.
> > + *
> > + * However, there is the case that some SoCs might not have the
> > + * calibrated value. In that case, TMODCOEF shows zero and the driver
> > + * has to set default value manually.
> > + */
> > + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> > + if (ret)
> > + return ret;
> > + if (!val)
> > + regmap_write(map,
> > + tdev->data->tmod_setup_addr,
> > + TMODSETUP0_EN |
>
> I guess the above parameter could be included in the previous line. Here
> and else where can save a number of lines.
>
> Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
>
> Can go in a single line.
OK, I'll make an effort to save a number of lines including other lines.
> > + TMODSETUP0_VAL(tdev->tmod_calib0) |
> > + TMODSETUP1_EN |
> > + TMODSETUP1_VAL(tdev->tmod_calib1));
> > +
> > + /* select temperature mode */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLMODE,
> > + PVTCTLMODE_MASK,
> > + PVTCTLMODE_TEMPMON);
> > +
> > + /* set monitoring period */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + EMONREPEAT,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD_1000000);
> > +
> > + /* set monitor mode */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PVTCTLSEL,
> > + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> > +
> > + return 0;
> > +}
> > +
> > +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> > + u32 temp)
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* set alert temperature */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + SETALERT0 + (ch << 2),
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF,
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> > +}
> > +
> > +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + int i;
> > + u32 bits = 0;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++)
> > + if (tdev->alert_en[i])
> > + bits |= PMALERTINTCTL_EN(i);
> > +
> > + /* enable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, bits);
> > +
> > + /* start PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, PVTCTLEN_EN);
> > +}
> > +
> > +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* disable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, 0);
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +}
> > +
> > +static int uniphier_tm_get_temp(void *data, int *out_temp)
> > +{
> > + struct uniphier_tm_dev *tdev = data;
> > + struct regmap *map = tdev->regmap;
> > + int ret;
> > + u32 temp;
> > +
> > + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> > + if (ret)
> > + return ret;
> > +
> > + temp &= TMOD_MASK;
> > + *out_temp = temp * 1000; /* millicelsius */
> > +
> > + return 0;
> > +}
> > +
> > +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> > + .get_temp = uniphier_tm_get_temp,
> > +};
> > +
> > +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> > +{
> > + u32 mask = 0, bits = 0;
> > + int i;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++) {
> > + mask |= (PMALERTINTCTL_CLR(i) |
> > + PMALERTINTCTL_SET(i));
> > + bits |= PMALERTINTCTL_CLR(i);
> > + }
> > +
> > + /* clear alert interrupt */
> > + regmap_write_bits(tdev->regmap,
> > + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> > +}
> > +
> > +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> > +{
> > + struct uniphier_tm_dev *tdev = _tdev;
> > +
> > + uniphier_tm_irq_clear(tdev);
> > + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static int uniphier_tm_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct regmap *regmap;
> > + struct device_node *parent;
> > + struct uniphier_tm_dev *tdev;
> > + const struct thermal_trip *trips;
> > + const u32 *calib;
> > + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> > +
> > + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> > + if (!tdev)
> > + return -ENOMEM;
> > +
> > + tdev->data = of_device_get_match_data(dev);
> > + if (WARN_ON(!tdev->data))
> > + return -EINVAL;
> > +
> > + /* get irq */
> > + irq = platform_get_irq(pdev, 0);
> > + if (irq < 0)
> > + return irq;
> > +
> > + /* get tmod-calibration values */
> > + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> > + NULL);
> > + if (calib) {
> > + tdev->tmod_calib0 = of_read_number(calib, 1);
> > + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> > + }
> > +
> > + /* get regmap from syscon node */
> > + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> > + regmap = syscon_node_to_regmap(parent);
> > + of_node_put(parent);
> > + if (IS_ERR(regmap)) {
> > + dev_err(dev, "failed to get regmap (error %ld)\n",
> > + PTR_ERR(regmap));
> > + return PTR_ERR(regmap);
> > + }
> > + tdev->regmap = regmap;
> > +
> > + /* register sensor */
> > + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> > + &uniphier_of_thermal_ops);
> > + if (IS_ERR(tdev->tz_dev)) {
> > + dev_err(dev, "failed to register sensor device\n");
> > + return PTR_ERR(tdev->tz_dev);
> > + }
> > +
> > + /* get trip points */
> > + trips = of_thermal_get_trip_points(tdev->tz_dev);
> > + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> > + if (ntrips > ALERT_CH_NUM) {
> > + dev_err(dev, "thermal zone has too many trips\n");
> > + return -E2BIG;
> > + }
> > +
> > + /* initialize sensor */
> > + ret = uniphier_tm_initialize_sensor(tdev);
> > + if (ret) {
> > + dev_err(dev, "failed to initialize sensor\n");
> > + return ret;
> > + }
> > + for (i = 0; i < ntrips; i++) {
> > + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> > + trips[i].temperature < crit_temp)
> > + crit_temp = trips[i].temperature;
> > + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> > + tdev->alert_en[i] = true;
> > + }
> > + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> > + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> > + CRITICAL_TEMP_LIMIT);
> > + return -EINVAL;
> > + }
> > +
> > + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> > + 0, "thermal", tdev);
> > + if (ret)
> > + return ret;
> > +
> > + /* enable sensor */
> > + uniphier_tm_enable_sensor(tdev);
> > +
> > + platform_set_drvdata(pdev, tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static int uniphier_tm_remove(struct platform_device *pdev)
> > +{
> > + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> > +
> > + /* disable sensor */
> > + uniphier_tm_disable_sensor(tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe000,
> > + .tmod_setup_addr = 0xe904,
> > +};
> > +
> > +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe800,
> > + .tmod_setup_addr = 0xe938,
> > +};
> > +
> > +static const struct of_device_id uniphier_tm_dt_ids[] = {
> > + {
> > + .compatible = "socionext,uniphier-pxs2-thermal",
> > + .data = &uniphier_pxs2_tm_data,
> > + },
> > + {
> > + .compatible = "socionext,uniphier-ld20-thermal",
> > + .data = &uniphier_ld20_tm_data,
> > + },
> > + { /* sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> > +
> > +static struct platform_driver uniphier_tm_driver = {
> > + .probe = uniphier_tm_probe,
> > + .remove = uniphier_tm_remove,
> > + .driver = {
> > + .name = "uniphier-thermal",
> > + .of_match_table = uniphier_tm_dt_ids,
> > + },
> > +};
> > +module_platform_driver(uniphier_tm_driver);
> > +
> > +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> > +MODULE_DESCRIPTION("UniPhier thermal driver");
> > +MODULE_LICENSE("GPL v2");
> >
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-30 2:47 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 2:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi Keerthy,
Thank you for your comment.
On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy@ti.com> wrote:
>
>
> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> > Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> > monitoring unit implemented on UniPhier SoCs. This driver supports
> > temperature monitoring and alert function.
>
> The Documentation in patch 2/4 should be squashed into this patch.
According to the following guide,
http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
1) The Documentation/ portion of the patch should be a separate patch.
I think it should be separated, how about that?
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> > drivers/thermal/Kconfig | 8 +
> > drivers/thermal/Makefile | 1 +
> > drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> > 3 files changed, 399 insertions(+)
> > create mode 100644 drivers/thermal/uniphier_thermal.c
> >
> > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> > index 776b343..93ccf25 100644
> > --- a/drivers/thermal/Kconfig
> > +++ b/drivers/thermal/Kconfig
> > @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> > the primitive temperature sensor embedded in zx2967 SoCs.
> > This sensor generates the real time die temperature.
> >
> > +config UNIPHIER_THERMAL
> > + tristate "Socionext UniPhier thermal driver"
> > + depends on ARCH_UNIPHIER || COMPILE_TEST
> > + help
> > + Enable this to support thermal reporting on UniPhier SoC.
> > + This driver supports CPU thermal zone to reports the temperture
>
> /s/temperture/temperature
>
> Or consider re-wording to
>
> "Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
> thermal framework. The driver supports CPU thermal zone temperature
> reporting and a couple of trip points."
Thanks for finding a typo and your re-wording. I'll fix it.
> > + and trip points.
> > +
> > endif
> > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> > index 7adae20..05b6e7c 100644
> > --- a/drivers/thermal/Makefile
> > +++ b/drivers/thermal/Makefile
> > @@ -58,3 +58,4 @@ 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
> > +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> > diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> > new file mode 100644
> > index 0000000..ae7e5ce
> > --- /dev/null
> > +++ b/drivers/thermal/uniphier_thermal.c
> > @@ -0,0 +1,390 @@
> > +/**
> > + * uniphier_thermal.c - Socionext UniPhier thermal driver
> > + *
> > + * Copyright 2014 Panasonic Corporation
> > + * Copyright 2016 Socionext Inc.
>
> Update this please.
I see. I'll update it.
> > + * All rights reserved.
> > + *
> > + * Author:
> > + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > + *
> > + * This program is free software: you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 of
> > + * the License as published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/regmap.h>
> > +#include <linux/thermal.h>
> > +
> > +#include "thermal_core.h"
> > +
> > +/*
> > + * block registers
> > + * addresses are the offset from .block_base
> > + */
> > +#define PVTCTLEN 0x0000
> > +#define PVTCTLEN_EN BIT(0)
> > +
> > +#define PVTCTLMODE 0x0004
> > +#define PVTCTLMODE_MASK 0xf
> > +#define PVTCTLMODE_TEMPMON 0x5
> > +
> > +#define EMONREPEAT 0x0040
> > +#define EMONREPEAT_ENDLESS BIT(24)
> > +#define EMONREPEAT_PERIOD 0xf
> > +#define EMONREPEAT_PERIOD_1000000 0x9
> > +
> > +/*
> > + * common registers
> > + * addresses are the offset from .map_base
> > + */
> > +#define PVTCTLSEL 0x0900
> > +#define PVTCTLSEL_MASK 0x7
> > +#define PVTCTLSEL_MONITOR 0
> > +
> > +#define SETALERT0 0x0910
> > +#define SETALERT1 0x0914
> > +#define SETALERT2 0x0918
> > +#define SETALERT_TEMP_OVF (0xff << 16)
> > +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> > +#define SETALERT_EN BIT(0)
> > +
> > +#define PMALERTINTCTL 0x0920
> > +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> > +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> > +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> > +#define PMALERTINTCTL_MASK 0x777
> > +
> > +#define TMOD 0x0928
> > +#define TMOD_MASK 0x1ff
> > +
> > +#define TMODCOEF 0x0e5c
> > +
> > +#define TMODSETUP0_EN BIT(30)
> > +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> > +#define TMODSETUP1_EN BIT(15)
> > +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
> > +
> > +/* SoC critical temperature is 95 degrees Celsius */
> > +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> > +
> > +/* Max # of alert channels */
> > +#define ALERT_CH_NUM 3
> > +
> > +/* SoC specific thermal sensor data */
> > +struct uniphier_tm_soc_data {
> > + u32 map_base;
> > + u32 block_base;
> > + u32 tmod_setup_addr;
> > +};
> > +
> > +struct uniphier_tm_dev {
> > + struct regmap *regmap;
> > + bool alert_en[ALERT_CH_NUM];
> > + u32 tmod_calib0;
> > + u32 tmod_calib1;
> > + struct thermal_zone_device *tz_dev;
> > + const struct uniphier_tm_soc_data *data;
> > +};
> > +
> > +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + u32 val;
> > + int ret;
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +
> > + /*
> > + * set default value if missing calibrated value
> > + *
> > + * Since SoC has a calibrated value that was set in advance,
> > + * TMODCOEF shows non-zero and PVT refers the value internally.
> > + *
> > + * However, there is the case that some SoCs might not have the
> > + * calibrated value. In that case, TMODCOEF shows zero and the driver
> > + * has to set default value manually.
> > + */
> > + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> > + if (ret)
> > + return ret;
> > + if (!val)
> > + regmap_write(map,
> > + tdev->data->tmod_setup_addr,
> > + TMODSETUP0_EN |
>
> I guess the above parameter could be included in the previous line. Here
> and else where can save a number of lines.
>
> Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
>
> Can go in a single line.
OK, I'll make an effort to save a number of lines including other lines.
> > + TMODSETUP0_VAL(tdev->tmod_calib0) |
> > + TMODSETUP1_EN |
> > + TMODSETUP1_VAL(tdev->tmod_calib1));
> > +
> > + /* select temperature mode */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLMODE,
> > + PVTCTLMODE_MASK,
> > + PVTCTLMODE_TEMPMON);
> > +
> > + /* set monitoring period */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + EMONREPEAT,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD_1000000);
> > +
> > + /* set monitor mode */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PVTCTLSEL,
> > + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> > +
> > + return 0;
> > +}
> > +
> > +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> > + u32 temp)
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* set alert temperature */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + SETALERT0 + (ch << 2),
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF,
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> > +}
> > +
> > +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + int i;
> > + u32 bits = 0;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++)
> > + if (tdev->alert_en[i])
> > + bits |= PMALERTINTCTL_EN(i);
> > +
> > + /* enable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, bits);
> > +
> > + /* start PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, PVTCTLEN_EN);
> > +}
> > +
> > +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* disable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, 0);
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +}
> > +
> > +static int uniphier_tm_get_temp(void *data, int *out_temp)
> > +{
> > + struct uniphier_tm_dev *tdev = data;
> > + struct regmap *map = tdev->regmap;
> > + int ret;
> > + u32 temp;
> > +
> > + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> > + if (ret)
> > + return ret;
> > +
> > + temp &= TMOD_MASK;
> > + *out_temp = temp * 1000; /* millicelsius */
> > +
> > + return 0;
> > +}
> > +
> > +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> > + .get_temp = uniphier_tm_get_temp,
> > +};
> > +
> > +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> > +{
> > + u32 mask = 0, bits = 0;
> > + int i;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++) {
> > + mask |= (PMALERTINTCTL_CLR(i) |
> > + PMALERTINTCTL_SET(i));
> > + bits |= PMALERTINTCTL_CLR(i);
> > + }
> > +
> > + /* clear alert interrupt */
> > + regmap_write_bits(tdev->regmap,
> > + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> > +}
> > +
> > +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> > +{
> > + struct uniphier_tm_dev *tdev = _tdev;
> > +
> > + uniphier_tm_irq_clear(tdev);
> > + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static int uniphier_tm_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct regmap *regmap;
> > + struct device_node *parent;
> > + struct uniphier_tm_dev *tdev;
> > + const struct thermal_trip *trips;
> > + const u32 *calib;
> > + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> > +
> > + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> > + if (!tdev)
> > + return -ENOMEM;
> > +
> > + tdev->data = of_device_get_match_data(dev);
> > + if (WARN_ON(!tdev->data))
> > + return -EINVAL;
> > +
> > + /* get irq */
> > + irq = platform_get_irq(pdev, 0);
> > + if (irq < 0)
> > + return irq;
> > +
> > + /* get tmod-calibration values */
> > + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> > + NULL);
> > + if (calib) {
> > + tdev->tmod_calib0 = of_read_number(calib, 1);
> > + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> > + }
> > +
> > + /* get regmap from syscon node */
> > + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> > + regmap = syscon_node_to_regmap(parent);
> > + of_node_put(parent);
> > + if (IS_ERR(regmap)) {
> > + dev_err(dev, "failed to get regmap (error %ld)\n",
> > + PTR_ERR(regmap));
> > + return PTR_ERR(regmap);
> > + }
> > + tdev->regmap = regmap;
> > +
> > + /* register sensor */
> > + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> > + &uniphier_of_thermal_ops);
> > + if (IS_ERR(tdev->tz_dev)) {
> > + dev_err(dev, "failed to register sensor device\n");
> > + return PTR_ERR(tdev->tz_dev);
> > + }
> > +
> > + /* get trip points */
> > + trips = of_thermal_get_trip_points(tdev->tz_dev);
> > + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> > + if (ntrips > ALERT_CH_NUM) {
> > + dev_err(dev, "thermal zone has too many trips\n");
> > + return -E2BIG;
> > + }
> > +
> > + /* initialize sensor */
> > + ret = uniphier_tm_initialize_sensor(tdev);
> > + if (ret) {
> > + dev_err(dev, "failed to initialize sensor\n");
> > + return ret;
> > + }
> > + for (i = 0; i < ntrips; i++) {
> > + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> > + trips[i].temperature < crit_temp)
> > + crit_temp = trips[i].temperature;
> > + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> > + tdev->alert_en[i] = true;
> > + }
> > + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> > + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> > + CRITICAL_TEMP_LIMIT);
> > + return -EINVAL;
> > + }
> > +
> > + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> > + 0, "thermal", tdev);
> > + if (ret)
> > + return ret;
> > +
> > + /* enable sensor */
> > + uniphier_tm_enable_sensor(tdev);
> > +
> > + platform_set_drvdata(pdev, tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static int uniphier_tm_remove(struct platform_device *pdev)
> > +{
> > + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> > +
> > + /* disable sensor */
> > + uniphier_tm_disable_sensor(tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe000,
> > + .tmod_setup_addr = 0xe904,
> > +};
> > +
> > +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe800,
> > + .tmod_setup_addr = 0xe938,
> > +};
> > +
> > +static const struct of_device_id uniphier_tm_dt_ids[] = {
> > + {
> > + .compatible = "socionext,uniphier-pxs2-thermal",
> > + .data = &uniphier_pxs2_tm_data,
> > + },
> > + {
> > + .compatible = "socionext,uniphier-ld20-thermal",
> > + .data = &uniphier_ld20_tm_data,
> > + },
> > + { /* sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> > +
> > +static struct platform_driver uniphier_tm_driver = {
> > + .probe = uniphier_tm_probe,
> > + .remove = uniphier_tm_remove,
> > + .driver = {
> > + .name = "uniphier-thermal",
> > + .of_match_table = uniphier_tm_dt_ids,
> > + },
> > +};
> > +module_platform_driver(uniphier_tm_driver);
> > +
> > +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> > +MODULE_DESCRIPTION("UniPhier thermal driver");
> > +MODULE_LICENSE("GPL v2");
> >
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-30 3:21 ` Keerthy
0 siblings, 0 replies; 41+ messages in thread
From: Keerthy @ 2017-05-30 3:21 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: rui.zhang, edubezval, linux-pm, linux-arm-kernel, linux-kernel,
robh+dt, mark.rutland, devicetree, yamada.masahiro,
masami.hiramatsu, jaswinder.singh
On Tuesday 30 May 2017 08:17 AM, Kunihiko Hayashi wrote:
> Hi Keerthy,
> Thank you for your comment.
>
> On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy@ti.com> wrote:
>>
>>
>> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
>>> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
>>> monitoring unit implemented on UniPhier SoCs. This driver supports
>>> temperature monitoring and alert function.
>>
>> The Documentation in patch 2/4 should be squashed into this patch.
>
> According to the following guide,
> http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
>
> 1) The Documentation/ portion of the patch should be a separate patch.
>
> I think it should be separated, how about that?
Then you should reorder the series as we get the warning with checkpatch:
WARNING: DT compatible string "socionext,uniphier-pxs2-thermal" appears
un-documented -- check ./Documentation/devicetree/bindings/
#488: FILE: drivers/thermal/uniphier_thermal.c:367:
+ .compatible = "socionext,uniphier-pxs2-thermal",
WARNING: DT compatible string "socionext,uniphier-ld20-thermal" appears
un-documented -- check ./Documentation/devicetree/bindings/
#492: FILE: drivers/thermal/uniphier_thermal.c:371:
+ .compatible = "socionext,uniphier-ld20-thermal",
When i apply the first patch.
>
>>>
>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>> ---
>>> drivers/thermal/Kconfig | 8 +
>>> drivers/thermal/Makefile | 1 +
>>> drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
>>> 3 files changed, 399 insertions(+)
>>> create mode 100644 drivers/thermal/uniphier_thermal.c
>>>
>>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>>> index 776b343..93ccf25 100644
>>> --- a/drivers/thermal/Kconfig
>>> +++ b/drivers/thermal/Kconfig
>>> @@ -453,4 +453,12 @@ config ZX2967_THERMAL
>>> the primitive temperature sensor embedded in zx2967 SoCs.
>>> This sensor generates the real time die temperature.
>>>
>>> +config UNIPHIER_THERMAL
>>> + tristate "Socionext UniPhier thermal driver"
>>> + depends on ARCH_UNIPHIER || COMPILE_TEST
>>> + help
>>> + Enable this to support thermal reporting on UniPhier SoC.
>>> + This driver supports CPU thermal zone to reports the temperture
>>
>> /s/temperture/temperature
>>
>> Or consider re-wording to
>>
>> "Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
>> thermal framework. The driver supports CPU thermal zone temperature
>> reporting and a couple of trip points."
>
> Thanks for finding a typo and your re-wording. I'll fix it.
>
>>> + and trip points.
>>> +
>>> endif
>>> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
>>> index 7adae20..05b6e7c 100644
>>> --- a/drivers/thermal/Makefile
>>> +++ b/drivers/thermal/Makefile
>>> @@ -58,3 +58,4 @@ 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
>>> +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
>>> diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
>>> new file mode 100644
>>> index 0000000..ae7e5ce
>>> --- /dev/null
>>> +++ b/drivers/thermal/uniphier_thermal.c
>>> @@ -0,0 +1,390 @@
>>> +/**
>>> + * uniphier_thermal.c - Socionext UniPhier thermal driver
>>> + *
>>> + * Copyright 2014 Panasonic Corporation
>>> + * Copyright 2016 Socionext Inc.
>>
>> Update this please.
>
> I see. I'll update it.
>
>>> + * All rights reserved.
>>> + *
>>> + * Author:
>>> + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>> + *
>>> + * This program is free software: you can redistribute it and/or modify
>>> + * it under the terms of the GNU General Public License version 2 of
>>> + * the License as published by the Free Software Foundation.
>>> + *
>>> + * This program is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>>> + * GNU General Public License for more details.
>>> + */
>>> +
>>> +#include <linux/bitops.h>
>>> +#include <linux/interrupt.h>
>>> +#include <linux/mfd/syscon.h>
>>> +#include <linux/module.h>
>>> +#include <linux/of.h>
>>> +#include <linux/of_device.h>
>>> +#include <linux/platform_device.h>
>>> +#include <linux/regmap.h>
>>> +#include <linux/thermal.h>
>>> +
>>> +#include "thermal_core.h"
>>> +
>>> +/*
>>> + * block registers
>>> + * addresses are the offset from .block_base
>>> + */
>>> +#define PVTCTLEN 0x0000
>>> +#define PVTCTLEN_EN BIT(0)
>>> +
>>> +#define PVTCTLMODE 0x0004
>>> +#define PVTCTLMODE_MASK 0xf
>>> +#define PVTCTLMODE_TEMPMON 0x5
>>> +
>>> +#define EMONREPEAT 0x0040
>>> +#define EMONREPEAT_ENDLESS BIT(24)
>>> +#define EMONREPEAT_PERIOD 0xf
>>> +#define EMONREPEAT_PERIOD_1000000 0x9
>>> +
>>> +/*
>>> + * common registers
>>> + * addresses are the offset from .map_base
>>> + */
>>> +#define PVTCTLSEL 0x0900
>>> +#define PVTCTLSEL_MASK 0x7
>>> +#define PVTCTLSEL_MONITOR 0
>>> +
>>> +#define SETALERT0 0x0910
>>> +#define SETALERT1 0x0914
>>> +#define SETALERT2 0x0918
>>> +#define SETALERT_TEMP_OVF (0xff << 16)
>>> +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
>>> +#define SETALERT_EN BIT(0)
>>> +
>>> +#define PMALERTINTCTL 0x0920
>>> +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
>>> +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
>>> +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
>>> +#define PMALERTINTCTL_MASK 0x777
>>> +
>>> +#define TMOD 0x0928
>>> +#define TMOD_MASK 0x1ff
>>> +
>>> +#define TMODCOEF 0x0e5c
>>> +
>>> +#define TMODSETUP0_EN BIT(30)
>>> +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
>>> +#define TMODSETUP1_EN BIT(15)
>>> +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
>>> +
>>> +/* SoC critical temperature is 95 degrees Celsius */
>>> +#define CRITICAL_TEMP_LIMIT (95 * 1000)
>>> +
>>> +/* Max # of alert channels */
>>> +#define ALERT_CH_NUM 3
>>> +
>>> +/* SoC specific thermal sensor data */
>>> +struct uniphier_tm_soc_data {
>>> + u32 map_base;
>>> + u32 block_base;
>>> + u32 tmod_setup_addr;
>>> +};
>>> +
>>> +struct uniphier_tm_dev {
>>> + struct regmap *regmap;
>>> + bool alert_en[ALERT_CH_NUM];
>>> + u32 tmod_calib0;
>>> + u32 tmod_calib1;
>>> + struct thermal_zone_device *tz_dev;
>>> + const struct uniphier_tm_soc_data *data;
>>> +};
>>> +
>>> +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> + u32 val;
>>> + int ret;
>>> +
>>> + /* stop PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, 0);
>>> +
>>> + /*
>>> + * set default value if missing calibrated value
>>> + *
>>> + * Since SoC has a calibrated value that was set in advance,
>>> + * TMODCOEF shows non-zero and PVT refers the value internally.
>>> + *
>>> + * However, there is the case that some SoCs might not have the
>>> + * calibrated value. In that case, TMODCOEF shows zero and the driver
>>> + * has to set default value manually.
>>> + */
>>> + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
>>> + if (ret)
>>> + return ret;
>>> + if (!val)
>>> + regmap_write(map,
>>> + tdev->data->tmod_setup_addr,
>>> + TMODSETUP0_EN |
>>
>> I guess the above parameter could be included in the previous line. Here
>> and else where can save a number of lines.
>>
>> Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
>>
>> Can go in a single line.
>
> OK, I'll make an effort to save a number of lines including other lines.
>
>>> + TMODSETUP0_VAL(tdev->tmod_calib0) |
>>> + TMODSETUP1_EN |
>>> + TMODSETUP1_VAL(tdev->tmod_calib1));
>>> +
>>> + /* select temperature mode */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLMODE,
>>> + PVTCTLMODE_MASK,
>>> + PVTCTLMODE_TEMPMON);
>>> +
>>> + /* set monitoring period */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + EMONREPEAT,
>>> + EMONREPEAT_ENDLESS |
>>> + EMONREPEAT_PERIOD,
>>> + EMONREPEAT_ENDLESS |
>>> + EMONREPEAT_PERIOD_1000000);
>>> +
>>> + /* set monitor mode */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PVTCTLSEL,
>>> + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
>>> + u32 temp)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> +
>>> + /* set alert temperature */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + SETALERT0 + (ch << 2),
>>> + SETALERT_EN |
>>> + SETALERT_TEMP_OVF,
>>> + SETALERT_EN |
>>> + SETALERT_TEMP_OVF_VALUE(temp / 1000));
>>> +}
>>> +
>>> +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> + int i;
>>> + u32 bits = 0;
>>> +
>>> + for (i = 0; i < ALERT_CH_NUM; i++)
>>> + if (tdev->alert_en[i])
>>> + bits |= PMALERTINTCTL_EN(i);
>>> +
>>> + /* enable alert interrupt */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PMALERTINTCTL,
>>> + PMALERTINTCTL_MASK, bits);
>>> +
>>> + /* start PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, PVTCTLEN_EN);
>>> +}
>>> +
>>> +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> +
>>> + /* disable alert interrupt */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PMALERTINTCTL,
>>> + PMALERTINTCTL_MASK, 0);
>>> +
>>> + /* stop PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, 0);
>>> +}
>>> +
>>> +static int uniphier_tm_get_temp(void *data, int *out_temp)
>>> +{
>>> + struct uniphier_tm_dev *tdev = data;
>>> + struct regmap *map = tdev->regmap;
>>> + int ret;
>>> + u32 temp;
>>> +
>>> + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + temp &= TMOD_MASK;
>>> + *out_temp = temp * 1000; /* millicelsius */
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
>>> + .get_temp = uniphier_tm_get_temp,
>>> +};
>>> +
>>> +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
>>> +{
>>> + u32 mask = 0, bits = 0;
>>> + int i;
>>> +
>>> + for (i = 0; i < ALERT_CH_NUM; i++) {
>>> + mask |= (PMALERTINTCTL_CLR(i) |
>>> + PMALERTINTCTL_SET(i));
>>> + bits |= PMALERTINTCTL_CLR(i);
>>> + }
>>> +
>>> + /* clear alert interrupt */
>>> + regmap_write_bits(tdev->regmap,
>>> + tdev->data->map_base + PMALERTINTCTL, mask, bits);
>>> +}
>>> +
>>> +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
>>> +{
>>> + struct uniphier_tm_dev *tdev = _tdev;
>>> +
>>> + uniphier_tm_irq_clear(tdev);
>>> + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
>>> +
>>> + return IRQ_HANDLED;
>>> +}
>>> +
>>> +static int uniphier_tm_probe(struct platform_device *pdev)
>>> +{
>>> + struct device *dev = &pdev->dev;
>>> + struct regmap *regmap;
>>> + struct device_node *parent;
>>> + struct uniphier_tm_dev *tdev;
>>> + const struct thermal_trip *trips;
>>> + const u32 *calib;
>>> + int i, ret, irq, ntrips, crit_temp = INT_MAX;
>>> +
>>> + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
>>> + if (!tdev)
>>> + return -ENOMEM;
>>> +
>>> + tdev->data = of_device_get_match_data(dev);
>>> + if (WARN_ON(!tdev->data))
>>> + return -EINVAL;
>>> +
>>> + /* get irq */
>>> + irq = platform_get_irq(pdev, 0);
>>> + if (irq < 0)
>>> + return irq;
>>> +
>>> + /* get tmod-calibration values */
>>> + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
>>> + NULL);
>>> + if (calib) {
>>> + tdev->tmod_calib0 = of_read_number(calib, 1);
>>> + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
>>> + }
>>> +
>>> + /* get regmap from syscon node */
>>> + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
>>> + regmap = syscon_node_to_regmap(parent);
>>> + of_node_put(parent);
>>> + if (IS_ERR(regmap)) {
>>> + dev_err(dev, "failed to get regmap (error %ld)\n",
>>> + PTR_ERR(regmap));
>>> + return PTR_ERR(regmap);
>>> + }
>>> + tdev->regmap = regmap;
>>> +
>>> + /* register sensor */
>>> + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
>>> + &uniphier_of_thermal_ops);
>>> + if (IS_ERR(tdev->tz_dev)) {
>>> + dev_err(dev, "failed to register sensor device\n");
>>> + return PTR_ERR(tdev->tz_dev);
>>> + }
>>> +
>>> + /* get trip points */
>>> + trips = of_thermal_get_trip_points(tdev->tz_dev);
>>> + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
>>> + if (ntrips > ALERT_CH_NUM) {
>>> + dev_err(dev, "thermal zone has too many trips\n");
>>> + return -E2BIG;
>>> + }
>>> +
>>> + /* initialize sensor */
>>> + ret = uniphier_tm_initialize_sensor(tdev);
>>> + if (ret) {
>>> + dev_err(dev, "failed to initialize sensor\n");
>>> + return ret;
>>> + }
>>> + for (i = 0; i < ntrips; i++) {
>>> + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
>>> + trips[i].temperature < crit_temp)
>>> + crit_temp = trips[i].temperature;
>>> + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
>>> + tdev->alert_en[i] = true;
>>> + }
>>> + if (crit_temp > CRITICAL_TEMP_LIMIT) {
>>> + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
>>> + CRITICAL_TEMP_LIMIT);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
>>> + 0, "thermal", tdev);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + /* enable sensor */
>>> + uniphier_tm_enable_sensor(tdev);
>>> +
>>> + platform_set_drvdata(pdev, tdev);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int uniphier_tm_remove(struct platform_device *pdev)
>>> +{
>>> + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
>>> +
>>> + /* disable sensor */
>>> + uniphier_tm_disable_sensor(tdev);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
>>> + .map_base = 0xe000,
>>> + .block_base = 0xe000,
>>> + .tmod_setup_addr = 0xe904,
>>> +};
>>> +
>>> +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
>>> + .map_base = 0xe000,
>>> + .block_base = 0xe800,
>>> + .tmod_setup_addr = 0xe938,
>>> +};
>>> +
>>> +static const struct of_device_id uniphier_tm_dt_ids[] = {
>>> + {
>>> + .compatible = "socionext,uniphier-pxs2-thermal",
>>> + .data = &uniphier_pxs2_tm_data,
>>> + },
>>> + {
>>> + .compatible = "socionext,uniphier-ld20-thermal",
>>> + .data = &uniphier_ld20_tm_data,
>>> + },
>>> + { /* sentinel */ }
>>> +};
>>> +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
>>> +
>>> +static struct platform_driver uniphier_tm_driver = {
>>> + .probe = uniphier_tm_probe,
>>> + .remove = uniphier_tm_remove,
>>> + .driver = {
>>> + .name = "uniphier-thermal",
>>> + .of_match_table = uniphier_tm_dt_ids,
>>> + },
>>> +};
>>> +module_platform_driver(uniphier_tm_driver);
>>> +
>>> +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
>>> +MODULE_DESCRIPTION("UniPhier thermal driver");
>>> +MODULE_LICENSE("GPL v2");
>>>
>
>
> Best Regards,
> Kunihiko Hayashi
>
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-30 3:21 ` Keerthy
0 siblings, 0 replies; 41+ messages in thread
From: Keerthy @ 2017-05-30 3:21 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: rui.zhang-ral2JQCrhuEAvxtiuMwx3w,
edubezval-Re5JQEeQqe8AvxtiuMwx3w,
linux-pm-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A, mark.rutland-5wv7dgnIgG8,
devicetree-u79uwXL29TY76Z2rM5mHXA,
yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A,
masami.hiramatsu-QSEj5FYQhm4dnm+yROfE0A,
jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A
On Tuesday 30 May 2017 08:17 AM, Kunihiko Hayashi wrote:
> Hi Keerthy,
> Thank you for your comment.
>
> On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy-l0cyMroinI0@public.gmane.org> wrote:
>>
>>
>> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
>>> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
>>> monitoring unit implemented on UniPhier SoCs. This driver supports
>>> temperature monitoring and alert function.
>>
>> The Documentation in patch 2/4 should be squashed into this patch.
>
> According to the following guide,
> http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
>
> 1) The Documentation/ portion of the patch should be a separate patch.
>
> I think it should be separated, how about that?
Then you should reorder the series as we get the warning with checkpatch:
WARNING: DT compatible string "socionext,uniphier-pxs2-thermal" appears
un-documented -- check ./Documentation/devicetree/bindings/
#488: FILE: drivers/thermal/uniphier_thermal.c:367:
+ .compatible = "socionext,uniphier-pxs2-thermal",
WARNING: DT compatible string "socionext,uniphier-ld20-thermal" appears
un-documented -- check ./Documentation/devicetree/bindings/
#492: FILE: drivers/thermal/uniphier_thermal.c:371:
+ .compatible = "socionext,uniphier-ld20-thermal",
When i apply the first patch.
>
>>>
>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>
>>> ---
>>> drivers/thermal/Kconfig | 8 +
>>> drivers/thermal/Makefile | 1 +
>>> drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
>>> 3 files changed, 399 insertions(+)
>>> create mode 100644 drivers/thermal/uniphier_thermal.c
>>>
>>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>>> index 776b343..93ccf25 100644
>>> --- a/drivers/thermal/Kconfig
>>> +++ b/drivers/thermal/Kconfig
>>> @@ -453,4 +453,12 @@ config ZX2967_THERMAL
>>> the primitive temperature sensor embedded in zx2967 SoCs.
>>> This sensor generates the real time die temperature.
>>>
>>> +config UNIPHIER_THERMAL
>>> + tristate "Socionext UniPhier thermal driver"
>>> + depends on ARCH_UNIPHIER || COMPILE_TEST
>>> + help
>>> + Enable this to support thermal reporting on UniPhier SoC.
>>> + This driver supports CPU thermal zone to reports the temperture
>>
>> /s/temperture/temperature
>>
>> Or consider re-wording to
>>
>> "Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
>> thermal framework. The driver supports CPU thermal zone temperature
>> reporting and a couple of trip points."
>
> Thanks for finding a typo and your re-wording. I'll fix it.
>
>>> + and trip points.
>>> +
>>> endif
>>> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
>>> index 7adae20..05b6e7c 100644
>>> --- a/drivers/thermal/Makefile
>>> +++ b/drivers/thermal/Makefile
>>> @@ -58,3 +58,4 @@ 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
>>> +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
>>> diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
>>> new file mode 100644
>>> index 0000000..ae7e5ce
>>> --- /dev/null
>>> +++ b/drivers/thermal/uniphier_thermal.c
>>> @@ -0,0 +1,390 @@
>>> +/**
>>> + * uniphier_thermal.c - Socionext UniPhier thermal driver
>>> + *
>>> + * Copyright 2014 Panasonic Corporation
>>> + * Copyright 2016 Socionext Inc.
>>
>> Update this please.
>
> I see. I'll update it.
>
>>> + * All rights reserved.
>>> + *
>>> + * Author:
>>> + * Kunihiko Hayashi <hayashi.kunihiko-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>
>>> + *
>>> + * This program is free software: you can redistribute it and/or modify
>>> + * it under the terms of the GNU General Public License version 2 of
>>> + * the License as published by the Free Software Foundation.
>>> + *
>>> + * This program is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>>> + * GNU General Public License for more details.
>>> + */
>>> +
>>> +#include <linux/bitops.h>
>>> +#include <linux/interrupt.h>
>>> +#include <linux/mfd/syscon.h>
>>> +#include <linux/module.h>
>>> +#include <linux/of.h>
>>> +#include <linux/of_device.h>
>>> +#include <linux/platform_device.h>
>>> +#include <linux/regmap.h>
>>> +#include <linux/thermal.h>
>>> +
>>> +#include "thermal_core.h"
>>> +
>>> +/*
>>> + * block registers
>>> + * addresses are the offset from .block_base
>>> + */
>>> +#define PVTCTLEN 0x0000
>>> +#define PVTCTLEN_EN BIT(0)
>>> +
>>> +#define PVTCTLMODE 0x0004
>>> +#define PVTCTLMODE_MASK 0xf
>>> +#define PVTCTLMODE_TEMPMON 0x5
>>> +
>>> +#define EMONREPEAT 0x0040
>>> +#define EMONREPEAT_ENDLESS BIT(24)
>>> +#define EMONREPEAT_PERIOD 0xf
>>> +#define EMONREPEAT_PERIOD_1000000 0x9
>>> +
>>> +/*
>>> + * common registers
>>> + * addresses are the offset from .map_base
>>> + */
>>> +#define PVTCTLSEL 0x0900
>>> +#define PVTCTLSEL_MASK 0x7
>>> +#define PVTCTLSEL_MONITOR 0
>>> +
>>> +#define SETALERT0 0x0910
>>> +#define SETALERT1 0x0914
>>> +#define SETALERT2 0x0918
>>> +#define SETALERT_TEMP_OVF (0xff << 16)
>>> +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
>>> +#define SETALERT_EN BIT(0)
>>> +
>>> +#define PMALERTINTCTL 0x0920
>>> +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
>>> +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
>>> +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
>>> +#define PMALERTINTCTL_MASK 0x777
>>> +
>>> +#define TMOD 0x0928
>>> +#define TMOD_MASK 0x1ff
>>> +
>>> +#define TMODCOEF 0x0e5c
>>> +
>>> +#define TMODSETUP0_EN BIT(30)
>>> +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
>>> +#define TMODSETUP1_EN BIT(15)
>>> +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
>>> +
>>> +/* SoC critical temperature is 95 degrees Celsius */
>>> +#define CRITICAL_TEMP_LIMIT (95 * 1000)
>>> +
>>> +/* Max # of alert channels */
>>> +#define ALERT_CH_NUM 3
>>> +
>>> +/* SoC specific thermal sensor data */
>>> +struct uniphier_tm_soc_data {
>>> + u32 map_base;
>>> + u32 block_base;
>>> + u32 tmod_setup_addr;
>>> +};
>>> +
>>> +struct uniphier_tm_dev {
>>> + struct regmap *regmap;
>>> + bool alert_en[ALERT_CH_NUM];
>>> + u32 tmod_calib0;
>>> + u32 tmod_calib1;
>>> + struct thermal_zone_device *tz_dev;
>>> + const struct uniphier_tm_soc_data *data;
>>> +};
>>> +
>>> +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> + u32 val;
>>> + int ret;
>>> +
>>> + /* stop PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, 0);
>>> +
>>> + /*
>>> + * set default value if missing calibrated value
>>> + *
>>> + * Since SoC has a calibrated value that was set in advance,
>>> + * TMODCOEF shows non-zero and PVT refers the value internally.
>>> + *
>>> + * However, there is the case that some SoCs might not have the
>>> + * calibrated value. In that case, TMODCOEF shows zero and the driver
>>> + * has to set default value manually.
>>> + */
>>> + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
>>> + if (ret)
>>> + return ret;
>>> + if (!val)
>>> + regmap_write(map,
>>> + tdev->data->tmod_setup_addr,
>>> + TMODSETUP0_EN |
>>
>> I guess the above parameter could be included in the previous line. Here
>> and else where can save a number of lines.
>>
>> Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
>>
>> Can go in a single line.
>
> OK, I'll make an effort to save a number of lines including other lines.
>
>>> + TMODSETUP0_VAL(tdev->tmod_calib0) |
>>> + TMODSETUP1_EN |
>>> + TMODSETUP1_VAL(tdev->tmod_calib1));
>>> +
>>> + /* select temperature mode */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLMODE,
>>> + PVTCTLMODE_MASK,
>>> + PVTCTLMODE_TEMPMON);
>>> +
>>> + /* set monitoring period */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + EMONREPEAT,
>>> + EMONREPEAT_ENDLESS |
>>> + EMONREPEAT_PERIOD,
>>> + EMONREPEAT_ENDLESS |
>>> + EMONREPEAT_PERIOD_1000000);
>>> +
>>> + /* set monitor mode */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PVTCTLSEL,
>>> + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
>>> + u32 temp)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> +
>>> + /* set alert temperature */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + SETALERT0 + (ch << 2),
>>> + SETALERT_EN |
>>> + SETALERT_TEMP_OVF,
>>> + SETALERT_EN |
>>> + SETALERT_TEMP_OVF_VALUE(temp / 1000));
>>> +}
>>> +
>>> +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> + int i;
>>> + u32 bits = 0;
>>> +
>>> + for (i = 0; i < ALERT_CH_NUM; i++)
>>> + if (tdev->alert_en[i])
>>> + bits |= PMALERTINTCTL_EN(i);
>>> +
>>> + /* enable alert interrupt */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PMALERTINTCTL,
>>> + PMALERTINTCTL_MASK, bits);
>>> +
>>> + /* start PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, PVTCTLEN_EN);
>>> +}
>>> +
>>> +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> +
>>> + /* disable alert interrupt */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PMALERTINTCTL,
>>> + PMALERTINTCTL_MASK, 0);
>>> +
>>> + /* stop PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, 0);
>>> +}
>>> +
>>> +static int uniphier_tm_get_temp(void *data, int *out_temp)
>>> +{
>>> + struct uniphier_tm_dev *tdev = data;
>>> + struct regmap *map = tdev->regmap;
>>> + int ret;
>>> + u32 temp;
>>> +
>>> + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + temp &= TMOD_MASK;
>>> + *out_temp = temp * 1000; /* millicelsius */
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
>>> + .get_temp = uniphier_tm_get_temp,
>>> +};
>>> +
>>> +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
>>> +{
>>> + u32 mask = 0, bits = 0;
>>> + int i;
>>> +
>>> + for (i = 0; i < ALERT_CH_NUM; i++) {
>>> + mask |= (PMALERTINTCTL_CLR(i) |
>>> + PMALERTINTCTL_SET(i));
>>> + bits |= PMALERTINTCTL_CLR(i);
>>> + }
>>> +
>>> + /* clear alert interrupt */
>>> + regmap_write_bits(tdev->regmap,
>>> + tdev->data->map_base + PMALERTINTCTL, mask, bits);
>>> +}
>>> +
>>> +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
>>> +{
>>> + struct uniphier_tm_dev *tdev = _tdev;
>>> +
>>> + uniphier_tm_irq_clear(tdev);
>>> + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
>>> +
>>> + return IRQ_HANDLED;
>>> +}
>>> +
>>> +static int uniphier_tm_probe(struct platform_device *pdev)
>>> +{
>>> + struct device *dev = &pdev->dev;
>>> + struct regmap *regmap;
>>> + struct device_node *parent;
>>> + struct uniphier_tm_dev *tdev;
>>> + const struct thermal_trip *trips;
>>> + const u32 *calib;
>>> + int i, ret, irq, ntrips, crit_temp = INT_MAX;
>>> +
>>> + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
>>> + if (!tdev)
>>> + return -ENOMEM;
>>> +
>>> + tdev->data = of_device_get_match_data(dev);
>>> + if (WARN_ON(!tdev->data))
>>> + return -EINVAL;
>>> +
>>> + /* get irq */
>>> + irq = platform_get_irq(pdev, 0);
>>> + if (irq < 0)
>>> + return irq;
>>> +
>>> + /* get tmod-calibration values */
>>> + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
>>> + NULL);
>>> + if (calib) {
>>> + tdev->tmod_calib0 = of_read_number(calib, 1);
>>> + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
>>> + }
>>> +
>>> + /* get regmap from syscon node */
>>> + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
>>> + regmap = syscon_node_to_regmap(parent);
>>> + of_node_put(parent);
>>> + if (IS_ERR(regmap)) {
>>> + dev_err(dev, "failed to get regmap (error %ld)\n",
>>> + PTR_ERR(regmap));
>>> + return PTR_ERR(regmap);
>>> + }
>>> + tdev->regmap = regmap;
>>> +
>>> + /* register sensor */
>>> + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
>>> + &uniphier_of_thermal_ops);
>>> + if (IS_ERR(tdev->tz_dev)) {
>>> + dev_err(dev, "failed to register sensor device\n");
>>> + return PTR_ERR(tdev->tz_dev);
>>> + }
>>> +
>>> + /* get trip points */
>>> + trips = of_thermal_get_trip_points(tdev->tz_dev);
>>> + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
>>> + if (ntrips > ALERT_CH_NUM) {
>>> + dev_err(dev, "thermal zone has too many trips\n");
>>> + return -E2BIG;
>>> + }
>>> +
>>> + /* initialize sensor */
>>> + ret = uniphier_tm_initialize_sensor(tdev);
>>> + if (ret) {
>>> + dev_err(dev, "failed to initialize sensor\n");
>>> + return ret;
>>> + }
>>> + for (i = 0; i < ntrips; i++) {
>>> + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
>>> + trips[i].temperature < crit_temp)
>>> + crit_temp = trips[i].temperature;
>>> + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
>>> + tdev->alert_en[i] = true;
>>> + }
>>> + if (crit_temp > CRITICAL_TEMP_LIMIT) {
>>> + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
>>> + CRITICAL_TEMP_LIMIT);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
>>> + 0, "thermal", tdev);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + /* enable sensor */
>>> + uniphier_tm_enable_sensor(tdev);
>>> +
>>> + platform_set_drvdata(pdev, tdev);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int uniphier_tm_remove(struct platform_device *pdev)
>>> +{
>>> + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
>>> +
>>> + /* disable sensor */
>>> + uniphier_tm_disable_sensor(tdev);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
>>> + .map_base = 0xe000,
>>> + .block_base = 0xe000,
>>> + .tmod_setup_addr = 0xe904,
>>> +};
>>> +
>>> +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
>>> + .map_base = 0xe000,
>>> + .block_base = 0xe800,
>>> + .tmod_setup_addr = 0xe938,
>>> +};
>>> +
>>> +static const struct of_device_id uniphier_tm_dt_ids[] = {
>>> + {
>>> + .compatible = "socionext,uniphier-pxs2-thermal",
>>> + .data = &uniphier_pxs2_tm_data,
>>> + },
>>> + {
>>> + .compatible = "socionext,uniphier-ld20-thermal",
>>> + .data = &uniphier_ld20_tm_data,
>>> + },
>>> + { /* sentinel */ }
>>> +};
>>> +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
>>> +
>>> +static struct platform_driver uniphier_tm_driver = {
>>> + .probe = uniphier_tm_probe,
>>> + .remove = uniphier_tm_remove,
>>> + .driver = {
>>> + .name = "uniphier-thermal",
>>> + .of_match_table = uniphier_tm_dt_ids,
>>> + },
>>> +};
>>> +module_platform_driver(uniphier_tm_driver);
>>> +
>>> +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>");
>>> +MODULE_DESCRIPTION("UniPhier thermal driver");
>>> +MODULE_LICENSE("GPL v2");
>>>
>
>
> Best Regards,
> Kunihiko Hayashi
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-30 3:21 ` Keerthy
0 siblings, 0 replies; 41+ messages in thread
From: Keerthy @ 2017-05-30 3:21 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 30 May 2017 08:17 AM, Kunihiko Hayashi wrote:
> Hi Keerthy,
> Thank you for your comment.
>
> On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy@ti.com> wrote:
>>
>>
>> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
>>> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
>>> monitoring unit implemented on UniPhier SoCs. This driver supports
>>> temperature monitoring and alert function.
>>
>> The Documentation in patch 2/4 should be squashed into this patch.
>
> According to the following guide,
> http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
>
> 1) The Documentation/ portion of the patch should be a separate patch.
>
> I think it should be separated, how about that?
Then you should reorder the series as we get the warning with checkpatch:
WARNING: DT compatible string "socionext,uniphier-pxs2-thermal" appears
un-documented -- check ./Documentation/devicetree/bindings/
#488: FILE: drivers/thermal/uniphier_thermal.c:367:
+ .compatible = "socionext,uniphier-pxs2-thermal",
WARNING: DT compatible string "socionext,uniphier-ld20-thermal" appears
un-documented -- check ./Documentation/devicetree/bindings/
#492: FILE: drivers/thermal/uniphier_thermal.c:371:
+ .compatible = "socionext,uniphier-ld20-thermal",
When i apply the first patch.
>
>>>
>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>> ---
>>> drivers/thermal/Kconfig | 8 +
>>> drivers/thermal/Makefile | 1 +
>>> drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
>>> 3 files changed, 399 insertions(+)
>>> create mode 100644 drivers/thermal/uniphier_thermal.c
>>>
>>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>>> index 776b343..93ccf25 100644
>>> --- a/drivers/thermal/Kconfig
>>> +++ b/drivers/thermal/Kconfig
>>> @@ -453,4 +453,12 @@ config ZX2967_THERMAL
>>> the primitive temperature sensor embedded in zx2967 SoCs.
>>> This sensor generates the real time die temperature.
>>>
>>> +config UNIPHIER_THERMAL
>>> + tristate "Socionext UniPhier thermal driver"
>>> + depends on ARCH_UNIPHIER || COMPILE_TEST
>>> + help
>>> + Enable this to support thermal reporting on UniPhier SoC.
>>> + This driver supports CPU thermal zone to reports the temperture
>>
>> /s/temperture/temperature
>>
>> Or consider re-wording to
>>
>> "Enable this to plug in UniPhier on-chip PVT thermal driver into Linux
>> thermal framework. The driver supports CPU thermal zone temperature
>> reporting and a couple of trip points."
>
> Thanks for finding a typo and your re-wording. I'll fix it.
>
>>> + and trip points.
>>> +
>>> endif
>>> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
>>> index 7adae20..05b6e7c 100644
>>> --- a/drivers/thermal/Makefile
>>> +++ b/drivers/thermal/Makefile
>>> @@ -58,3 +58,4 @@ 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
>>> +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
>>> diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
>>> new file mode 100644
>>> index 0000000..ae7e5ce
>>> --- /dev/null
>>> +++ b/drivers/thermal/uniphier_thermal.c
>>> @@ -0,0 +1,390 @@
>>> +/**
>>> + * uniphier_thermal.c - Socionext UniPhier thermal driver
>>> + *
>>> + * Copyright 2014 Panasonic Corporation
>>> + * Copyright 2016 Socionext Inc.
>>
>> Update this please.
>
> I see. I'll update it.
>
>>> + * All rights reserved.
>>> + *
>>> + * Author:
>>> + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>> + *
>>> + * This program is free software: you can redistribute it and/or modify
>>> + * it under the terms of the GNU General Public License version 2 of
>>> + * the License as published by the Free Software Foundation.
>>> + *
>>> + * This program is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>>> + * GNU General Public License for more details.
>>> + */
>>> +
>>> +#include <linux/bitops.h>
>>> +#include <linux/interrupt.h>
>>> +#include <linux/mfd/syscon.h>
>>> +#include <linux/module.h>
>>> +#include <linux/of.h>
>>> +#include <linux/of_device.h>
>>> +#include <linux/platform_device.h>
>>> +#include <linux/regmap.h>
>>> +#include <linux/thermal.h>
>>> +
>>> +#include "thermal_core.h"
>>> +
>>> +/*
>>> + * block registers
>>> + * addresses are the offset from .block_base
>>> + */
>>> +#define PVTCTLEN 0x0000
>>> +#define PVTCTLEN_EN BIT(0)
>>> +
>>> +#define PVTCTLMODE 0x0004
>>> +#define PVTCTLMODE_MASK 0xf
>>> +#define PVTCTLMODE_TEMPMON 0x5
>>> +
>>> +#define EMONREPEAT 0x0040
>>> +#define EMONREPEAT_ENDLESS BIT(24)
>>> +#define EMONREPEAT_PERIOD 0xf
>>> +#define EMONREPEAT_PERIOD_1000000 0x9
>>> +
>>> +/*
>>> + * common registers
>>> + * addresses are the offset from .map_base
>>> + */
>>> +#define PVTCTLSEL 0x0900
>>> +#define PVTCTLSEL_MASK 0x7
>>> +#define PVTCTLSEL_MONITOR 0
>>> +
>>> +#define SETALERT0 0x0910
>>> +#define SETALERT1 0x0914
>>> +#define SETALERT2 0x0918
>>> +#define SETALERT_TEMP_OVF (0xff << 16)
>>> +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
>>> +#define SETALERT_EN BIT(0)
>>> +
>>> +#define PMALERTINTCTL 0x0920
>>> +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
>>> +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
>>> +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
>>> +#define PMALERTINTCTL_MASK 0x777
>>> +
>>> +#define TMOD 0x0928
>>> +#define TMOD_MASK 0x1ff
>>> +
>>> +#define TMODCOEF 0x0e5c
>>> +
>>> +#define TMODSETUP0_EN BIT(30)
>>> +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
>>> +#define TMODSETUP1_EN BIT(15)
>>> +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
>>> +
>>> +/* SoC critical temperature is 95 degrees Celsius */
>>> +#define CRITICAL_TEMP_LIMIT (95 * 1000)
>>> +
>>> +/* Max # of alert channels */
>>> +#define ALERT_CH_NUM 3
>>> +
>>> +/* SoC specific thermal sensor data */
>>> +struct uniphier_tm_soc_data {
>>> + u32 map_base;
>>> + u32 block_base;
>>> + u32 tmod_setup_addr;
>>> +};
>>> +
>>> +struct uniphier_tm_dev {
>>> + struct regmap *regmap;
>>> + bool alert_en[ALERT_CH_NUM];
>>> + u32 tmod_calib0;
>>> + u32 tmod_calib1;
>>> + struct thermal_zone_device *tz_dev;
>>> + const struct uniphier_tm_soc_data *data;
>>> +};
>>> +
>>> +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> + u32 val;
>>> + int ret;
>>> +
>>> + /* stop PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, 0);
>>> +
>>> + /*
>>> + * set default value if missing calibrated value
>>> + *
>>> + * Since SoC has a calibrated value that was set in advance,
>>> + * TMODCOEF shows non-zero and PVT refers the value internally.
>>> + *
>>> + * However, there is the case that some SoCs might not have the
>>> + * calibrated value. In that case, TMODCOEF shows zero and the driver
>>> + * has to set default value manually.
>>> + */
>>> + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
>>> + if (ret)
>>> + return ret;
>>> + if (!val)
>>> + regmap_write(map,
>>> + tdev->data->tmod_setup_addr,
>>> + TMODSETUP0_EN |
>>
>> I guess the above parameter could be included in the previous line. Here
>> and else where can save a number of lines.
>>
>> Ex: regmap_write(map, tdev->data->tmod_setup_addr, TMODSETUP0_EN |
>>
>> Can go in a single line.
>
> OK, I'll make an effort to save a number of lines including other lines.
>
>>> + TMODSETUP0_VAL(tdev->tmod_calib0) |
>>> + TMODSETUP1_EN |
>>> + TMODSETUP1_VAL(tdev->tmod_calib1));
>>> +
>>> + /* select temperature mode */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLMODE,
>>> + PVTCTLMODE_MASK,
>>> + PVTCTLMODE_TEMPMON);
>>> +
>>> + /* set monitoring period */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + EMONREPEAT,
>>> + EMONREPEAT_ENDLESS |
>>> + EMONREPEAT_PERIOD,
>>> + EMONREPEAT_ENDLESS |
>>> + EMONREPEAT_PERIOD_1000000);
>>> +
>>> + /* set monitor mode */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PVTCTLSEL,
>>> + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
>>> + u32 temp)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> +
>>> + /* set alert temperature */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + SETALERT0 + (ch << 2),
>>> + SETALERT_EN |
>>> + SETALERT_TEMP_OVF,
>>> + SETALERT_EN |
>>> + SETALERT_TEMP_OVF_VALUE(temp / 1000));
>>> +}
>>> +
>>> +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> + int i;
>>> + u32 bits = 0;
>>> +
>>> + for (i = 0; i < ALERT_CH_NUM; i++)
>>> + if (tdev->alert_en[i])
>>> + bits |= PMALERTINTCTL_EN(i);
>>> +
>>> + /* enable alert interrupt */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PMALERTINTCTL,
>>> + PMALERTINTCTL_MASK, bits);
>>> +
>>> + /* start PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, PVTCTLEN_EN);
>>> +}
>>> +
>>> +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
>>> +{
>>> + struct regmap *map = tdev->regmap;
>>> +
>>> + /* disable alert interrupt */
>>> + regmap_write_bits(map,
>>> + tdev->data->map_base + PMALERTINTCTL,
>>> + PMALERTINTCTL_MASK, 0);
>>> +
>>> + /* stop PVT */
>>> + regmap_write_bits(map,
>>> + tdev->data->block_base + PVTCTLEN,
>>> + PVTCTLEN_EN, 0);
>>> +}
>>> +
>>> +static int uniphier_tm_get_temp(void *data, int *out_temp)
>>> +{
>>> + struct uniphier_tm_dev *tdev = data;
>>> + struct regmap *map = tdev->regmap;
>>> + int ret;
>>> + u32 temp;
>>> +
>>> + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + temp &= TMOD_MASK;
>>> + *out_temp = temp * 1000; /* millicelsius */
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
>>> + .get_temp = uniphier_tm_get_temp,
>>> +};
>>> +
>>> +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
>>> +{
>>> + u32 mask = 0, bits = 0;
>>> + int i;
>>> +
>>> + for (i = 0; i < ALERT_CH_NUM; i++) {
>>> + mask |= (PMALERTINTCTL_CLR(i) |
>>> + PMALERTINTCTL_SET(i));
>>> + bits |= PMALERTINTCTL_CLR(i);
>>> + }
>>> +
>>> + /* clear alert interrupt */
>>> + regmap_write_bits(tdev->regmap,
>>> + tdev->data->map_base + PMALERTINTCTL, mask, bits);
>>> +}
>>> +
>>> +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
>>> +{
>>> + struct uniphier_tm_dev *tdev = _tdev;
>>> +
>>> + uniphier_tm_irq_clear(tdev);
>>> + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
>>> +
>>> + return IRQ_HANDLED;
>>> +}
>>> +
>>> +static int uniphier_tm_probe(struct platform_device *pdev)
>>> +{
>>> + struct device *dev = &pdev->dev;
>>> + struct regmap *regmap;
>>> + struct device_node *parent;
>>> + struct uniphier_tm_dev *tdev;
>>> + const struct thermal_trip *trips;
>>> + const u32 *calib;
>>> + int i, ret, irq, ntrips, crit_temp = INT_MAX;
>>> +
>>> + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
>>> + if (!tdev)
>>> + return -ENOMEM;
>>> +
>>> + tdev->data = of_device_get_match_data(dev);
>>> + if (WARN_ON(!tdev->data))
>>> + return -EINVAL;
>>> +
>>> + /* get irq */
>>> + irq = platform_get_irq(pdev, 0);
>>> + if (irq < 0)
>>> + return irq;
>>> +
>>> + /* get tmod-calibration values */
>>> + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
>>> + NULL);
>>> + if (calib) {
>>> + tdev->tmod_calib0 = of_read_number(calib, 1);
>>> + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
>>> + }
>>> +
>>> + /* get regmap from syscon node */
>>> + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
>>> + regmap = syscon_node_to_regmap(parent);
>>> + of_node_put(parent);
>>> + if (IS_ERR(regmap)) {
>>> + dev_err(dev, "failed to get regmap (error %ld)\n",
>>> + PTR_ERR(regmap));
>>> + return PTR_ERR(regmap);
>>> + }
>>> + tdev->regmap = regmap;
>>> +
>>> + /* register sensor */
>>> + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
>>> + &uniphier_of_thermal_ops);
>>> + if (IS_ERR(tdev->tz_dev)) {
>>> + dev_err(dev, "failed to register sensor device\n");
>>> + return PTR_ERR(tdev->tz_dev);
>>> + }
>>> +
>>> + /* get trip points */
>>> + trips = of_thermal_get_trip_points(tdev->tz_dev);
>>> + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
>>> + if (ntrips > ALERT_CH_NUM) {
>>> + dev_err(dev, "thermal zone has too many trips\n");
>>> + return -E2BIG;
>>> + }
>>> +
>>> + /* initialize sensor */
>>> + ret = uniphier_tm_initialize_sensor(tdev);
>>> + if (ret) {
>>> + dev_err(dev, "failed to initialize sensor\n");
>>> + return ret;
>>> + }
>>> + for (i = 0; i < ntrips; i++) {
>>> + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
>>> + trips[i].temperature < crit_temp)
>>> + crit_temp = trips[i].temperature;
>>> + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
>>> + tdev->alert_en[i] = true;
>>> + }
>>> + if (crit_temp > CRITICAL_TEMP_LIMIT) {
>>> + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
>>> + CRITICAL_TEMP_LIMIT);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
>>> + 0, "thermal", tdev);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + /* enable sensor */
>>> + uniphier_tm_enable_sensor(tdev);
>>> +
>>> + platform_set_drvdata(pdev, tdev);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int uniphier_tm_remove(struct platform_device *pdev)
>>> +{
>>> + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
>>> +
>>> + /* disable sensor */
>>> + uniphier_tm_disable_sensor(tdev);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
>>> + .map_base = 0xe000,
>>> + .block_base = 0xe000,
>>> + .tmod_setup_addr = 0xe904,
>>> +};
>>> +
>>> +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
>>> + .map_base = 0xe000,
>>> + .block_base = 0xe800,
>>> + .tmod_setup_addr = 0xe938,
>>> +};
>>> +
>>> +static const struct of_device_id uniphier_tm_dt_ids[] = {
>>> + {
>>> + .compatible = "socionext,uniphier-pxs2-thermal",
>>> + .data = &uniphier_pxs2_tm_data,
>>> + },
>>> + {
>>> + .compatible = "socionext,uniphier-ld20-thermal",
>>> + .data = &uniphier_ld20_tm_data,
>>> + },
>>> + { /* sentinel */ }
>>> +};
>>> +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
>>> +
>>> +static struct platform_driver uniphier_tm_driver = {
>>> + .probe = uniphier_tm_probe,
>>> + .remove = uniphier_tm_remove,
>>> + .driver = {
>>> + .name = "uniphier-thermal",
>>> + .of_match_table = uniphier_tm_dt_ids,
>>> + },
>>> +};
>>> +module_platform_driver(uniphier_tm_driver);
>>> +
>>> +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
>>> +MODULE_DESCRIPTION("UniPhier thermal driver");
>>> +MODULE_LICENSE("GPL v2");
>>>
>
>
> Best Regards,
> Kunihiko Hayashi
>
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
2017-05-30 3:21 ` Keerthy
(?)
@ 2017-05-30 4:09 ` Kunihiko Hayashi
-1 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 4:09 UTC (permalink / raw)
To: Keerthy
Cc: rui.zhang, edubezval, linux-pm, linux-arm-kernel, linux-kernel,
robh+dt, mark.rutland, devicetree, yamada.masahiro,
masami.hiramatsu, jaswinder.singh
On Tue, 30 May 2017 08:51:31 +0530 Keerthy <j-keerthy@ti.com> wrote:
>
>
> On Tuesday 30 May 2017 08:17 AM, Kunihiko Hayashi wrote:
> > Hi Keerthy,
> > Thank you for your comment.
> >
> > On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy@ti.com> wrote:
> >>
> >>
> >> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> >>> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> >>> monitoring unit implemented on UniPhier SoCs. This driver supports
> >>> temperature monitoring and alert function.
> >>
> >> The Documentation in patch 2/4 should be squashed into this patch.
> >
> > According to the following guide,
> > http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
> >
> > 1) The Documentation/ portion of the patch should be a separate patch.
> >
> > I think it should be separated, how about that?
>
> Then you should reorder the series as we get the warning with checkpatch:
>
> WARNING: DT compatible string "socionext,uniphier-pxs2-thermal" appears
> un-documented -- check ./Documentation/devicetree/bindings/
> #488: FILE: drivers/thermal/uniphier_thermal.c:367:
> + .compatible = "socionext,uniphier-pxs2-thermal",
>
> WARNING: DT compatible string "socionext,uniphier-ld20-thermal" appears
> un-documented -- check ./Documentation/devicetree/bindings/
> #492: FILE: drivers/thermal/uniphier_thermal.c:371:
> + .compatible = "socionext,uniphier-ld20-thermal",
>
> When i apply the first patch.
OK. I also confirmed the warning messages. I'll reorder the patches 1/4 and 2/4.
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-30 4:09 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 4:09 UTC (permalink / raw)
To: Keerthy
Cc: rui.zhang, edubezval, linux-pm, linux-arm-kernel, linux-kernel,
robh+dt, mark.rutland, devicetree, yamada.masahiro,
masami.hiramatsu, jaswinder.singh
On Tue, 30 May 2017 08:51:31 +0530 Keerthy <j-keerthy@ti.com> wrote:
>
>
> On Tuesday 30 May 2017 08:17 AM, Kunihiko Hayashi wrote:
> > Hi Keerthy,
> > Thank you for your comment.
> >
> > On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy@ti.com> wrote:
> >>
> >>
> >> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> >>> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> >>> monitoring unit implemented on UniPhier SoCs. This driver supports
> >>> temperature monitoring and alert function.
> >>
> >> The Documentation in patch 2/4 should be squashed into this patch.
> >
> > According to the following guide,
> > http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
> >
> > 1) The Documentation/ portion of the patch should be a separate patch.
> >
> > I think it should be separated, how about that?
>
> Then you should reorder the series as we get the warning with checkpatch:
>
> WARNING: DT compatible string "socionext,uniphier-pxs2-thermal" appears
> un-documented -- check ./Documentation/devicetree/bindings/
> #488: FILE: drivers/thermal/uniphier_thermal.c:367:
> + .compatible = "socionext,uniphier-pxs2-thermal",
>
> WARNING: DT compatible string "socionext,uniphier-ld20-thermal" appears
> un-documented -- check ./Documentation/devicetree/bindings/
> #492: FILE: drivers/thermal/uniphier_thermal.c:371:
> + .compatible = "socionext,uniphier-ld20-thermal",
>
> When i apply the first patch.
OK. I also confirmed the warning messages. I'll reorder the patches 1/4 and 2/4.
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-30 4:09 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 4:09 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 30 May 2017 08:51:31 +0530 Keerthy <j-keerthy@ti.com> wrote:
>
>
> On Tuesday 30 May 2017 08:17 AM, Kunihiko Hayashi wrote:
> > Hi Keerthy,
> > Thank you for your comment.
> >
> > On Mon, 29 May 2017 15:53:39 +0530 Keerthy <j-keerthy@ti.com> wrote:
> >>
> >>
> >> On Monday 29 May 2017 02:45 PM, Kunihiko Hayashi wrote:
> >>> Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> >>> monitoring unit implemented on UniPhier SoCs. This driver supports
> >>> temperature monitoring and alert function.
> >>
> >> The Documentation in patch 2/4 should be squashed into this patch.
> >
> > According to the following guide,
> > http://elixir.free-electrons.com/linux/latest/source/Documentation/devicetree/bindings/submitting-patches.txt
> >
> > 1) The Documentation/ portion of the patch should be a separate patch.
> >
> > I think it should be separated, how about that?
>
> Then you should reorder the series as we get the warning with checkpatch:
>
> WARNING: DT compatible string "socionext,uniphier-pxs2-thermal" appears
> un-documented -- check ./Documentation/devicetree/bindings/
> #488: FILE: drivers/thermal/uniphier_thermal.c:367:
> + .compatible = "socionext,uniphier-pxs2-thermal",
>
> WARNING: DT compatible string "socionext,uniphier-ld20-thermal" appears
> un-documented -- check ./Documentation/devicetree/bindings/
> #492: FILE: drivers/thermal/uniphier_thermal.c:371:
> + .compatible = "socionext,uniphier-ld20-thermal",
>
> When i apply the first patch.
OK. I also confirmed the warning messages. I'll reorder the patches 1/4 and 2/4.
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
2017-05-29 16:48 ` Eduardo Valentin
@ 2017-05-30 9:21 ` Kunihiko Hayashi
-1 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 9:21 UTC (permalink / raw)
To: Eduardo Valentin
Cc: rui.zhang, linux-pm, linux-arm-kernel, linux-kernel, robh+dt,
mark.rutland, devicetree, yamada.masahiro, masami.hiramatsu,
jaswinder.singh
Hi Eduardo,
Thank you for your comment.
On Mon, 29 May 2017 09:48:19 -0700 <edubezval@gmail.com> wrote:
> Knihiko,
>
> On Mon, May 29, 2017 at 06:15:42PM +0900, Kunihiko Hayashi wrote:
> > Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> > monitoring unit implemented on UniPhier SoCs. This driver supports
> > temperature monitoring and alert function.
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> > drivers/thermal/Kconfig | 8 +
> > drivers/thermal/Makefile | 1 +
> > drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> > 3 files changed, 399 insertions(+)
> > create mode 100644 drivers/thermal/uniphier_thermal.c
> >
> > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> > index 776b343..93ccf25 100644
> > --- a/drivers/thermal/Kconfig
> > +++ b/drivers/thermal/Kconfig
> > @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> > the primitive temperature sensor embedded in zx2967 SoCs.
> > This sensor generates the real time die temperature.
> >
> > +config UNIPHIER_THERMAL
> > + tristate "Socionext UniPhier thermal driver"
> > + depends on ARCH_UNIPHIER || COMPILE_TEST
> > + help
> > + Enable this to support thermal reporting on UniPhier SoC.
> > + This driver supports CPU thermal zone to reports the temperture
> > + and trip points.
> > +
> > endif
> > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> > index 7adae20..05b6e7c 100644
> > --- a/drivers/thermal/Makefile
> > +++ b/drivers/thermal/Makefile
> > @@ -58,3 +58,4 @@ 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
> > +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> > diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> > new file mode 100644
> > index 0000000..ae7e5ce
> > --- /dev/null
> > +++ b/drivers/thermal/uniphier_thermal.c
> > @@ -0,0 +1,390 @@
> > +/**
> > + * uniphier_thermal.c - Socionext UniPhier thermal driver
> > + *
> > + * Copyright 2014 Panasonic Corporation
> > + * Copyright 2016 Socionext Inc.
> > + * All rights reserved.
> > + *
> > + * Author:
> > + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > + *
> > + * This program is free software: you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 of
> > + * the License as published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/regmap.h>
> > +#include <linux/thermal.h>
> > +
> > +#include "thermal_core.h"
> > +
> > +/*
> > + * block registers
> > + * addresses are the offset from .block_base
> > + */
> > +#define PVTCTLEN 0x0000
> > +#define PVTCTLEN_EN BIT(0)
> > +
> > +#define PVTCTLMODE 0x0004
> > +#define PVTCTLMODE_MASK 0xf
> > +#define PVTCTLMODE_TEMPMON 0x5
> > +
> > +#define EMONREPEAT 0x0040
> > +#define EMONREPEAT_ENDLESS BIT(24)
> > +#define EMONREPEAT_PERIOD 0xf
> > +#define EMONREPEAT_PERIOD_1000000 0x9
> > +
> > +/*
> > + * common registers
> > + * addresses are the offset from .map_base
> > + */
> > +#define PVTCTLSEL 0x0900
> > +#define PVTCTLSEL_MASK 0x7
> > +#define PVTCTLSEL_MONITOR 0
> > +
> > +#define SETALERT0 0x0910
> > +#define SETALERT1 0x0914
> > +#define SETALERT2 0x0918
> > +#define SETALERT_TEMP_OVF (0xff << 16)
> > +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> > +#define SETALERT_EN BIT(0)
> > +
> > +#define PMALERTINTCTL 0x0920
> > +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> > +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> > +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> > +#define PMALERTINTCTL_MASK 0x777
> > +
> > +#define TMOD 0x0928
> > +#define TMOD_MASK 0x1ff
> > +
> > +#define TMODCOEF 0x0e5c
> > +
> > +#define TMODSETUP0_EN BIT(30)
> > +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> > +#define TMODSETUP1_EN BIT(15)
> > +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
>
>
> Maybe use use GENMASK for some of the above macros?
OK. I'll apply it.
> > +
> > +/* SoC critical temperature is 95 degrees Celsius */
> > +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> > +
> > +/* Max # of alert channels */
> > +#define ALERT_CH_NUM 3
> > +
> > +/* SoC specific thermal sensor data */
> > +struct uniphier_tm_soc_data {
> > + u32 map_base;
> > + u32 block_base;
> > + u32 tmod_setup_addr;
> > +};
> > +
> > +struct uniphier_tm_dev {
> > + struct regmap *regmap;
> > + bool alert_en[ALERT_CH_NUM];
> > + u32 tmod_calib0;
> > + u32 tmod_calib1;
> > + struct thermal_zone_device *tz_dev;
> > + const struct uniphier_tm_soc_data *data;
> > +};
> > +
> > +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + u32 val;
> > + int ret;
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +
> > + /*
> > + * set default value if missing calibrated value
> > + *
> > + * Since SoC has a calibrated value that was set in advance,
> > + * TMODCOEF shows non-zero and PVT refers the value internally.
> > + *
> > + * However, there is the case that some SoCs might not have the
> > + * calibrated value. In that case, TMODCOEF shows zero and the driver
> > + * has to set default value manually.
>
> Is this a common case or a corner case? Do we really need to care of it?
>
> How accurate would be the sensor if it is missing calib values?
>
> Should we let the user know?
It depends a kind of boards.
Production boards has always the calibrated value and PVT refers the value.
In this case, it isn't necessary that the driver sets the value.
Evaluation boards might not have the calibrated value, then
the driver should set the value.
In this case, the sensor can't work if the value isn't set.
> > + */
> > + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> > + if (ret)
> > + return ret;
> > + if (!val)
> > + regmap_write(map,
> > + tdev->data->tmod_setup_addr,
> > + TMODSETUP0_EN |
> > + TMODSETUP0_VAL(tdev->tmod_calib0) |
> > + TMODSETUP1_EN |
> > + TMODSETUP1_VAL(tdev->tmod_calib1));
> > +
> > + /* select temperature mode */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLMODE,
> > + PVTCTLMODE_MASK,
> > + PVTCTLMODE_TEMPMON);
> > +
> > + /* set monitoring period */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + EMONREPEAT,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD_1000000);
> > +
> > + /* set monitor mode */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PVTCTLSEL,
> > + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> > +
> > + return 0;
> > +}
> > +
> > +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> > + u32 temp)
>
> Does your sensor support negative values? The subsystem does.
The actual temperature value from the sensor can have negative value,
but "alert" temperature doesn't support negative value.
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* set alert temperature */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + SETALERT0 + (ch << 2),
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF,
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> > +}
> > +
> > +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + int i;
> > + u32 bits = 0;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++)
> > + if (tdev->alert_en[i])
> > + bits |= PMALERTINTCTL_EN(i);
> > +
> > + /* enable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, bits);
> > +
> > + /* start PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, PVTCTLEN_EN);
> > +}
> > +
> > +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* disable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, 0);
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +}
> > +
> > +static int uniphier_tm_get_temp(void *data, int *out_temp)
> > +{
> > + struct uniphier_tm_dev *tdev = data;
> > + struct regmap *map = tdev->regmap;
> > + int ret;
> > + u32 temp;
> > +
> > + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> > + if (ret)
> > + return ret;
> > +
> > + temp &= TMOD_MASK;
> > + *out_temp = temp * 1000; /* millicelsius */
> > +
>
> Are you sure you are not loosing in this conversion?
This sensor has only integer value of Celsius.
But this version doesn't consider negative value. I'll fix it.
> > + return 0;
> > +}
> > +
> > +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> > + .get_temp = uniphier_tm_get_temp,
> > +};
> > +
> > +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> > +{
> > + u32 mask = 0, bits = 0;
> > + int i;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++) {
> > + mask |= (PMALERTINTCTL_CLR(i) |
> > + PMALERTINTCTL_SET(i));
> > + bits |= PMALERTINTCTL_CLR(i);
> > + }
> > +
> > + /* clear alert interrupt */
> > + regmap_write_bits(tdev->regmap,
> > + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> > +}
> > +
> > +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> > +{
> > + struct uniphier_tm_dev *tdev = _tdev;
> > +
> > + uniphier_tm_irq_clear(tdev);
> > + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> > +
>
> This is executed in a top half, rigth? The above function uses mutexes
> and should not be called within atomic context.
I confirm other drivers again and I understand it.
I'll replace devm_request_irq() to devm_request_threaded_irq().
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static int uniphier_tm_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct regmap *regmap;
> > + struct device_node *parent;
> > + struct uniphier_tm_dev *tdev;
> > + const struct thermal_trip *trips;
> > + const u32 *calib;
> > + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> > +
> > + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> > + if (!tdev)
> > + return -ENOMEM;
> > +
> > + tdev->data = of_device_get_match_data(dev);
> > + if (WARN_ON(!tdev->data))
> > + return -EINVAL;
> > +
> > + /* get irq */
> > + irq = platform_get_irq(pdev, 0);
> > + if (irq < 0)
> > + return irq;
> > +
> > + /* get tmod-calibration values */
> > + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> > + NULL);
> > + if (calib) {
> > + tdev->tmod_calib0 = of_read_number(calib, 1);
> > + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> > + }
> > +
> > + /* get regmap from syscon node */
> > + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> > + regmap = syscon_node_to_regmap(parent);
> > + of_node_put(parent);
> > + if (IS_ERR(regmap)) {
> > + dev_err(dev, "failed to get regmap (error %ld)\n",
> > + PTR_ERR(regmap));
> > + return PTR_ERR(regmap);
> > + }
> > + tdev->regmap = regmap;
> > +
> > + /* register sensor */
> > + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> > + &uniphier_of_thermal_ops);
>
> From this point on, your driver should be ready to serve calls from the
> thermal subsystem. Looks like you are missing a lot of initialization,
> still to come from below, aren't you?. I would suggest moving the above
> registration further to a point when the sensor is ready to be used.
Indeed. I understand that all initialization to be used must be finished
before the driver calls devm_thermal_zone_of_sensor_register().
> > + if (IS_ERR(tdev->tz_dev)) {
> > + dev_err(dev, "failed to register sensor device\n");
> > + return PTR_ERR(tdev->tz_dev);
> > + }
> > +
> > + /* get trip points */
> > + trips = of_thermal_get_trip_points(tdev->tz_dev);
> > + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> > + if (ntrips > ALERT_CH_NUM) {
> > + dev_err(dev, "thermal zone has too many trips\n");
> > + return -E2BIG;
> > + }
> > +
> > + /* initialize sensor */
> > + ret = uniphier_tm_initialize_sensor(tdev);
> > + if (ret) {
> > + dev_err(dev, "failed to initialize sensor\n");
> > + return ret;
> > + }
> > + for (i = 0; i < ntrips; i++) {
> > + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> > + trips[i].temperature < crit_temp)
> > + crit_temp = trips[i].temperature;
> > + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> > + tdev->alert_en[i] = true;
> > + }
> > + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> > + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> > + CRITICAL_TEMP_LIMIT);
> > + return -EINVAL;
> > + }
> > +
> > + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> > + 0, "thermal", tdev);
> > + if (ret)
> > + return ret;
> > +
> > + /* enable sensor */
> > + uniphier_tm_enable_sensor(tdev);
> > +
> > + platform_set_drvdata(pdev, tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static int uniphier_tm_remove(struct platform_device *pdev)
> > +{
> > + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> > +
> > + /* disable sensor */
> > + uniphier_tm_disable_sensor(tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe000,
> > + .tmod_setup_addr = 0xe904,
> > +};
> > +
> > +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe800,
> > + .tmod_setup_addr = 0xe938,
>
> Shouldn't these be in your device tree using the register properties?
> I see at least the map base as possible to be done in DT.
I think so.
However, the iomap of this device are included in sysctrl(simple-mfd),
and I can't find the method to express offset from base-address of sysctrl
on DT, instead of map_base, in resonable way.
I think that mfd node has register property then the lower node of mfd,
that is the thermal node, can't have register property.
If the driver gets offset address from DT, I'll define new property
like 'socionext,reg_offset' in the thermal node. But I'm not sure that.
> > +};
> > +
> > +static const struct of_device_id uniphier_tm_dt_ids[] = {
> > + {
> > + .compatible = "socionext,uniphier-pxs2-thermal",
> > + .data = &uniphier_pxs2_tm_data,
> > + },
> > + {
> > + .compatible = "socionext,uniphier-ld20-thermal",
> > + .data = &uniphier_ld20_tm_data,
> > + },
> > + { /* sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> > +
> > +static struct platform_driver uniphier_tm_driver = {
> > + .probe = uniphier_tm_probe,
> > + .remove = uniphier_tm_remove,
> > + .driver = {
> > + .name = "uniphier-thermal",
> > + .of_match_table = uniphier_tm_dt_ids,
> > + },
> > +};
> > +module_platform_driver(uniphier_tm_driver);
> > +
> > +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> > +MODULE_DESCRIPTION("UniPhier thermal driver");
> > +MODULE_LICENSE("GPL v2");
> > --
> > 2.7.4
> >
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-05-30 9:21 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 9:21 UTC (permalink / raw)
To: linux-arm-kernel
Hi Eduardo,
Thank you for your comment.
On Mon, 29 May 2017 09:48:19 -0700 <edubezval@gmail.com> wrote:
> Knihiko,
>
> On Mon, May 29, 2017 at 06:15:42PM +0900, Kunihiko Hayashi wrote:
> > Add a thermal driver for on-chip PVT (Process, Voltage and Temperature)
> > monitoring unit implemented on UniPhier SoCs. This driver supports
> > temperature monitoring and alert function.
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> > drivers/thermal/Kconfig | 8 +
> > drivers/thermal/Makefile | 1 +
> > drivers/thermal/uniphier_thermal.c | 390 +++++++++++++++++++++++++++++++++++++
> > 3 files changed, 399 insertions(+)
> > create mode 100644 drivers/thermal/uniphier_thermal.c
> >
> > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> > index 776b343..93ccf25 100644
> > --- a/drivers/thermal/Kconfig
> > +++ b/drivers/thermal/Kconfig
> > @@ -453,4 +453,12 @@ config ZX2967_THERMAL
> > the primitive temperature sensor embedded in zx2967 SoCs.
> > This sensor generates the real time die temperature.
> >
> > +config UNIPHIER_THERMAL
> > + tristate "Socionext UniPhier thermal driver"
> > + depends on ARCH_UNIPHIER || COMPILE_TEST
> > + help
> > + Enable this to support thermal reporting on UniPhier SoC.
> > + This driver supports CPU thermal zone to reports the temperture
> > + and trip points.
> > +
> > endif
> > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> > index 7adae20..05b6e7c 100644
> > --- a/drivers/thermal/Makefile
> > +++ b/drivers/thermal/Makefile
> > @@ -58,3 +58,4 @@ 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
> > +obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
> > diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
> > new file mode 100644
> > index 0000000..ae7e5ce
> > --- /dev/null
> > +++ b/drivers/thermal/uniphier_thermal.c
> > @@ -0,0 +1,390 @@
> > +/**
> > + * uniphier_thermal.c - Socionext UniPhier thermal driver
> > + *
> > + * Copyright 2014 Panasonic Corporation
> > + * Copyright 2016 Socionext Inc.
> > + * All rights reserved.
> > + *
> > + * Author:
> > + * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > + *
> > + * This program is free software: you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 of
> > + * the License as published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <linux/bitops.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/regmap.h>
> > +#include <linux/thermal.h>
> > +
> > +#include "thermal_core.h"
> > +
> > +/*
> > + * block registers
> > + * addresses are the offset from .block_base
> > + */
> > +#define PVTCTLEN 0x0000
> > +#define PVTCTLEN_EN BIT(0)
> > +
> > +#define PVTCTLMODE 0x0004
> > +#define PVTCTLMODE_MASK 0xf
> > +#define PVTCTLMODE_TEMPMON 0x5
> > +
> > +#define EMONREPEAT 0x0040
> > +#define EMONREPEAT_ENDLESS BIT(24)
> > +#define EMONREPEAT_PERIOD 0xf
> > +#define EMONREPEAT_PERIOD_1000000 0x9
> > +
> > +/*
> > + * common registers
> > + * addresses are the offset from .map_base
> > + */
> > +#define PVTCTLSEL 0x0900
> > +#define PVTCTLSEL_MASK 0x7
> > +#define PVTCTLSEL_MONITOR 0
> > +
> > +#define SETALERT0 0x0910
> > +#define SETALERT1 0x0914
> > +#define SETALERT2 0x0918
> > +#define SETALERT_TEMP_OVF (0xff << 16)
> > +#define SETALERT_TEMP_OVF_VALUE(val) (((val) & 0xff) << 16)
> > +#define SETALERT_EN BIT(0)
> > +
> > +#define PMALERTINTCTL 0x0920
> > +#define PMALERTINTCTL_CLR(ch) BIT(4 * (ch) + 2)
> > +#define PMALERTINTCTL_SET(ch) BIT(4 * (ch) + 1)
> > +#define PMALERTINTCTL_EN(ch) BIT(4 * (ch) + 0)
> > +#define PMALERTINTCTL_MASK 0x777
> > +
> > +#define TMOD 0x0928
> > +#define TMOD_MASK 0x1ff
> > +
> > +#define TMODCOEF 0x0e5c
> > +
> > +#define TMODSETUP0_EN BIT(30)
> > +#define TMODSETUP0_VAL(val) (((val) & 0x3fff) << 16)
> > +#define TMODSETUP1_EN BIT(15)
> > +#define TMODSETUP1_VAL(val) ((val) & 0x7fff)
>
>
> Maybe use use GENMASK for some of the above macros?
OK. I'll apply it.
> > +
> > +/* SoC critical temperature is 95 degrees Celsius */
> > +#define CRITICAL_TEMP_LIMIT (95 * 1000)
> > +
> > +/* Max # of alert channels */
> > +#define ALERT_CH_NUM 3
> > +
> > +/* SoC specific thermal sensor data */
> > +struct uniphier_tm_soc_data {
> > + u32 map_base;
> > + u32 block_base;
> > + u32 tmod_setup_addr;
> > +};
> > +
> > +struct uniphier_tm_dev {
> > + struct regmap *regmap;
> > + bool alert_en[ALERT_CH_NUM];
> > + u32 tmod_calib0;
> > + u32 tmod_calib1;
> > + struct thermal_zone_device *tz_dev;
> > + const struct uniphier_tm_soc_data *data;
> > +};
> > +
> > +static int uniphier_tm_initialize_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + u32 val;
> > + int ret;
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +
> > + /*
> > + * set default value if missing calibrated value
> > + *
> > + * Since SoC has a calibrated value that was set in advance,
> > + * TMODCOEF shows non-zero and PVT refers the value internally.
> > + *
> > + * However, there is the case that some SoCs might not have the
> > + * calibrated value. In that case, TMODCOEF shows zero and the driver
> > + * has to set default value manually.
>
> Is this a common case or a corner case? Do we really need to care of it?
>
> How accurate would be the sensor if it is missing calib values?
>
> Should we let the user know?
It depends a kind of boards.
Production boards has always the calibrated value and PVT refers the value.
In this case, it isn't necessary that the driver sets the value.
Evaluation boards might not have the calibrated value, then
the driver should set the value.
In this case, the sensor can't work if the value isn't set.
> > + */
> > + ret = regmap_read(map, tdev->data->map_base + TMODCOEF, &val);
> > + if (ret)
> > + return ret;
> > + if (!val)
> > + regmap_write(map,
> > + tdev->data->tmod_setup_addr,
> > + TMODSETUP0_EN |
> > + TMODSETUP0_VAL(tdev->tmod_calib0) |
> > + TMODSETUP1_EN |
> > + TMODSETUP1_VAL(tdev->tmod_calib1));
> > +
> > + /* select temperature mode */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLMODE,
> > + PVTCTLMODE_MASK,
> > + PVTCTLMODE_TEMPMON);
> > +
> > + /* set monitoring period */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + EMONREPEAT,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD,
> > + EMONREPEAT_ENDLESS |
> > + EMONREPEAT_PERIOD_1000000);
> > +
> > + /* set monitor mode */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PVTCTLSEL,
> > + PVTCTLSEL_MASK, PVTCTLSEL_MONITOR);
> > +
> > + return 0;
> > +}
> > +
> > +static void uniphier_tm_set_alert(struct uniphier_tm_dev *tdev, u32 ch,
> > + u32 temp)
>
> Does your sensor support negative values? The subsystem does.
The actual temperature value from the sensor can have negative value,
but "alert" temperature doesn't support negative value.
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* set alert temperature */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + SETALERT0 + (ch << 2),
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF,
> > + SETALERT_EN |
> > + SETALERT_TEMP_OVF_VALUE(temp / 1000));
> > +}
> > +
> > +static void uniphier_tm_enable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > + int i;
> > + u32 bits = 0;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++)
> > + if (tdev->alert_en[i])
> > + bits |= PMALERTINTCTL_EN(i);
> > +
> > + /* enable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, bits);
> > +
> > + /* start PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, PVTCTLEN_EN);
> > +}
> > +
> > +static void uniphier_tm_disable_sensor(struct uniphier_tm_dev *tdev)
> > +{
> > + struct regmap *map = tdev->regmap;
> > +
> > + /* disable alert interrupt */
> > + regmap_write_bits(map,
> > + tdev->data->map_base + PMALERTINTCTL,
> > + PMALERTINTCTL_MASK, 0);
> > +
> > + /* stop PVT */
> > + regmap_write_bits(map,
> > + tdev->data->block_base + PVTCTLEN,
> > + PVTCTLEN_EN, 0);
> > +}
> > +
> > +static int uniphier_tm_get_temp(void *data, int *out_temp)
> > +{
> > + struct uniphier_tm_dev *tdev = data;
> > + struct regmap *map = tdev->regmap;
> > + int ret;
> > + u32 temp;
> > +
> > + ret = regmap_read(map, tdev->data->map_base + TMOD, &temp);
> > + if (ret)
> > + return ret;
> > +
> > + temp &= TMOD_MASK;
> > + *out_temp = temp * 1000; /* millicelsius */
> > +
>
> Are you sure you are not loosing in this conversion?
This sensor has only integer value of Celsius.
But this version doesn't consider negative value. I'll fix it.
> > + return 0;
> > +}
> > +
> > +static const struct thermal_zone_of_device_ops uniphier_of_thermal_ops = {
> > + .get_temp = uniphier_tm_get_temp,
> > +};
> > +
> > +static void uniphier_tm_irq_clear(struct uniphier_tm_dev *tdev)
> > +{
> > + u32 mask = 0, bits = 0;
> > + int i;
> > +
> > + for (i = 0; i < ALERT_CH_NUM; i++) {
> > + mask |= (PMALERTINTCTL_CLR(i) |
> > + PMALERTINTCTL_SET(i));
> > + bits |= PMALERTINTCTL_CLR(i);
> > + }
> > +
> > + /* clear alert interrupt */
> > + regmap_write_bits(tdev->regmap,
> > + tdev->data->map_base + PMALERTINTCTL, mask, bits);
> > +}
> > +
> > +static irqreturn_t uniphier_tm_alarm_handler(int irq, void *_tdev)
> > +{
> > + struct uniphier_tm_dev *tdev = _tdev;
> > +
> > + uniphier_tm_irq_clear(tdev);
> > + thermal_zone_device_update(tdev->tz_dev, THERMAL_EVENT_UNSPECIFIED);
> > +
>
> This is executed in a top half, rigth? The above function uses mutexes
> and should not be called within atomic context.
I confirm other drivers again and I understand it.
I'll replace devm_request_irq() to devm_request_threaded_irq().
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static int uniphier_tm_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct regmap *regmap;
> > + struct device_node *parent;
> > + struct uniphier_tm_dev *tdev;
> > + const struct thermal_trip *trips;
> > + const u32 *calib;
> > + int i, ret, irq, ntrips, crit_temp = INT_MAX;
> > +
> > + tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
> > + if (!tdev)
> > + return -ENOMEM;
> > +
> > + tdev->data = of_device_get_match_data(dev);
> > + if (WARN_ON(!tdev->data))
> > + return -EINVAL;
> > +
> > + /* get irq */
> > + irq = platform_get_irq(pdev, 0);
> > + if (irq < 0)
> > + return irq;
> > +
> > + /* get tmod-calibration values */
> > + calib = of_get_property(dev->of_node, "socionext,tmod-calibration",
> > + NULL);
> > + if (calib) {
> > + tdev->tmod_calib0 = of_read_number(calib, 1);
> > + tdev->tmod_calib1 = of_read_number(calib + 1, 1);
> > + }
> > +
> > + /* get regmap from syscon node */
> > + parent = of_get_parent(dev->of_node); /* parent should be syscon node */
> > + regmap = syscon_node_to_regmap(parent);
> > + of_node_put(parent);
> > + if (IS_ERR(regmap)) {
> > + dev_err(dev, "failed to get regmap (error %ld)\n",
> > + PTR_ERR(regmap));
> > + return PTR_ERR(regmap);
> > + }
> > + tdev->regmap = regmap;
> > +
> > + /* register sensor */
> > + tdev->tz_dev = devm_thermal_zone_of_sensor_register(dev, 0, tdev,
> > + &uniphier_of_thermal_ops);
>
> From this point on, your driver should be ready to serve calls from the
> thermal subsystem. Looks like you are missing a lot of initialization,
> still to come from below, aren't you?. I would suggest moving the above
> registration further to a point when the sensor is ready to be used.
Indeed. I understand that all initialization to be used must be finished
before the driver calls devm_thermal_zone_of_sensor_register().
> > + if (IS_ERR(tdev->tz_dev)) {
> > + dev_err(dev, "failed to register sensor device\n");
> > + return PTR_ERR(tdev->tz_dev);
> > + }
> > +
> > + /* get trip points */
> > + trips = of_thermal_get_trip_points(tdev->tz_dev);
> > + ntrips = of_thermal_get_ntrips(tdev->tz_dev);
> > + if (ntrips > ALERT_CH_NUM) {
> > + dev_err(dev, "thermal zone has too many trips\n");
> > + return -E2BIG;
> > + }
> > +
> > + /* initialize sensor */
> > + ret = uniphier_tm_initialize_sensor(tdev);
> > + if (ret) {
> > + dev_err(dev, "failed to initialize sensor\n");
> > + return ret;
> > + }
> > + for (i = 0; i < ntrips; i++) {
> > + if (trips[i].type == THERMAL_TRIP_CRITICAL &&
> > + trips[i].temperature < crit_temp)
> > + crit_temp = trips[i].temperature;
> > + uniphier_tm_set_alert(tdev, i, trips[i].temperature);
> > + tdev->alert_en[i] = true;
> > + }
> > + if (crit_temp > CRITICAL_TEMP_LIMIT) {
> > + dev_err(dev, "critical trip is over limit(>%d), or not set\n",
> > + CRITICAL_TEMP_LIMIT);
> > + return -EINVAL;
> > + }
> > +
> > + ret = devm_request_irq(dev, irq, uniphier_tm_alarm_handler,
> > + 0, "thermal", tdev);
> > + if (ret)
> > + return ret;
> > +
> > + /* enable sensor */
> > + uniphier_tm_enable_sensor(tdev);
> > +
> > + platform_set_drvdata(pdev, tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static int uniphier_tm_remove(struct platform_device *pdev)
> > +{
> > + struct uniphier_tm_dev *tdev = platform_get_drvdata(pdev);
> > +
> > + /* disable sensor */
> > + uniphier_tm_disable_sensor(tdev);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe000,
> > + .tmod_setup_addr = 0xe904,
> > +};
> > +
> > +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
> > + .map_base = 0xe000,
> > + .block_base = 0xe800,
> > + .tmod_setup_addr = 0xe938,
>
> Shouldn't these be in your device tree using the register properties?
> I see at least the map base as possible to be done in DT.
I think so.
However, the iomap of this device are included in sysctrl(simple-mfd),
and I can't find the method to express offset from base-address of sysctrl
on DT, instead of map_base, in resonable way.
I think that mfd node has register property then the lower node of mfd,
that is the thermal node, can't have register property.
If the driver gets offset address from DT, I'll define new property
like 'socionext,reg_offset' in the thermal node. But I'm not sure that.
> > +};
> > +
> > +static const struct of_device_id uniphier_tm_dt_ids[] = {
> > + {
> > + .compatible = "socionext,uniphier-pxs2-thermal",
> > + .data = &uniphier_pxs2_tm_data,
> > + },
> > + {
> > + .compatible = "socionext,uniphier-ld20-thermal",
> > + .data = &uniphier_ld20_tm_data,
> > + },
> > + { /* sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
> > +
> > +static struct platform_driver uniphier_tm_driver = {
> > + .probe = uniphier_tm_probe,
> > + .remove = uniphier_tm_remove,
> > + .driver = {
> > + .name = "uniphier-thermal",
> > + .of_match_table = uniphier_tm_dt_ids,
> > + },
> > +};
> > +module_platform_driver(uniphier_tm_driver);
> > +
> > +MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
> > +MODULE_DESCRIPTION("UniPhier thermal driver");
> > +MODULE_LICENSE("GPL v2");
> > --
> > 2.7.4
> >
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 3/4] ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
@ 2017-05-30 9:25 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 9:25 UTC (permalink / raw)
To: Eduardo Valentin
Cc: rui.zhang, linux-pm, linux-arm-kernel, linux-kernel, robh+dt,
mark.rutland, devicetree, yamada.masahiro, masami.hiramatsu,
jaswinder.singh
Hi Eduardo,
Thank you for your comment.
On Mon, 29 May 2017 09:30:09 -0700 Eduardo Valentin <edubezval@gmail.com> wrote:
> On Mon, May 29, 2017 at 06:15:44PM +0900, Kunihiko Hayashi wrote:
> > Add nodes of thermal monitor and thermal zone for UniPhier PXs2 SoC.
> > The thermal monitor is included in sysctrl.
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> > arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 +++++++++++++++++++++
> > arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 +++++++++++++++++++++
> > arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 ++++++
> > 3 files changed, 48 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > index 373818a..89ccb88 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > @@ -70,6 +70,27 @@
> > i2c5 = &i2c5;
> > i2c6 = &i2c6;
> > };
> > +
> > + thermal-zones {
> > + cpu_thermal {
> > + polling-delay-passive = <250>; /* 250ms */
> > + polling-delay = <1000>; /* 1000ms */
> > + thermal-sensors = <&pvtctl>;
> > +
> > + trips {
> > + cpu_crit: cpu_crit {
> > + temperature = <95000>; /* 95C */
> > + hysteresis = <2000>;
> > + type = "critical";
> > + };
> > + cpu_alert: cpu_alert {
> > + temperature = <85000>; /* 85C */
> > + hysteresis = <2000>;
> > + type = "passive";
> > + };
> > + };
> These are missing cooling-maps section.
I see. I'll add the section including another nodes.
> > + };
> > + };
> > };
> >
> > &serial2 {
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > index 51a3eac..0201584 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > @@ -68,6 +68,27 @@
> > i2c5 = &i2c5;
> > i2c6 = &i2c6;
> > };
> > +
> > + thermal-zones {
> > + cpu_thermal {
> > + polling-delay-passive = <250>; /* 250ms */
> > + polling-delay = <1000>; /* 1000ms */
> > + thermal-sensors = <&pvtctl>;
> > +
> > + trips {
> > + cpu_crit: cpu_crit {
> > + temperature = <95000>; /* 95C */
> > + hysteresis = <2000>;
> > + type = "critical";
> > + };
> > + cpu_alert: cpu_alert {
> > + temperature = <85000>; /* 85C */
> > + hysteresis = <2000>;
> > + type = "passive";
> > + };
> > + };
>
> same
>
> > + };
> > + };
> > };
> >
> > &serial2 {
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > index e9e031d..072e3b4 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > @@ -387,6 +387,12 @@
> > compatible = "socionext,uniphier-pxs2-reset";
> > #reset-cells = <1>;
> > };
> > +
> > + pvtctl: pvtctl {
> > + compatible = "socionext,uniphier-pxs2-thermal";
> > + interrupts = <0 3 1>;
> > + #thermal-sensor-cells = <0>;
> > + };
> > };
> > };
> > };
> > --
> > 2.7.4
> >
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 3/4] ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
@ 2017-05-30 9:25 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 9:25 UTC (permalink / raw)
To: Eduardo Valentin
Cc: rui.zhang-ral2JQCrhuEAvxtiuMwx3w,
linux-pm-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A, mark.rutland-5wv7dgnIgG8,
devicetree-u79uwXL29TY76Z2rM5mHXA,
yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A,
masami.hiramatsu-QSEj5FYQhm4dnm+yROfE0A,
jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A
Hi Eduardo,
Thank you for your comment.
On Mon, 29 May 2017 09:30:09 -0700 Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Mon, May 29, 2017 at 06:15:44PM +0900, Kunihiko Hayashi wrote:
> > Add nodes of thermal monitor and thermal zone for UniPhier PXs2 SoC.
> > The thermal monitor is included in sysctrl.
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>
> > ---
> > arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 +++++++++++++++++++++
> > arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 +++++++++++++++++++++
> > arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 ++++++
> > 3 files changed, 48 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > index 373818a..89ccb88 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > @@ -70,6 +70,27 @@
> > i2c5 = &i2c5;
> > i2c6 = &i2c6;
> > };
> > +
> > + thermal-zones {
> > + cpu_thermal {
> > + polling-delay-passive = <250>; /* 250ms */
> > + polling-delay = <1000>; /* 1000ms */
> > + thermal-sensors = <&pvtctl>;
> > +
> > + trips {
> > + cpu_crit: cpu_crit {
> > + temperature = <95000>; /* 95C */
> > + hysteresis = <2000>;
> > + type = "critical";
> > + };
> > + cpu_alert: cpu_alert {
> > + temperature = <85000>; /* 85C */
> > + hysteresis = <2000>;
> > + type = "passive";
> > + };
> > + };
> These are missing cooling-maps section.
I see. I'll add the section including another nodes.
> > + };
> > + };
> > };
> >
> > &serial2 {
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > index 51a3eac..0201584 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > @@ -68,6 +68,27 @@
> > i2c5 = &i2c5;
> > i2c6 = &i2c6;
> > };
> > +
> > + thermal-zones {
> > + cpu_thermal {
> > + polling-delay-passive = <250>; /* 250ms */
> > + polling-delay = <1000>; /* 1000ms */
> > + thermal-sensors = <&pvtctl>;
> > +
> > + trips {
> > + cpu_crit: cpu_crit {
> > + temperature = <95000>; /* 95C */
> > + hysteresis = <2000>;
> > + type = "critical";
> > + };
> > + cpu_alert: cpu_alert {
> > + temperature = <85000>; /* 85C */
> > + hysteresis = <2000>;
> > + type = "passive";
> > + };
> > + };
>
> same
>
> > + };
> > + };
> > };
> >
> > &serial2 {
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > index e9e031d..072e3b4 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > @@ -387,6 +387,12 @@
> > compatible = "socionext,uniphier-pxs2-reset";
> > #reset-cells = <1>;
> > };
> > +
> > + pvtctl: pvtctl {
> > + compatible = "socionext,uniphier-pxs2-thermal";
> > + interrupts = <0 3 1>;
> > + #thermal-sensor-cells = <0>;
> > + };
> > };
> > };
> > };
> > --
> > 2.7.4
> >
Best Regards,
Kunihiko Hayashi
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 3/4] ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
@ 2017-05-30 9:25 ` Kunihiko Hayashi
0 siblings, 0 replies; 41+ messages in thread
From: Kunihiko Hayashi @ 2017-05-30 9:25 UTC (permalink / raw)
To: linux-arm-kernel
Hi Eduardo,
Thank you for your comment.
On Mon, 29 May 2017 09:30:09 -0700 Eduardo Valentin <edubezval@gmail.com> wrote:
> On Mon, May 29, 2017 at 06:15:44PM +0900, Kunihiko Hayashi wrote:
> > Add nodes of thermal monitor and thermal zone for UniPhier PXs2 SoC.
> > The thermal monitor is included in sysctrl.
> >
> > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > ---
> > arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 21 +++++++++++++++++++++
> > arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 21 +++++++++++++++++++++
> > arch/arm/boot/dts/uniphier-pxs2.dtsi | 6 ++++++
> > 3 files changed, 48 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > index 373818a..89ccb88 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
> > @@ -70,6 +70,27 @@
> > i2c5 = &i2c5;
> > i2c6 = &i2c6;
> > };
> > +
> > + thermal-zones {
> > + cpu_thermal {
> > + polling-delay-passive = <250>; /* 250ms */
> > + polling-delay = <1000>; /* 1000ms */
> > + thermal-sensors = <&pvtctl>;
> > +
> > + trips {
> > + cpu_crit: cpu_crit {
> > + temperature = <95000>; /* 95C */
> > + hysteresis = <2000>;
> > + type = "critical";
> > + };
> > + cpu_alert: cpu_alert {
> > + temperature = <85000>; /* 85C */
> > + hysteresis = <2000>;
> > + type = "passive";
> > + };
> > + };
> These are missing cooling-maps section.
I see. I'll add the section including another nodes.
> > + };
> > + };
> > };
> >
> > &serial2 {
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > index 51a3eac..0201584 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
> > @@ -68,6 +68,27 @@
> > i2c5 = &i2c5;
> > i2c6 = &i2c6;
> > };
> > +
> > + thermal-zones {
> > + cpu_thermal {
> > + polling-delay-passive = <250>; /* 250ms */
> > + polling-delay = <1000>; /* 1000ms */
> > + thermal-sensors = <&pvtctl>;
> > +
> > + trips {
> > + cpu_crit: cpu_crit {
> > + temperature = <95000>; /* 95C */
> > + hysteresis = <2000>;
> > + type = "critical";
> > + };
> > + cpu_alert: cpu_alert {
> > + temperature = <85000>; /* 85C */
> > + hysteresis = <2000>;
> > + type = "passive";
> > + };
> > + };
>
> same
>
> > + };
> > + };
> > };
> >
> > &serial2 {
> > diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > index e9e031d..072e3b4 100644
> > --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
> > @@ -387,6 +387,12 @@
> > compatible = "socionext,uniphier-pxs2-reset";
> > #reset-cells = <1>;
> > };
> > +
> > + pvtctl: pvtctl {
> > + compatible = "socionext,uniphier-pxs2-thermal";
> > + interrupts = <0 3 1>;
> > + #thermal-sensor-cells = <0>;
> > + };
> > };
> > };
> > };
> > --
> > 2.7.4
> >
Best Regards,
Kunihiko Hayashi
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-06-05 8:42 ` Masahiro Yamada
0 siblings, 0 replies; 41+ messages in thread
From: Masahiro Yamada @ 2017-06-05 8:42 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: Eduardo Valentin, rui.zhang, linux-pm, linux-arm-kernel,
Linux Kernel Mailing List, Rob Herring, Mark Rutland, devicetree,
masami.hiramatsu, Jassi Brar
2017-05-30 18:21 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
>> > +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
>> > + .map_base = 0xe000,
>> > + .block_base = 0xe000,
>> > + .tmod_setup_addr = 0xe904,
>> > +};
>> > +
>> > +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
>> > + .map_base = 0xe000,
>> > + .block_base = 0xe800,
>> > + .tmod_setup_addr = 0xe938,
>>
>> Shouldn't these be in your device tree using the register properties?
>> I see at least the map base as possible to be done in DT.
True for simple-bus.
However, the combination of "simple-mfd" and "syscon"
seems a well established strategy when
registers are mixed/interleaved in a syscon block.
(For example, chip-control@ea0000 node of
arch/arm/boot/dts/berlin2.dtsi)
> I think so.
> However, the iomap of this device are included in sysctrl(simple-mfd),
> and I can't find the method to express offset from base-address of sysctrl
> on DT, instead of map_base, in resonable way.
>
> I think that mfd node has register property then the lower node of mfd,
> that is the thermal node, can't have register property.
>
> If the driver gets offset address from DT, I'll define new property
> like 'socionext,reg_offset' in the thermal node. But I'm not sure that.
socionext,uniphier-{pxs2,ld20}-thermal is an SoC-specific compatible string.
The internal-offset is included
in the HW-spec associated with the compatible.
I believe 'socionext,reg_offset' is pointless.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-06-05 8:42 ` Masahiro Yamada
0 siblings, 0 replies; 41+ messages in thread
From: Masahiro Yamada @ 2017-06-05 8:42 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: Eduardo Valentin, rui.zhang-ral2JQCrhuEAvxtiuMwx3w,
linux-pm-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel,
Linux Kernel Mailing List, Rob Herring, Mark Rutland,
devicetree-u79uwXL29TY76Z2rM5mHXA,
masami.hiramatsu-QSEj5FYQhm4dnm+yROfE0A, Jassi Brar
2017-05-30 18:21 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>:
>> > +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
>> > + .map_base = 0xe000,
>> > + .block_base = 0xe000,
>> > + .tmod_setup_addr = 0xe904,
>> > +};
>> > +
>> > +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
>> > + .map_base = 0xe000,
>> > + .block_base = 0xe800,
>> > + .tmod_setup_addr = 0xe938,
>>
>> Shouldn't these be in your device tree using the register properties?
>> I see at least the map base as possible to be done in DT.
True for simple-bus.
However, the combination of "simple-mfd" and "syscon"
seems a well established strategy when
registers are mixed/interleaved in a syscon block.
(For example, chip-control@ea0000 node of
arch/arm/boot/dts/berlin2.dtsi)
> I think so.
> However, the iomap of this device are included in sysctrl(simple-mfd),
> and I can't find the method to express offset from base-address of sysctrl
> on DT, instead of map_base, in resonable way.
>
> I think that mfd node has register property then the lower node of mfd,
> that is the thermal node, can't have register property.
>
> If the driver gets offset address from DT, I'll define new property
> like 'socionext,reg_offset' in the thermal node. But I'm not sure that.
socionext,uniphier-{pxs2,ld20}-thermal is an SoC-specific compatible string.
The internal-offset is included
in the HW-spec associated with the compatible.
I believe 'socionext,reg_offset' is pointless.
--
Best Regards
Masahiro Yamada
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver
@ 2017-06-05 8:42 ` Masahiro Yamada
0 siblings, 0 replies; 41+ messages in thread
From: Masahiro Yamada @ 2017-06-05 8:42 UTC (permalink / raw)
To: linux-arm-kernel
2017-05-30 18:21 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
>> > +static const struct uniphier_tm_soc_data uniphier_pxs2_tm_data = {
>> > + .map_base = 0xe000,
>> > + .block_base = 0xe000,
>> > + .tmod_setup_addr = 0xe904,
>> > +};
>> > +
>> > +static const struct uniphier_tm_soc_data uniphier_ld20_tm_data = {
>> > + .map_base = 0xe000,
>> > + .block_base = 0xe800,
>> > + .tmod_setup_addr = 0xe938,
>>
>> Shouldn't these be in your device tree using the register properties?
>> I see at least the map base as possible to be done in DT.
True for simple-bus.
However, the combination of "simple-mfd" and "syscon"
seems a well established strategy when
registers are mixed/interleaved in a syscon block.
(For example, chip-control at ea0000 node of
arch/arm/boot/dts/berlin2.dtsi)
> I think so.
> However, the iomap of this device are included in sysctrl(simple-mfd),
> and I can't find the method to express offset from base-address of sysctrl
> on DT, instead of map_base, in resonable way.
>
> I think that mfd node has register property then the lower node of mfd,
> that is the thermal node, can't have register property.
>
> If the driver gets offset address from DT, I'll define new property
> like 'socionext,reg_offset' in the thermal node. But I'm not sure that.
socionext,uniphier-{pxs2,ld20}-thermal is an SoC-specific compatible string.
The internal-offset is included
in the HW-spec associated with the compatible.
I believe 'socionext,reg_offset' is pointless.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 2/4] dt-bindings: thermal: add binding documentation for UniPhier thermal monitor
2017-05-29 9:15 ` Kunihiko Hayashi
@ 2017-06-05 17:28 ` Rob Herring
-1 siblings, 0 replies; 41+ messages in thread
From: Rob Herring @ 2017-06-05 17:28 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: rui.zhang, edubezval, linux-pm, linux-arm-kernel, linux-kernel,
mark.rutland, devicetree, yamada.masahiro, masami.hiramatsu,
jaswinder.singh
On Mon, May 29, 2017 at 06:15:43PM +0900, Kunihiko Hayashi wrote:
> Add devicetree binding documentation for thermal monitor implemented on
> Socionext UniPhier SoCs.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../bindings/thermal/uniphier-thermal.txt | 54 ++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 2/4] dt-bindings: thermal: add binding documentation for UniPhier thermal monitor
@ 2017-06-05 17:28 ` Rob Herring
0 siblings, 0 replies; 41+ messages in thread
From: Rob Herring @ 2017-06-05 17:28 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 29, 2017 at 06:15:43PM +0900, Kunihiko Hayashi wrote:
> Add devicetree binding documentation for thermal monitor implemented on
> Socionext UniPhier SoCs.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../bindings/thermal/uniphier-thermal.txt | 54 ++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 2/4] dt-bindings: thermal: add binding documentation for UniPhier thermal monitor
2017-05-29 9:15 ` Kunihiko Hayashi
@ 2017-06-06 2:46 ` Masahiro Yamada
-1 siblings, 0 replies; 41+ messages in thread
From: Masahiro Yamada @ 2017-06-06 2:46 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: rui.zhang, Eduardo Valentin, linux-pm, linux-arm-kernel,
Linux Kernel Mailing List, Rob Herring, Mark Rutland, devicetree,
Masami Hiramatsu, Jassi Brar
2017-05-29 18:15 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
> Add devicetree binding documentation for thermal monitor implemented on
> Socionext UniPhier SoCs.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../bindings/thermal/uniphier-thermal.txt | 54 ++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
>
> diff --git a/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt b/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
> new file mode 100644
> index 0000000..72834e1
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
> @@ -0,0 +1,54 @@
> +* UniPhier Thermal bindings
> +
> +This describes the devicetree bindings for thermal monitor supported by
> +PVT(Process, Voltage and Temperature) monitoring unit implemented on Socionext
> +UniPhier SoCs.
This paragraph implies this might be a HWMON driver if more features
are implemented,
but I assume you use only the Temperature part for a thermal driver at
the moment.
(I do not know if other sensors are useful or not, so I do not mind it much.)
> +Required properties:
> +- compatible :
> + - "socionext,uniphier-pxs2-thermal" : For UniPhier PXs2 SoC
> + - "socionext,uniphier-ld20-thermal" : For UniPhier LD20 SoC
> +- reg : Offset address of the thermal registers from sysctrl
This "reg" does not exist in the example.
Your driver code uses regmap for register access.
> +- interrupts : IRQ for the temperature alarm
> +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for details.
> +
> +Optional properties:
> +- socionext,tmod-calibration: A pair of calibrated values referred from PVT,
> + in case that the values aren't set on SoC,
> + like a reference board.
> +
> +Example:
> +
> + sysctrl@61840000 {
> + compatible = "socionext,uniphier-ld20-sysctrl",
> + "simple-mfd", "syscon";
> + reg = <0x61840000 0x10000>;
> + ...
> + pvtctl: pvtctl {
> + compatible = "socionext,uniphier-ld20-thermal";
> + interrupts = <0 3 1>;
> + #thermal-sensor-cells = <0>;
> + };
> + ...
> + };
> +
> + thermal-zones {
> + cpu_thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> + thermal-sensors = <&pvtctl>;
> +
> + trips {
> + cpu_crit: cpu_crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu_alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
> + };
> + };
> --
> 2.7.4
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 2/4] dt-bindings: thermal: add binding documentation for UniPhier thermal monitor
@ 2017-06-06 2:46 ` Masahiro Yamada
0 siblings, 0 replies; 41+ messages in thread
From: Masahiro Yamada @ 2017-06-06 2:46 UTC (permalink / raw)
To: linux-arm-kernel
2017-05-29 18:15 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
> Add devicetree binding documentation for thermal monitor implemented on
> Socionext UniPhier SoCs.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../bindings/thermal/uniphier-thermal.txt | 54 ++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
>
> diff --git a/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt b/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
> new file mode 100644
> index 0000000..72834e1
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/uniphier-thermal.txt
> @@ -0,0 +1,54 @@
> +* UniPhier Thermal bindings
> +
> +This describes the devicetree bindings for thermal monitor supported by
> +PVT(Process, Voltage and Temperature) monitoring unit implemented on Socionext
> +UniPhier SoCs.
This paragraph implies this might be a HWMON driver if more features
are implemented,
but I assume you use only the Temperature part for a thermal driver at
the moment.
(I do not know if other sensors are useful or not, so I do not mind it much.)
> +Required properties:
> +- compatible :
> + - "socionext,uniphier-pxs2-thermal" : For UniPhier PXs2 SoC
> + - "socionext,uniphier-ld20-thermal" : For UniPhier LD20 SoC
> +- reg : Offset address of the thermal registers from sysctrl
This "reg" does not exist in the example.
Your driver code uses regmap for register access.
> +- interrupts : IRQ for the temperature alarm
> +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for details.
> +
> +Optional properties:
> +- socionext,tmod-calibration: A pair of calibrated values referred from PVT,
> + in case that the values aren't set on SoC,
> + like a reference board.
> +
> +Example:
> +
> + sysctrl at 61840000 {
> + compatible = "socionext,uniphier-ld20-sysctrl",
> + "simple-mfd", "syscon";
> + reg = <0x61840000 0x10000>;
> + ...
> + pvtctl: pvtctl {
> + compatible = "socionext,uniphier-ld20-thermal";
> + interrupts = <0 3 1>;
> + #thermal-sensor-cells = <0>;
> + };
> + ...
> + };
> +
> + thermal-zones {
> + cpu_thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> + thermal-sensors = <&pvtctl>;
> +
> + trips {
> + cpu_crit: cpu_crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu_alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
> + };
> + };
> --
> 2.7.4
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH 4/4] arm64: dts: uniphier: add nodes of thermal monitor and thermal zone for LD20
2017-05-29 9:15 ` Kunihiko Hayashi
@ 2017-06-06 3:04 ` Masahiro Yamada
-1 siblings, 0 replies; 41+ messages in thread
From: Masahiro Yamada @ 2017-06-06 3:04 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: rui.zhang, Eduardo Valentin, linux-pm, linux-arm-kernel,
Linux Kernel Mailing List, Rob Herring, Mark Rutland, devicetree,
Masami Hiramatsu, Jassi Brar
2017-05-29 18:15 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
> Add nodes of thermal monitor and thermal zone for UniPhier LD20 SoC.
> The thermal monitor is included in sysctrl.
>
> Furthermore, since SoC installed in the reference board doesn't have a
> calibrated value of thermal monitor, this patch gives the default value
> for LD20 Reference board via device-tree property.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 25 ++++++++++++++++++++++
> arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 6 ++++++
> 2 files changed, 31 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
> index 609162a..79e1363 100644
> --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
> +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
> @@ -73,6 +73,27 @@
> i2c4 = &i2c4;
> i2c5 = &i2c5;
> };
> +
> + thermal-zones {
> + cpu_thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> + thermal-sensors = <&pvtctl>;
> +
> + trips {
> + cpu_crit: cpu_crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu_alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
> + };
> + };
> };
>
> ðsc {
> @@ -86,3 +107,7 @@
> &i2c0 {
> status = "okay";
> };
> +
> +&pvtctl {
> + socionext,tmod-calibration = <0x0f22 0x68ee>;
> +};
> diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> index a6b3a70..effa2e3 100644
> --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> @@ -417,6 +417,12 @@
> compatible = "socionext,uniphier-ld20-reset";
> #reset-cells = <1>;
> };
> +
> + pvtctl: pvtctl {
> + compatible = "socionext,uniphier-ld20-thermal";
> + interrupts = <0 3 1>;
> + #thermal-sensor-cells = <0>;
> + };
The 3rd cell of the interrupts is 1.
So, you mean the interrupt is edge-triggered.
(Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt)
However, in your driver code, the interrupt is explicitly cleared in
the IRQ handler.
I checked the SoC implementation document and
the PVT IRQ seems to be level-triggered.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH 4/4] arm64: dts: uniphier: add nodes of thermal monitor and thermal zone for LD20
@ 2017-06-06 3:04 ` Masahiro Yamada
0 siblings, 0 replies; 41+ messages in thread
From: Masahiro Yamada @ 2017-06-06 3:04 UTC (permalink / raw)
To: linux-arm-kernel
2017-05-29 18:15 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
> Add nodes of thermal monitor and thermal zone for UniPhier LD20 SoC.
> The thermal monitor is included in sysctrl.
>
> Furthermore, since SoC installed in the reference board doesn't have a
> calibrated value of thermal monitor, this patch gives the default value
> for LD20 Reference board via device-tree property.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 25 ++++++++++++++++++++++
> arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 6 ++++++
> 2 files changed, 31 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
> index 609162a..79e1363 100644
> --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
> +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
> @@ -73,6 +73,27 @@
> i2c4 = &i2c4;
> i2c5 = &i2c5;
> };
> +
> + thermal-zones {
> + cpu_thermal {
> + polling-delay-passive = <250>; /* 250ms */
> + polling-delay = <1000>; /* 1000ms */
> + thermal-sensors = <&pvtctl>;
> +
> + trips {
> + cpu_crit: cpu_crit {
> + temperature = <95000>; /* 95C */
> + hysteresis = <2000>;
> + type = "critical";
> + };
> + cpu_alert: cpu_alert {
> + temperature = <85000>; /* 85C */
> + hysteresis = <2000>;
> + type = "passive";
> + };
> + };
> + };
> + };
> };
>
> ðsc {
> @@ -86,3 +107,7 @@
> &i2c0 {
> status = "okay";
> };
> +
> +&pvtctl {
> + socionext,tmod-calibration = <0x0f22 0x68ee>;
> +};
> diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> index a6b3a70..effa2e3 100644
> --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
> @@ -417,6 +417,12 @@
> compatible = "socionext,uniphier-ld20-reset";
> #reset-cells = <1>;
> };
> +
> + pvtctl: pvtctl {
> + compatible = "socionext,uniphier-ld20-thermal";
> + interrupts = <0 3 1>;
> + #thermal-sensor-cells = <0>;
> + };
The 3rd cell of the interrupts is 1.
So, you mean the interrupt is edge-triggered.
(Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt)
However, in your driver code, the interrupt is explicitly cleared in
the IRQ handler.
I checked the SoC implementation document and
the PVT IRQ seems to be level-triggered.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 41+ messages in thread
end of thread, other threads:[~2017-06-06 3:04 UTC | newest]
Thread overview: 41+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-29 9:15 [PATCH 0/4] add UniPhier thermal support Kunihiko Hayashi
2017-05-29 9:15 ` Kunihiko Hayashi
2017-05-29 9:15 ` [PATCH 1/4] thermal: uniphier: add UniPhier thermal driver Kunihiko Hayashi
2017-05-29 9:15 ` Kunihiko Hayashi
2017-05-29 9:15 ` Kunihiko Hayashi
2017-05-29 10:23 ` Keerthy
2017-05-29 10:23 ` Keerthy
2017-05-29 10:23 ` Keerthy
2017-05-30 2:47 ` Kunihiko Hayashi
2017-05-30 2:47 ` Kunihiko Hayashi
2017-05-30 2:47 ` Kunihiko Hayashi
2017-05-30 3:21 ` Keerthy
2017-05-30 3:21 ` Keerthy
2017-05-30 3:21 ` Keerthy
2017-05-30 4:09 ` Kunihiko Hayashi
2017-05-30 4:09 ` Kunihiko Hayashi
2017-05-30 4:09 ` Kunihiko Hayashi
2017-05-29 16:48 ` Eduardo Valentin
2017-05-29 16:48 ` Eduardo Valentin
2017-05-30 9:21 ` Kunihiko Hayashi
2017-05-30 9:21 ` Kunihiko Hayashi
2017-06-05 8:42 ` Masahiro Yamada
2017-06-05 8:42 ` Masahiro Yamada
2017-06-05 8:42 ` Masahiro Yamada
2017-05-29 9:15 ` [PATCH 2/4] dt-bindings: thermal: add binding documentation for UniPhier thermal monitor Kunihiko Hayashi
2017-05-29 9:15 ` Kunihiko Hayashi
2017-06-05 17:28 ` Rob Herring
2017-06-05 17:28 ` Rob Herring
2017-06-06 2:46 ` Masahiro Yamada
2017-06-06 2:46 ` Masahiro Yamada
2017-05-29 9:15 ` [PATCH 3/4] ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2 Kunihiko Hayashi
2017-05-29 9:15 ` Kunihiko Hayashi
2017-05-29 16:30 ` Eduardo Valentin
2017-05-29 16:30 ` Eduardo Valentin
2017-05-30 9:25 ` Kunihiko Hayashi
2017-05-30 9:25 ` Kunihiko Hayashi
2017-05-30 9:25 ` Kunihiko Hayashi
2017-05-29 9:15 ` [PATCH 4/4] arm64: dts: uniphier: add nodes of thermal monitor and thermal zone for LD20 Kunihiko Hayashi
2017-05-29 9:15 ` Kunihiko Hayashi
2017-06-06 3:04 ` Masahiro Yamada
2017-06-06 3:04 ` Masahiro Yamada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.