LinuxLists.cc - [PATCH v4 0/4] thermal: add brcmstb AVS TMON driver

[permalink] [raw]

Subject: [PATCH v4 1/4] Documentation: devicetree: add binding for Broadcom STB AVS TMON

From: Brian Norris <[email protected]>

Add binding for Broadcom STB thermal.

Signed-off-by: Brian Norris <[email protected]>
Signed-off-by: Markus Mayer <[email protected]>
---
.../devicetree/bindings/thermal/brcm,avs-tmon.txt | 20 ++++++++++++++++++++
MAINTAINERS | 8 ++++++++
2 files changed, 28 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt

diff --git a/Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt b/Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
new file mode 100644
index 0000000..9d43553
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
@@ -0,0 +1,20 @@
+* Broadcom STB thermal management
+
+Thermal management core, provided by the AVS TMON hardware block.
+
+Required properties:
+- compatible: must be "brcm,avs-tmon" and/or "brcm,avs-tmon-bcm7445"
+- reg: address range for the AVS TMON registers
+- interrupts: temperature monitor interrupt, for high/low threshold triggers
+- interrupt-names: should be "tmon"
+- interrupt-parent: the parent interrupt controller
+
+Example:
+
+ thermal@f04d1500 {
+ compatible = "brcm,avs-tmon-bcm7445", "brcm,avs-tmon";
+ reg = <0xf04d1500 0x28>;
+ interrupts = <0x6>;
+ interrupt-names = "tmon";
+ interrupt-parent = <&avs_host_l2_intc>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index f66488d..2f116a8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2903,6 +2903,14 @@ S: Maintained
F: Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
F: drivers/cpufreq/brcmstb*

+BROADCOM STB AVS TMON DRIVER
+M: Markus Mayer <[email protected]>
+M: [email protected]
+L: [email protected]
+S: Maintained
+F: Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
+F: drivers/thermal/broadcom/brcmstb*
+
BROADCOM STB NAND FLASH DRIVER
M: Brian Norris <[email protected]>
M: Kamal Dasu <[email protected]>
--
2.7.4

2017-08-09 22:03:28

[permalink] [raw]

Subject: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver

From: Brian Norris <[email protected]>

The AVS TMON core provides temperature readings, a pair of configurable
high- and low-temperature threshold interrupts, and an emergency
over-temperature chip reset. The driver utilizes the first two to
provide temperature readings and high-temperature notifications to
applications. The over-temperature reset is not exposed to
applications; this reset threshold is critical to the system and should
be set with care within the bootloader.

Applications may choose to utilize the notification mechanism, the
temperature reading mechanism (e.g., through polling), or both.

Signed-off-by: Brian Norris <[email protected]>
Signed-off-by: Doug Berger <[email protected]>
Signed-off-by: Markus Mayer <[email protected]>
---
drivers/thermal/Kconfig | 2 +-
drivers/thermal/broadcom/Kconfig | 7 +
drivers/thermal/broadcom/Makefile | 1 +
drivers/thermal/broadcom/brcmstb_thermal.c | 386 +++++++++++++++++++++++++++++
4 files changed, 395 insertions(+), 1 deletion(-)
create mode 100644 drivers/thermal/broadcom/brcmstb_thermal.c

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index b5b5fac..396ad6b 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -408,7 +408,7 @@ config MTK_THERMAL
controller present in Mediatek SoCs

menu "Broadcom thermal drivers"
-depends on ARCH_BCM || COMPILE_TEST
+depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST
source "drivers/thermal/broadcom/Kconfig"
endmenu

diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig
index 42c098e..c106a15 100644
--- a/drivers/thermal/broadcom/Kconfig
+++ b/drivers/thermal/broadcom/Kconfig
@@ -6,6 +6,13 @@ config BCM2835_THERMAL
help
Support for thermal sensors on Broadcom bcm2835 SoCs.

+config BRCMSTB_THERMAL
+ tristate "Broadcom STB AVS TMON thermal driver"
+ depends on ARCH_BRCMSTB || COMPILE_TEST
+ help
+ Enable this driver if you have a Broadcom STB SoC and would like
+ thermal framework support.
+
config BCM_NS_THERMAL
tristate "Northstar thermal driver"
depends on ARCH_BCM_IPROC || COMPILE_TEST
diff --git a/drivers/thermal/broadcom/Makefile b/drivers/thermal/broadcom/Makefile
index c6f62e4..fae10ec 100644
--- a/drivers/thermal/broadcom/Makefile
+++ b/drivers/thermal/broadcom/Makefile
@@ -1,2 +1,3 @@
obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o
+obj-$(CONFIG_BRCMSTB_THERMAL) += brcmstb_thermal.o
obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o
diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c
new file mode 100644
index 0000000..87b8e7a
--- /dev/null
+++ b/drivers/thermal/broadcom/brcmstb_thermal.c
@@ -0,0 +1,386 @@
+/*
+ * Broadcom STB AVS TMON thermal sensor driver
+ *
+ * Copyright (c) 2015-2017 Broadcom
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ *
+ */
+
+#define DRV_NAME "brcmstb_thermal"
+
+#define pr_fmt(fmt) DRV_NAME ": " fmt
+
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/irqreturn.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of_device.h>
+#include <linux/thermal.h>
+
+#define AVS_TMON_STATUS 0x00
+ #define AVS_TMON_STATUS_valid_msk BIT(11)
+ #define AVS_TMON_STATUS_data_msk GENMASK(10, 1)
+ #define AVS_TMON_STATUS_data_shift 1
+
+#define AVS_TMON_EN_OVERTEMP_RESET 0x04
+ #define AVS_TMON_EN_OVERTEMP_RESET_msk BIT(0)
+
+#define AVS_TMON_RESET_THRESH 0x08
+ #define AVS_TMON_RESET_THRESH_msk GENMASK(10, 1)
+ #define AVS_TMON_RESET_THRESH_shift 1
+
+#define AVS_TMON_INT_IDLE_TIME 0x10
+
+#define AVS_TMON_EN_TEMP_INT_SRCS 0x14
+ #define AVS_TMON_EN_TEMP_INT_SRCS_high BIT(1)
+ #define AVS_TMON_EN_TEMP_INT_SRCS_low BIT(0)
+
+#define AVS_TMON_INT_THRESH 0x18
+ #define AVS_TMON_INT_THRESH_high_msk GENMASK(26, 17)
+ #define AVS_TMON_INT_THRESH_high_shift 17
+ #define AVS_TMON_INT_THRESH_low_msk GENMASK(10, 1)
+ #define AVS_TMON_INT_THRESH_low_shift 1
+
+#define AVS_TMON_TEMP_INT_CODE 0x1c
+#define AVS_TMON_TP_TEST_ENABLE 0x20
+
+/* Default coefficients */
+#define AVS_TMON_TEMP_SLOPE -487
+#define AVS_TMON_TEMP_OFFSET 410040
+
+/* HW related temperature constants */
+#define AVS_TMON_TEMP_MAX 0x3ff
+#define AVS_TMON_TEMP_MIN -88161
+#define AVS_TMON_TEMP_MASK AVS_TMON_TEMP_MAX
+
+enum avs_tmon_trip_type {
+ TMON_TRIP_TYPE_LOW = 0,
+ TMON_TRIP_TYPE_HIGH,
+ TMON_TRIP_TYPE_RESET,
+ TMON_TRIP_TYPE_MAX,
+};
+
+struct avs_tmon_trip {
+ /* HW bit to enable the trip */
+ u32 enable_offs;
+ u32 enable_mask;
+
+ /* HW field to read the trip temperature */
+ u32 reg_offs;
+ u32 reg_msk;
+ int reg_shift;
+};
+
+static struct avs_tmon_trip avs_tmon_trips[] = {
+ /* Trips when temperature is below threshold */
+ [TMON_TRIP_TYPE_LOW] = {
+ .enable_offs = AVS_TMON_EN_TEMP_INT_SRCS,
+ .enable_mask = AVS_TMON_EN_TEMP_INT_SRCS_low,
+ .reg_offs = AVS_TMON_INT_THRESH,
+ .reg_msk = AVS_TMON_INT_THRESH_low_msk,
+ .reg_shift = AVS_TMON_INT_THRESH_low_shift,
+ },
+ /* Trips when temperature is above threshold */
+ [TMON_TRIP_TYPE_HIGH] = {
+ .enable_offs = AVS_TMON_EN_TEMP_INT_SRCS,
+ .enable_mask = AVS_TMON_EN_TEMP_INT_SRCS_high,
+ .reg_offs = AVS_TMON_INT_THRESH,
+ .reg_msk = AVS_TMON_INT_THRESH_high_msk,
+ .reg_shift = AVS_TMON_INT_THRESH_high_shift,
+ },
+ /* Automatically resets chip when above threshold */
+ [TMON_TRIP_TYPE_RESET] = {
+ .enable_offs = AVS_TMON_EN_OVERTEMP_RESET,
+ .enable_mask = AVS_TMON_EN_OVERTEMP_RESET_msk,
+ .reg_offs = AVS_TMON_RESET_THRESH,
+ .reg_msk = AVS_TMON_RESET_THRESH_msk,
+ .reg_shift = AVS_TMON_RESET_THRESH_shift,
+ },
+};
+
+struct brcmstb_thermal_priv {
+ void __iomem *tmon_base;
+ struct device *dev;
+ struct thermal_zone_device *thermal;
+};
+
+static void avs_tmon_get_coeffs(struct thermal_zone_device *tz, int *slope,
+ int *offset)
+{
+ *slope = thermal_zone_get_slope(tz);
+ *offset = thermal_zone_get_offset(tz);
+}
+
+/* Convert a HW code to a temperature reading (millidegree celsius) */
+static inline int avs_tmon_code_to_temp(struct thermal_zone_device *tz,
+ u32 code)
+{
+ const int val = code & AVS_TMON_TEMP_MASK;
+ int slope, offset;
+
+ avs_tmon_get_coeffs(tz, &slope, &offset);
+
+ return slope * val + offset;
+}
+
+/*
+ * Convert a temperature value (millidegree celsius) to a HW code
+ *
+ * @temp: temperature to convert
+ * @low: if true, round toward the low side
+ */
+static inline u32 avs_tmon_temp_to_code(struct thermal_zone_device *tz,
+ int temp, bool low)
+{
+ int slope, offset;
+
+ if (temp < AVS_TMON_TEMP_MIN)
+ return AVS_TMON_TEMP_MAX; /* Maximum code value */
+
+ avs_tmon_get_coeffs(tz, &slope, &offset);
+
+ if (temp >= offset)
+ return 0; /* Minimum code value */
+
+ if (low)
+ return (u32)(DIV_ROUND_UP(offset - temp, abs(slope)));
+ else
+ return (u32)((offset - temp) / abs(slope));
+}
+
+static int brcmstb_get_temp(void *data, int *temp)
+{
+ struct brcmstb_thermal_priv *priv = data;
+ u32 val;
+ long t;
+
+ val = __raw_readl(priv->tmon_base + AVS_TMON_STATUS);
+
+ if (!(val & AVS_TMON_STATUS_valid_msk)) {
+ dev_err(priv->dev, "reading not valid\n");
+ return -EIO;
+ }
+
+ val = (val & AVS_TMON_STATUS_data_msk) >> AVS_TMON_STATUS_data_shift;
+
+ t = avs_tmon_code_to_temp(priv->thermal, val);
+ if (t < 0)
+ *temp = 0;
+ else
+ *temp = t;
+
+ return 0;
+}
+
+static void avs_tmon_trip_enable(struct brcmstb_thermal_priv *priv,
+ enum avs_tmon_trip_type type, int en)
+{
+ struct avs_tmon_trip *trip = &avs_tmon_trips[type];
+ u32 val = __raw_readl(priv->tmon_base + trip->enable_offs);
+
+ dev_dbg(priv->dev, "%sable trip, type %d\n", en ? "en" : "dis", type);
+
+ if (en)
+ val |= trip->enable_mask;
+ else
+ val &= ~trip->enable_mask;
+
+ __raw_writel(val, priv->tmon_base + trip->enable_offs);
+}
+
+static int avs_tmon_get_trip_temp(struct brcmstb_thermal_priv *priv,
+ enum avs_tmon_trip_type type)
+{
+ struct avs_tmon_trip *trip = &avs_tmon_trips[type];
+ u32 val = __raw_readl(priv->tmon_base + trip->reg_offs);
+
+ val &= trip->reg_msk;
+ val >>= trip->reg_shift;
+
+ return avs_tmon_code_to_temp(priv->thermal, val);
+}
+
+static void avs_tmon_set_trip_temp(struct brcmstb_thermal_priv *priv,
+ enum avs_tmon_trip_type type,
+ int temp)
+{
+ struct avs_tmon_trip *trip = &avs_tmon_trips[type];
+ u32 val, orig;
+
+ dev_dbg(priv->dev, "set temp %d to %d\n", type, temp);
+
+ /* round toward low temp for the low interrupt */
+ val = avs_tmon_temp_to_code(priv->thermal, temp,
+ type == TMON_TRIP_TYPE_LOW);
+
+ val <<= trip->reg_shift;
+ val &= trip->reg_msk;
+
+ orig = __raw_readl(priv->tmon_base + trip->reg_offs);
+ orig &= ~trip->reg_msk;
+ orig |= val;
+ __raw_writel(orig, priv->tmon_base + trip->reg_offs);
+}
+
+static int avs_tmon_get_intr_temp(struct brcmstb_thermal_priv *priv)
+{
+ u32 val;
+
+ val = __raw_readl(priv->tmon_base + AVS_TMON_TEMP_INT_CODE);
+ return avs_tmon_code_to_temp(priv->thermal, val);
+}
+
+static irqreturn_t brcmstb_tmon_irq_thread(int irq, void *data)
+{
+ struct brcmstb_thermal_priv *priv = data;
+ int low, high, intr;
+
+ low = avs_tmon_get_trip_temp(priv, TMON_TRIP_TYPE_LOW);
+ high = avs_tmon_get_trip_temp(priv, TMON_TRIP_TYPE_HIGH);
+ intr = avs_tmon_get_intr_temp(priv);
+
+ dev_dbg(priv->dev, "low/intr/high: %d/%d/%d\n",
+ low, intr, high);
+
+ /* Disable high-temp until next threshold shift */
+ if (intr >= high)
+ avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_HIGH, 0);
+ /* Disable low-temp until next threshold shift */
+ if (intr <= low)
+ avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_LOW, 0);
+
+ /*
+ * Notify using the interrupt temperature, in case the temperature
+ * changes before it can next be read out
+ */
+ thermal_zone_device_update(priv->thermal, intr);
+
+ return IRQ_HANDLED;
+}
+
+static int brcmstb_set_trips(void *data, int low, int high)
+{
+ struct brcmstb_thermal_priv *priv = data;
+
+ dev_dbg(priv->dev, "set trips %d <--> %d\n", low, high);
+
+ if (low) {
+ if (low > INT_MAX)
+ low = INT_MAX;
+ avs_tmon_set_trip_temp(priv, TMON_TRIP_TYPE_LOW, low);
+ avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_LOW, 1);
+ } else {
+ avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_LOW, 0);
+ }
+
+ if (high < ULONG_MAX) {
+ if (high > INT_MAX)
+ high = INT_MAX;
+ avs_tmon_set_trip_temp(priv, TMON_TRIP_TYPE_HIGH, high);
+ avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_HIGH, 1);
+ } else {
+ avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_HIGH, 0);
+ }
+
+ return 0;
+}
+
+static struct thermal_zone_of_device_ops of_ops = {
+ .get_temp = brcmstb_get_temp,
+ .set_trips = brcmstb_set_trips,
+};
+
+static const struct of_device_id brcmstb_thermal_id_table[] = {
+ { .compatible = "brcm,avs-tmon" },
+ {},
+};
+MODULE_DEVICE_TABLE(of, brcmstb_thermal_id_table);
+
+static int brcmstb_thermal_probe(struct platform_device *pdev)
+{
+ struct thermal_zone_device *thermal;
+ struct brcmstb_thermal_priv *priv;
+ struct resource *res;
+ int irq, ret;
+
+ priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ priv->tmon_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(priv->tmon_base))
+ return PTR_ERR(priv->tmon_base);
+
+ priv->dev = &pdev->dev;
+ platform_set_drvdata(pdev, priv);
+
+ thermal = thermal_zone_of_sensor_register(&pdev->dev, 0, priv, &of_ops);
+ if (IS_ERR(thermal)) {
+ ret = PTR_ERR(thermal);
+ dev_err(&pdev->dev, "could not register sensor: %d\n", ret);
+ return ret;
+ }
+
+ priv->thermal = thermal;
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+ dev_err(&pdev->dev, "could not get IRQ\n");
+ ret = irq;
+ goto err;
+ }
+ ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+ brcmstb_tmon_irq_thread, IRQF_ONESHOT,
+ DRV_NAME, priv);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "could not request IRQ: %d\n", ret);
+ goto err;
+ }
+
+ dev_info(&pdev->dev, "registered AVS TMON of-sensor driver\n");
+
+ return 0;
+
+err:
+ thermal_zone_of_sensor_unregister(&pdev->dev, thermal);
+ return ret;
+}
+
+static int brcmstb_thermal_exit(struct platform_device *pdev)
+{
+ struct brcmstb_thermal_priv *priv = platform_get_drvdata(pdev);
+ struct thermal_zone_device *thermal = priv->thermal;
+
+ if (thermal)
+ thermal_zone_of_sensor_unregister(&pdev->dev, priv->thermal);
+
+ return 0;
+}
+
+static struct platform_driver brcmstb_thermal_driver = {
+ .probe = brcmstb_thermal_probe,
+ .remove = brcmstb_thermal_exit,
+ .driver = {
+ .name = DRV_NAME,
+ .of_match_table = brcmstb_thermal_id_table,
+ },
+};
+module_platform_driver(brcmstb_thermal_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Brian Norris");
+MODULE_DESCRIPTION("Broadcom STB AVS TMON thermal driver");
--
2.7.4

2017-08-09 22:03:40

[permalink] [raw]

Subject: [PATCH v4 3/4] ARM: multi_v7_defconfig: add CONFIG_BRCMSTB_THERMAL

From: Markus Mayer <[email protected]>

Turn on CONFIG_BRCMSTB_THERMAL as module.

Signed-off-by: Markus Mayer <[email protected]>
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 4d19c1b..230f7fa 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -455,6 +455,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_PWM_FAN=m
CONFIG_SENSORS_INA2XX=m
CONFIG_CPU_THERMAL=y
+CONFIG_BRCMSTB_THERMAL=m
CONFIG_ROCKCHIP_THERMAL=y
CONFIG_RCAR_THERMAL=y
CONFIG_ARMADA_THERMAL=y
--
2.7.4

2017-08-09 22:03:50

[permalink] [raw]

Subject: [PATCH v4 4/4] arm64: defconfig: add CONFIG_BRCMSTB_THERMAL

From: Markus Mayer <[email protected]>

Turn on CONFIG_BRCMSTB_THERMAL as module.

Signed-off-by: Markus Mayer <[email protected]>
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 6c7d147..2449064 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -304,6 +304,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
CONFIG_THERMAL_EMULATION=y
+CONFIG_BRCMSTB_THERMAL=m
CONFIG_EXYNOS_THERMAL=y
CONFIG_ROCKCHIP_THERMAL=m
CONFIG_WATCHDOG=y
--
2.7.4

2017-08-11 05:36:07

[permalink] [raw]

Subject: Re: [PATCH v4 0/4] thermal: add brcmstb AVS TMON driver

On Wed, 2017-08-09 at 15:02 -0700, Markus Mayer wrote:
> From: Markus Mayer <[email protected]>
>
> This series adds the brcmstb AVS TMON driver.
>
> The driver was originally written by Brian Norris.
>
> This series is also available at
> https://github.com/mmayer/linux/tree/brcmstb-thermal-4.13-v4.
>
> v1 of this series can be found at https://lkml.org/lkml/2017/6/5/921
> v2 of this series can be found at https://lkml.org/lkml/2017/7/21/585
> v3 of this series can be found at https://lkml.org/lkml/2017/7/31/710
>
> Changes since v3:
> - Rebased on v4.13-rc3 to resolve conflicts in the MAINTAINERS file
>
thanks, will apply this if we have ACK for patch 3 and 4.

thanks,
rui
> Changes since v2:
> - replaced calls to pr_debug() with calls to dev_dbg() [PATCH 2/4
> only]
> - all other patches are unchanged from v2
>
> Changes since v1:
> - Fixed wording in binding document
> - Fixed lincensing to consistently mention GPL v2
> - Use thermal_zone_get_slope() and thermal_zone_get_offset()
> - Some minor clean-ups
>
> Brian Norris (2):
> Documentation: devicetree: add binding for Broadcom STB AVS TMON
> thermal: add brcmstb AVS TMON driver
>
> Markus Mayer (2):
> ARM: multi_v7_defconfig: add CONFIG_BRCMSTB_THERMAL
> arm64: defconfig: add CONFIG_BRCMSTB_THERMAL
>
> .../devicetree/bindings/thermal/brcm,avs-tmon.txt  |  20 ++
> MAINTAINERS                                        |   8 +
> arch/arm/configs/multi_v7_defconfig                |   1 +
> arch/arm64/configs/defconfig                       |   1 +
> drivers/thermal/Kconfig                            |   2 +-
> drivers/thermal/broadcom/Kconfig                   |   7 +
> drivers/thermal/broadcom/Makefile                  |   1 +
> drivers/thermal/broadcom/brcmstb_thermal.c         | 386
> +++++++++++++++++++++
> 8 files changed, 425 insertions(+), 1 deletion(-)
> create mode 100644
> Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
> create mode 100644 drivers/thermal/broadcom/brcmstb_thermal.c
>

2017-08-13 04:57:52

[permalink] [raw]

Subject: Re: [PATCH v4 0/4] thermal: add brcmstb AVS TMON driver

On August 10, 2017 10:35:56 PM PDT, Zhang Rui <[email protected]> wrote:
>On Wed, 2017-08-09 at 15:02 -0700, Markus Mayer wrote:
>> From: Markus Mayer <[email protected]>
>>
>> This series adds the brcmstb AVS TMON driver.
>>
>> The driver was originally written by Brian Norris.
>>
>> This series is also available at
>> https://github.com/mmayer/linux/tree/brcmstb-thermal-4.13-v4.
>>
>> v1 of this series can be found at https://lkml.org/lkml/2017/6/5/921
>> v2 of this series can be found at https://lkml.org/lkml/2017/7/21/585
>> v3 of this series can be found at https://lkml.org/lkml/2017/7/31/710
>>
>> Changes since v3:
>> - Rebased on v4.13-rc3 to resolve conflicts in the MAINTAINERS file
>>
>thanks, will apply this if we have ACK for patch 3 and 4.

You can take patches 1-2 through your tree and I can take patches 3-4 thought the Broadcom ARM/ARM64 pull requests if that works for you, or FWIW:

Acked-by: Florian Fainelli <[email protected]>

Thanks!

--
Florian

2017-08-15 06:08:37

[permalink] [raw]

Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver

On Wed, 2017-08-09 at 15:02 -0700, Markus Mayer wrote:
> From: Brian Norris <[email protected]>
>
> The AVS TMON core provides temperature readings, a pair of
> configurable
> high- and low-temperature threshold interrupts, and an emergency
> over-temperature chip reset. The driver utilizes the first two to
> provide temperature readings and high-temperature notifications to
> applications. The over-temperature reset is not exposed to
> applications; this reset threshold is critical to the system and
> should
> be set with care within the bootloader.
>
> Applications may choose to utilize the notification mechanism, the
> temperature reading mechanism (e.g., through polling), or both.
>
> Signed-off-by: Brian Norris <[email protected]>
> Signed-off-by: Doug Berger <[email protected]>
> Signed-off-by: Markus Mayer <[email protected]>
> ---
> drivers/thermal/Kconfig                    |   2 +-
> drivers/thermal/broadcom/Kconfig           |   7 +
> drivers/thermal/broadcom/Makefile          |   1 +
> drivers/thermal/broadcom/brcmstb_thermal.c | 386
> +++++++++++++++++++++++++++++
> 4 files changed, 395 insertions(+), 1 deletion(-)
> create mode 100644 drivers/thermal/broadcom/brcmstb_thermal.c
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index b5b5fac..396ad6b 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -408,7 +408,7 @@ config MTK_THERMAL
>   controller present in Mediatek SoCs
>
> menu "Broadcom thermal drivers"
> -depends on ARCH_BCM || COMPILE_TEST
> +depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST
> source "drivers/thermal/broadcom/Kconfig"
> endmenu
>
> diff --git a/drivers/thermal/broadcom/Kconfig
> b/drivers/thermal/broadcom/Kconfig
> index 42c098e..c106a15 100644
> --- a/drivers/thermal/broadcom/Kconfig
> +++ b/drivers/thermal/broadcom/Kconfig
> @@ -6,6 +6,13 @@ config BCM2835_THERMAL
> help
>   Support for thermal sensors on Broadcom bcm2835 SoCs.
>
> +config BRCMSTB_THERMAL
> + tristate "Broadcom STB AVS TMON thermal driver"
> + depends on ARCH_BRCMSTB || COMPILE_TEST
> + help
> +   Enable this driver if you have a Broadcom STB SoC and
> would like
> +   thermal framework support.
> +

I don't understand why I got the following checkpatch warning

WARNING: please write a paragraph that describes the config symbol
fully
#73: FILE: drivers/thermal/broadcom/Kconfig:9:
+config BRCMSTB_THERMAL

I didn't see this for other Kconfig changes.

thanks,
rui

> config BCM_NS_THERMAL
> tristate "Northstar thermal driver"
> depends on ARCH_BCM_IPROC || COMPILE_TEST
> diff --git a/drivers/thermal/broadcom/Makefile
> b/drivers/thermal/broadcom/Makefile
> index c6f62e4..fae10ec 100644
> --- a/drivers/thermal/broadcom/Makefile
> +++ b/drivers/thermal/broadcom/Makefile
> @@ -1,2 +1,3 @@
> obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o
> +obj-$(CONFIG_BRCMSTB_THERMAL) += brcmstb_thermal.o
> obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o
> diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c
> b/drivers/thermal/broadcom/brcmstb_thermal.c
> new file mode 100644
> index 0000000..87b8e7a
> --- /dev/null
> +++ b/drivers/thermal/broadcom/brcmstb_thermal.c
> @@ -0,0 +1,386 @@
> +/*
> + * Broadcom STB AVS TMON thermal sensor driver
> + *
> + * Copyright (c) 2015-2017 Broadcom
> + *
> + * This software is licensed under the terms of the GNU General
> Public
> + * License version 2, as published by the Free Software Foundation,
> and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * 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.
> + *
> + */
> +
> +#define DRV_NAME "brcmstb_thermal"
> +
> +#define pr_fmt(fmt) DRV_NAME ": " fmt
> +
> +#include <linux/bitops.h>
> +#include <linux/device.h>
> +#include <linux/err.h>
> +#include <linux/io.h>
> +#include <linux/irqreturn.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/of_device.h>
> +#include <linux/thermal.h>
> +
> +#define AVS_TMON_STATUS 0x00
> + #define AVS_TMON_STATUS_valid_msk BIT(11)
> + #define AVS_TMON_STATUS_data_msk GENMASK(10, 1)
> + #define AVS_TMON_STATUS_data_shift 1
> +
> +#define AVS_TMON_EN_OVERTEMP_RESET 0x04
> + #define AVS_TMON_EN_OVERTEMP_RESET_msk BIT(0)
> +
> +#define AVS_TMON_RESET_THRESH 0x08
> + #define AVS_TMON_RESET_THRESH_msk GENMASK(10, 1)
> + #define AVS_TMON_RESET_THRESH_shift 1
> +
> +#define AVS_TMON_INT_IDLE_TIME 0x10
> +
> +#define AVS_TMON_EN_TEMP_INT_SRCS 0x14
> + #define AVS_TMON_EN_TEMP_INT_SRCS_high BIT(1)
> + #define AVS_TMON_EN_TEMP_INT_SRCS_low BIT(0)
> +
> +#define AVS_TMON_INT_THRESH 0x18
> + #define AVS_TMON_INT_THRESH_high_msk GENMASK(26, 17)
> + #define AVS_TMON_INT_THRESH_high_shift 17
> + #define AVS_TMON_INT_THRESH_low_msk GENMASK(10, 1)
> + #define AVS_TMON_INT_THRESH_low_shift 1
> +
> +#define AVS_TMON_TEMP_INT_CODE 0x1c
> +#define AVS_TMON_TP_TEST_ENABLE 0x20
> +
> +/* Default coefficients */
> +#define AVS_TMON_TEMP_SLOPE -487
> +#define AVS_TMON_TEMP_OFFSET 410040
> +
> +/* HW related temperature constants */
> +#define AVS_TMON_TEMP_MAX 0x3ff
> +#define AVS_TMON_TEMP_MIN -88161
> +#define AVS_TMON_TEMP_MASK AVS_TMON_TEMP_MAX
> +
> +enum avs_tmon_trip_type {
> + TMON_TRIP_TYPE_LOW = 0,
> + TMON_TRIP_TYPE_HIGH,
> + TMON_TRIP_TYPE_RESET,
> + TMON_TRIP_TYPE_MAX,
> +};
> +
> +struct avs_tmon_trip {
> + /* HW bit to enable the trip */
> + u32 enable_offs;
> + u32 enable_mask;
> +
> + /* HW field to read the trip temperature */
> + u32 reg_offs;
> + u32 reg_msk;
> + int reg_shift;
> +};
> +
> +static struct avs_tmon_trip avs_tmon_trips[] = {
> + /* Trips when temperature is below threshold */
> + [TMON_TRIP_TYPE_LOW] = {
> + .enable_offs = AVS_TMON_EN_TEMP_INT_SRCS,
> + .enable_mask = AVS_TMON_EN_TEMP_INT_SRCS_low,
> + .reg_offs = AVS_TMON_INT_THRESH,
> + .reg_msk = AVS_TMON_INT_THRESH_low_msk,
> + .reg_shift = AVS_TMON_INT_THRESH_low_shift,
> + },
> + /* Trips when temperature is above threshold */
> + [TMON_TRIP_TYPE_HIGH] = {
> + .enable_offs = AVS_TMON_EN_TEMP_INT_SRCS,
> + .enable_mask =
> AVS_TMON_EN_TEMP_INT_SRCS_high,
> + .reg_offs = AVS_TMON_INT_THRESH,
> + .reg_msk = AVS_TMON_INT_THRESH_high_msk,
> + .reg_shift = AVS_TMON_INT_THRESH_high_shift,
> + },
> + /* Automatically resets chip when above threshold */
> + [TMON_TRIP_TYPE_RESET] = {
> + .enable_offs = AVS_TMON_EN_OVERTEMP_RESET,
> + .enable_mask =
> AVS_TMON_EN_OVERTEMP_RESET_msk,
> + .reg_offs = AVS_TMON_RESET_THRESH,
> + .reg_msk = AVS_TMON_RESET_THRESH_msk,
> + .reg_shift = AVS_TMON_RESET_THRESH_shift,
> + },
> +};
> +
> +struct brcmstb_thermal_priv {
> + void __iomem *tmon_base;
> + struct device *dev;
> + struct thermal_zone_device *thermal;
> +};
> +
> +static void avs_tmon_get_coeffs(struct thermal_zone_device *tz, int
> *slope,
> + int *offset)
> +{
> + *slope = thermal_zone_get_slope(tz);
> + *offset = thermal_zone_get_offset(tz);
> +}
> +
> +/* Convert a HW code to a temperature reading (millidegree celsius)
> */
> +static inline int avs_tmon_code_to_temp(struct thermal_zone_device
> *tz,
> + u32 code)
> +{
> + const int val = code & AVS_TMON_TEMP_MASK;
> + int slope, offset;
> +
> + avs_tmon_get_coeffs(tz, &slope, &offset);
> +
> + return slope * val + offset;
> +}
> +
> +/*
> + * Convert a temperature value (millidegree celsius) to a HW code
> + *
> + * @temp: temperature to convert
> + * @low: if true, round toward the low side
> + */
> +static inline u32 avs_tmon_temp_to_code(struct thermal_zone_device
> *tz,
> + int temp, bool low)
> +{
> + int slope, offset;
> +
> + if (temp < AVS_TMON_TEMP_MIN)
> + return AVS_TMON_TEMP_MAX; /* Maximum code value */
> +
> + avs_tmon_get_coeffs(tz, &slope, &offset);
> +
> + if (temp >= offset)
> + return 0; /* Minimum code value */
> +
> + if (low)
> + return (u32)(DIV_ROUND_UP(offset - temp,
> abs(slope)));
> + else
> + return (u32)((offset - temp) / abs(slope));
> +}
> +
> +static int brcmstb_get_temp(void *data, int *temp)
> +{
> + struct brcmstb_thermal_priv *priv = data;
> + u32 val;
> + long t;
> +
> + val = __raw_readl(priv->tmon_base + AVS_TMON_STATUS);
> +
> + if (!(val & AVS_TMON_STATUS_valid_msk)) {
> + dev_err(priv->dev, "reading not valid\n");
> + return -EIO;
> + }
> +
> + val = (val & AVS_TMON_STATUS_data_msk) >>
> AVS_TMON_STATUS_data_shift;
> +
> + t = avs_tmon_code_to_temp(priv->thermal, val);
> + if (t < 0)
> + *temp = 0;
> + else
> + *temp = t;
> +
> + return 0;
> +}
> +
> +static void avs_tmon_trip_enable(struct brcmstb_thermal_priv *priv,
> + enum avs_tmon_trip_type type, int
> en)
> +{
> + struct avs_tmon_trip *trip = &avs_tmon_trips[type];
> + u32 val = __raw_readl(priv->tmon_base + trip->enable_offs);
> +
> + dev_dbg(priv->dev, "%sable trip, type %d\n", en ? "en" :
> "dis", type);
> +
> + if (en)
> + val |= trip->enable_mask;
> + else
> + val &= ~trip->enable_mask;
> +
> + __raw_writel(val, priv->tmon_base + trip->enable_offs);
> +}
> +
> +static int avs_tmon_get_trip_temp(struct brcmstb_thermal_priv *priv,
> +   enum avs_tmon_trip_type type)
> +{
> + struct avs_tmon_trip *trip = &avs_tmon_trips[type];
> + u32 val = __raw_readl(priv->tmon_base + trip->reg_offs);
> +
> + val &= trip->reg_msk;
> + val >>= trip->reg_shift;
> +
> + return avs_tmon_code_to_temp(priv->thermal, val);
> +}
> +
> +static void avs_tmon_set_trip_temp(struct brcmstb_thermal_priv
> *priv,
> +    enum avs_tmon_trip_type type,
> +    int temp)
> +{
> + struct avs_tmon_trip *trip = &avs_tmon_trips[type];
> + u32 val, orig;
> +
> + dev_dbg(priv->dev, "set temp %d to %d\n", type, temp);
> +
> + /* round toward low temp for the low interrupt */
> + val = avs_tmon_temp_to_code(priv->thermal, temp,
> +     type == TMON_TRIP_TYPE_LOW);
> +
> + val <<= trip->reg_shift;
> + val &= trip->reg_msk;
> +
> + orig = __raw_readl(priv->tmon_base + trip->reg_offs);
> + orig &= ~trip->reg_msk;
> + orig |= val;
> + __raw_writel(orig, priv->tmon_base + trip->reg_offs);
> +}
> +
> +static int avs_tmon_get_intr_temp(struct brcmstb_thermal_priv *priv)
> +{
> + u32 val;
> +
> + val = __raw_readl(priv->tmon_base + AVS_TMON_TEMP_INT_CODE);
> + return avs_tmon_code_to_temp(priv->thermal, val);
> +}
> +
> +static irqreturn_t brcmstb_tmon_irq_thread(int irq, void *data)
> +{
> + struct brcmstb_thermal_priv *priv = data;
> + int low, high, intr;
> +
> + low = avs_tmon_get_trip_temp(priv, TMON_TRIP_TYPE_LOW);
> + high = avs_tmon_get_trip_temp(priv, TMON_TRIP_TYPE_HIGH);
> + intr = avs_tmon_get_intr_temp(priv);
> +
> + dev_dbg(priv->dev, "low/intr/high: %d/%d/%d\n",
> + low, intr, high);
> +
> + /* Disable high-temp until next threshold shift */
> + if (intr >= high)
> + avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_HIGH, 0);
> + /* Disable low-temp until next threshold shift */
> + if (intr <= low)
> + avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_LOW, 0);
> +
> + /*
> + * Notify using the interrupt temperature, in case the
> temperature
> + * changes before it can next be read out
> + */
> + thermal_zone_device_update(priv->thermal, intr);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int brcmstb_set_trips(void *data, int low, int high)
> +{
> + struct brcmstb_thermal_priv *priv = data;
> +
> + dev_dbg(priv->dev, "set trips %d <--> %d\n", low, high);
> +
> + if (low) {
> + if (low > INT_MAX)
> + low = INT_MAX;
> + avs_tmon_set_trip_temp(priv, TMON_TRIP_TYPE_LOW,
> low);
> + avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_LOW, 1);
> + } else {
> + avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_LOW, 0);
> + }
> +
> + if (high < ULONG_MAX) {
> + if (high > INT_MAX)
> + high = INT_MAX;
> + avs_tmon_set_trip_temp(priv, TMON_TRIP_TYPE_HIGH,
> high);
> + avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_HIGH, 1);
> + } else {
> + avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_HIGH, 0);
> + }
> +
> + return 0;
> +}
> +
> +static struct thermal_zone_of_device_ops of_ops = {
> + .get_temp = brcmstb_get_temp,
> + .set_trips = brcmstb_set_trips,
> +};
> +
> +static const struct of_device_id brcmstb_thermal_id_table[] = {
> + { .compatible = "brcm,avs-tmon" },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, brcmstb_thermal_id_table);
> +
> +static int brcmstb_thermal_probe(struct platform_device *pdev)
> +{
> + struct thermal_zone_device *thermal;
> + struct brcmstb_thermal_priv *priv;
> + struct resource *res;
> + int irq, ret;
> +
> + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + priv->tmon_base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(priv->tmon_base))
> + return PTR_ERR(priv->tmon_base);
> +
> + priv->dev = &pdev->dev;
> + platform_set_drvdata(pdev, priv);
> +
> + thermal = thermal_zone_of_sensor_register(&pdev->dev, 0,
> priv, &of_ops);
> + if (IS_ERR(thermal)) {
> + ret = PTR_ERR(thermal);
> + dev_err(&pdev->dev, "could not register sensor:
> %d\n", ret);
> + return ret;
> + }
> +
> + priv->thermal = thermal;
> +
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0) {
> + dev_err(&pdev->dev, "could not get IRQ\n");
> + ret = irq;
> + goto err;
> + }
> + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
> + brcmstb_tmon_irq_thread,
> IRQF_ONESHOT,
> + DRV_NAME, priv);
> + if (ret < 0) {
> + dev_err(&pdev->dev, "could not request IRQ: %d\n",
> ret);
> + goto err;
> + }
> +
> + dev_info(&pdev->dev, "registered AVS TMON of-sensor
> driver\n");
> +
> + return 0;
> +
> +err:
> + thermal_zone_of_sensor_unregister(&pdev->dev, thermal);
> + return ret;
> +}
> +
> +static int brcmstb_thermal_exit(struct platform_device *pdev)
> +{
> + struct brcmstb_thermal_priv *priv =
> platform_get_drvdata(pdev);
> + struct thermal_zone_device *thermal = priv->thermal;
> +
> + if (thermal)
> + thermal_zone_of_sensor_unregister(&pdev->dev, priv-
> >thermal);
> +
> + return 0;
> +}
> +
> +static struct platform_driver brcmstb_thermal_driver = {
> + .probe = brcmstb_thermal_probe,
> + .remove = brcmstb_thermal_exit,
> + .driver = {
> + .name = DRV_NAME,
> + .of_match_table = brcmstb_thermal_id_table,
> + },
> +};
> +module_platform_driver(brcmstb_thermal_driver);
> +
> +MODULE_LICENSE("GPL v2");
> +MODULE_AUTHOR("Brian Norris");
> +MODULE_DESCRIPTION("Broadcom STB AVS TMON thermal driver");

2017-08-15 06:42:36

by Rafał Miłecki

[permalink] [raw]

Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver

On 2017-08-15 08:08, Zhang Rui wrote:
>> diff --git a/drivers/thermal/broadcom/Kconfig
>> b/drivers/thermal/broadcom/Kconfig
>> index 42c098e..c106a15 100644
>> --- a/drivers/thermal/broadcom/Kconfig
>> +++ b/drivers/thermal/broadcom/Kconfig
>> @@ -6,6 +6,13 @@ config BCM2835_THERMAL
>> help
>>   Support for thermal sensors on Broadcom bcm2835 SoCs.
>>
>> +config BRCMSTB_THERMAL
>> + tristate "Broadcom STB AVS TMON thermal driver"
>> + depends on ARCH_BRCMSTB || COMPILE_TEST
>> + help
>> +   Enable this driver if you have a Broadcom STB SoC and
>> would like
>> +   thermal framework support.
>> +
>
> I don't understand why I got the following checkpatch warning
>
> WARNING: please write a paragraph that describes the config symbol
> fully
> #73: FILE: drivers/thermal/broadcom/Kconfig:9:
> +config BRCMSTB_THERMAL
>
> I didn't see this for other Kconfig changes.

It's because your help message is only 2 lines long (instead of 3).

Some (many?) maintainers aren't pedantic about that, a common sense
should
be applied ;)

2017-08-15 06:48:58

[permalink] [raw]

Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver

On Tue, 2017-08-15 at 08:42 +0200, Rafał Miłecki wrote:
> On 2017-08-15 08:08, Zhang Rui wrote:
> >
> > >
> > > diff --git a/drivers/thermal/broadcom/Kconfig
> > > b/drivers/thermal/broadcom/Kconfig
> > > index 42c098e..c106a15 100644
> > > --- a/drivers/thermal/broadcom/Kconfig
> > > +++ b/drivers/thermal/broadcom/Kconfig
> > > @@ -6,6 +6,13 @@ config BCM2835_THERMAL
> > > help
> > >   Support for thermal sensors on Broadcom bcm2835 SoCs.
> > >
> > > +config BRCMSTB_THERMAL
> > > + tristate "Broadcom STB AVS TMON thermal driver"
> > > + depends on ARCH_BRCMSTB || COMPILE_TEST
> > > + help
> > > +   Enable this driver if you have a Broadcom STB SoC and
> > > would like
> > > +   thermal framework support.
> > > +
> > I don't understand why I got the following checkpatch warning
> >
> > WARNING: please write a paragraph that describes the config symbol
> > fully
> > #73: FILE: drivers/thermal/broadcom/Kconfig:9:
> > +config BRCMSTB_THERMAL
> >
> > I didn't see this for other Kconfig changes.
> It's because your help message is only 2 lines long (instead of 3).
>
> Some (many?) maintainers aren't pedantic about that, a common sense
> should
> be applied ;)

thanks for explaining.
Patch 1 and 2 queued for next merge window.

-rui

2017-08-15 17:23:46

[permalink] [raw]

Subject: Re: [PATCH v4 3/4] ARM: multi_v7_defconfig: add CONFIG_BRCMSTB_THERMAL

On 08/09/2017 03:02 PM, Markus Mayer wrote:
> From: Markus Mayer <[email protected]>
>
> Turn on CONFIG_BRCMSTB_THERMAL as module.
>
> Signed-off-by: Markus Mayer <[email protected]>

Applied to defconfig/next, thanks!
--
Florian

2017-08-15 17:24:08

[permalink] [raw]

Subject: Re: [PATCH v4 4/4] arm64: defconfig: add CONFIG_BRCMSTB_THERMAL

On 08/09/2017 03:02 PM, Markus Mayer wrote:
> From: Markus Mayer <[email protected]>
>
> Turn on CONFIG_BRCMSTB_THERMAL as module.

Applied to defconfig-arm64/next, thanks!
--
Florian

2017-08-17 15:13:08

by Rob Herring (Arm)

[permalink] [raw]

Subject: Re: [PATCH v4 1/4] Documentation: devicetree: add binding for Broadcom STB AVS TMON

On Wed, Aug 09, 2017 at 03:02:54PM -0700, Markus Mayer wrote:
> From: Brian Norris <[email protected]>
>
> Add binding for Broadcom STB thermal.
>
> Signed-off-by: Brian Norris <[email protected]>
> Signed-off-by: Markus Mayer <[email protected]>
> ---
> .../devicetree/bindings/thermal/brcm,avs-tmon.txt | 20 ++++++++++++++++++++
> MAINTAINERS | 8 ++++++++
> 2 files changed, 28 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt

Acked-by: Rob Herring <[email protected]>

2017-09-24 21:11:35

[permalink] [raw]

Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver

Le 08/14/17 à 23:48, Zhang Rui a écrit :
> On Tue, 2017-08-15 at 08:42 +0200, Rafał Miłecki wrote:
>> On 2017-08-15 08:08, Zhang Rui wrote:
>>>
>>>>
>>>> diff --git a/drivers/thermal/broadcom/Kconfig
>>>> b/drivers/thermal/broadcom/Kconfig
>>>> index 42c098e..c106a15 100644
>>>> --- a/drivers/thermal/broadcom/Kconfig
>>>> +++ b/drivers/thermal/broadcom/Kconfig
>>>> @@ -6,6 +6,13 @@ config BCM2835_THERMAL
>>>> help
>>>>   Support for thermal sensors on Broadcom bcm2835 SoCs.
>>>>
>>>> +config BRCMSTB_THERMAL
>>>> + tristate "Broadcom STB AVS TMON thermal driver"
>>>> + depends on ARCH_BRCMSTB || COMPILE_TEST
>>>> + help
>>>> +   Enable this driver if you have a Broadcom STB SoC and
>>>> would like
>>>> +   thermal framework support.
>>>> +
>>> I don't understand why I got the following checkpatch warning
>>>
>>> WARNING: please write a paragraph that describes the config symbol
>>> fully
>>> #73: FILE: drivers/thermal/broadcom/Kconfig:9:
>>> +config BRCMSTB_THERMAL
>>>
>>> I didn't see this for other Kconfig changes.
>> It's because your help message is only 2 lines long (instead of 3).
>>
>> Some (many?) maintainers aren't pedantic about that, a common sense
>> should
>> be applied ;)
>
> thanks for explaining.
> Patch 1 and 2 queued for next merge window.

Humm, I don't see this driver in your latest 4.14 pull request to Linus,
so what happened here exactly? Can we expect this driver to be submitted
for 4.14 or we just happened to have missed this window now?
--
Florian

2017-09-26 03:03:38

[permalink] [raw]

Subject: RE: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver

Hi, Florian,

This patch set was dropped in the last minute because of this discussion
https://patchwork.kernel.org/patch/9936325/
as I don’t want to rebase the patch before sending the pull request.

I don’t think we can make it for 4.14.
Eduardo will be back and pick the soc patches for 4.15.

Thanks,
rui

-----Original Message-----
From: Florian Fainelli [mailto:[email protected]]
Sent: Monday, September 25, 2017 5:11 AM
To: Zhang, Rui <[email protected]>; Rafał Miłecki <[email protected]>
Cc: Markus Mayer <[email protected]>; Eduardo Valentin <[email protected]>; Rob Herring <[email protected]>; Mark Rutland <[email protected]>; Doug Berger <[email protected]>; Brian Norris <[email protected]>; Gregory Fong <[email protected]>; Russell King <[email protected]>; Catalin Marinas <[email protected]>; Will Deacon <[email protected]>; Arnd Bergmann <[email protected]>; Olof Johansson <[email protected]>; Broadcom Kernel List <[email protected]>; Power Management List <[email protected]>; Device Tree List <[email protected]>; ARM Kernel List <[email protected]>; Linux Kernel Mailing List <[email protected]>; Markus Mayer <[email protected]>
Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver
Importance: High

Le 08/14/17 à 23:48, Zhang Rui a écrit :
> On Tue, 2017-08-15 at 08:42 +0200, Rafał Miłecki wrote:
>> On 2017-08-15 08:08, Zhang Rui wrote:
>>>
>>>>
>>>> diff --git a/drivers/thermal/broadcom/Kconfig
>>>> b/drivers/thermal/broadcom/Kconfig
>>>> index 42c098e..c106a15 100644
>>>> --- a/drivers/thermal/broadcom/Kconfig
>>>> +++ b/drivers/thermal/broadcom/Kconfig
>>>> @@ -6,6 +6,13 @@ config BCM2835_THERMAL
>>>> help
>>>>   Support for thermal sensors on Broadcom bcm2835 SoCs.
>>>>
>>>> +config BRCMSTB_THERMAL
>>>> + tristate "Broadcom STB AVS TMON thermal driver"
>>>> + depends on ARCH_BRCMSTB || COMPILE_TEST
>>>> + help
>>>> +   Enable this driver if you have a Broadcom STB SoC and
>>>> would like
>>>> +   thermal framework support.
>>>> +
>>> I don't understand why I got the following checkpatch warning
>>>
>>> WARNING: please write a paragraph that describes the config symbol
>>> fully
>>> #73: FILE: drivers/thermal/broadcom/Kconfig:9:
>>> +config BRCMSTB_THERMAL
>>>
>>> I didn't see this for other Kconfig changes.
>> It's because your help message is only 2 lines long (instead of 3).
>>
>> Some (many?) maintainers aren't pedantic about that, a common sense
>> should be applied ;)
>
> thanks for explaining.
> Patch 1 and 2 queued for next merge window.

Humm, I don't see this driver in your latest 4.14 pull request to Linus, so what happened here exactly? Can we expect this driver to be submitted for 4.14 or we just happened to have missed this window now?
--
Florian

2017-09-26 04:14:04

[permalink] [raw]

Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver

On 09/25/2017 08:02 PM, Zhang, Rui wrote:
> Hi, Florian,
>
> This patch set was dropped in the last minute because of this discussion
> https://patchwork.kernel.org/patch/9936325/
> as I don’t want to rebase the patch before sending the pull request.

Ah, you wanted to squash that patch into the initial submission?

>
> I don’t think we can make it for 4.14.
> Eduardo will be back and pick the soc patches for 4.15.

I assume you would want to get that particular patch squashed into a
clean submission targeting 4.15 now, right?

Thanks

>
> Thanks,
> rui
>
>
>
> -----Original Message-----
> From: Florian Fainelli [mailto:[email protected]]
> Sent: Monday, September 25, 2017 5:11 AM
> To: Zhang, Rui <[email protected]>; Rafał Miłecki <[email protected]>
> Cc: Markus Mayer <[email protected]>; Eduardo Valentin <[email protected]>; Rob Herring <[email protected]>; Mark Rutland <[email protected]>; Doug Berger <[email protected]>; Brian Norris <[email protected]>; Gregory Fong <[email protected]>; Russell King <[email protected]>; Catalin Marinas <[email protected]>; Will Deacon <[email protected]>; Arnd Bergmann <[email protected]>; Olof Johansson <[email protected]>; Broadcom Kernel List <[email protected]>; Power Management List <[email protected]>; Device Tree List <[email protected]>; ARM Kernel List <[email protected]>; Linux Kernel Mailing List <[email protected]>; Markus Mayer <[email protected]>
> Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver
> Importance: High
>
> Le 08/14/17 à 23:48, Zhang Rui a écrit :
>> On Tue, 2017-08-15 at 08:42 +0200, Rafał Miłecki wrote:
>>> On 2017-08-15 08:08, Zhang Rui wrote:
>>>>
>>>>>
>>>>> diff --git a/drivers/thermal/broadcom/Kconfig
>>>>> b/drivers/thermal/broadcom/Kconfig
>>>>> index 42c098e..c106a15 100644
>>>>> --- a/drivers/thermal/broadcom/Kconfig
>>>>> +++ b/drivers/thermal/broadcom/Kconfig
>>>>> @@ -6,6 +6,13 @@ config BCM2835_THERMAL
>>>>> help
>>>>>   Support for thermal sensors on Broadcom bcm2835 SoCs.
>>>>>
>>>>> +config BRCMSTB_THERMAL
>>>>> + tristate "Broadcom STB AVS TMON thermal driver"
>>>>> + depends on ARCH_BRCMSTB || COMPILE_TEST
>>>>> + help
>>>>> +   Enable this driver if you have a Broadcom STB SoC and
>>>>> would like
>>>>> +   thermal framework support.
>>>>> +
>>>> I don't understand why I got the following checkpatch warning
>>>>
>>>> WARNING: please write a paragraph that describes the config symbol
>>>> fully
>>>> #73: FILE: drivers/thermal/broadcom/Kconfig:9:
>>>> +config BRCMSTB_THERMAL
>>>>
>>>> I didn't see this for other Kconfig changes.
>>> It's because your help message is only 2 lines long (instead of 3).
>>>
>>> Some (many?) maintainers aren't pedantic about that, a common sense
>>> should be applied ;)
>>
>> thanks for explaining.
>> Patch 1 and 2 queued for next merge window.
>
> Humm, I don't see this driver in your latest 4.14 pull request to Linus, so what happened here exactly? Can we expect this driver to be submitted for 4.14 or we just happened to have missed this window now?
> --
> Florian
>

--
Florian

2017-09-26 06:18:10

[permalink] [raw]

Subject: RE: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver

Hi, Florian,

> -----Original Message-----
> From: Florian Fainelli [mailto:[email protected]]
> Sent: Tuesday, September 26, 2017 12:14 PM
> To: Zhang, Rui <[email protected]>; Rafal Milecki <[email protected]>
> Cc: Markus Mayer <[email protected]>; Eduardo Valentin
> <[email protected]>; Rob Herring <[email protected]>; Mark Rutland
> <[email protected]>; Doug Berger <[email protected]>; Brian
> Norris <[email protected]>; Gregory Fong
> <[email protected]>; Russell King <[email protected]>; Catalin
> Marinas <[email protected]>; Will Deacon <[email protected]>;
> Arnd Bergmann <[email protected]>; Olof Johansson <[email protected]>;
> Broadcom Kernel List <[email protected]>; Power
> Management List <[email protected]>; Device Tree List
> <[email protected]>; ARM Kernel List <linux-arm-
> [email protected]>; Linux Kernel Mailing List <linux-
> [email protected]>; Markus Mayer <[email protected]>
> Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver
> Importance: High
>
> On 09/25/2017 08:02 PM, Zhang, Rui wrote:
> > Hi, Florian,
> >
> > This patch set was dropped in the last minute because of this
> > discussion https://patchwork.kernel.org/patch/9936325/
> > as I don’t want to rebase the patch before sending the pull request.
>
> Ah, you wanted to squash that patch into the initial submission?
>
> >
> > I don’t think we can make it for 4.14.
> > Eduardo will be back and pick the soc patches for 4.15.
>
> I assume you would want to get that particular patch squashed into a clean
> submission targeting 4.15 now, right?
>
Yes. As the patch in this thread has not been in upstream yet, I'd prefer the
fix/cleanup meld into the original patch before sending upstream.

Thanks,
Rui

> Thanks
>
> >
> > Thanks,
> > rui
> >
> >
> >
> > -----Original Message-----
> > From: Florian Fainelli [mailto:[email protected]]
> > Sent: Monday, September 25, 2017 5:11 AM
> > To: Zhang, Rui <[email protected]>; Rafał Miłecki <[email protected]>
> > Cc: Markus Mayer <[email protected]>; Eduardo Valentin
> > <[email protected]>; Rob Herring <[email protected]>; Mark
> Rutland
> > <[email protected]>; Doug Berger <[email protected]>; Brian
> Norris
> > <[email protected]>; Gregory Fong
> <[email protected]>;
> > Russell King <[email protected]>; Catalin Marinas
> > <[email protected]>; Will Deacon <[email protected]>; Arnd
> > Bergmann <[email protected]>; Olof Johansson <[email protected]>;
> Broadcom
> > Kernel List <[email protected]>; Power
> Management
> > List <[email protected]>; Device Tree List
> > <[email protected]>; ARM Kernel List
> > <[email protected]>; Linux Kernel Mailing List
> > <[email protected]>; Markus Mayer <[email protected]>
> > Subject: Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver
> > Importance: High
> >
> > Le 08/14/17 à 23:48, Zhang Rui a écrit :
> >> On Tue, 2017-08-15 at 08:42 +0200, Rafał Miłecki wrote:
> >>> On 2017-08-15 08:08, Zhang Rui wrote:
> >>>>
> >>>>>
> >>>>> diff --git a/drivers/thermal/broadcom/Kconfig
> >>>>> b/drivers/thermal/broadcom/Kconfig
> >>>>> index 42c098e..c106a15 100644
> >>>>> --- a/drivers/thermal/broadcom/Kconfig
> >>>>> +++ b/drivers/thermal/broadcom/Kconfig
> >>>>> @@ -6,6 +6,13 @@ config BCM2835_THERMAL
> >>>>> help
> >>>>>   Support for thermal sensors on Broadcom bcm2835 SoCs.
> >>>>>
> >>>>> +config BRCMSTB_THERMAL
> >>>>> + tristate "Broadcom STB AVS TMON thermal driver"
> >>>>> + depends on ARCH_BRCMSTB || COMPILE_TEST
> >>>>> + help
> >>>>> +   Enable this driver if you have a Broadcom STB SoC and
> >>>>> would like
> >>>>> +   thermal framework support.
> >>>>> +
> >>>> I don't understand why I got the following checkpatch warning
> >>>>
> >>>> WARNING: please write a paragraph that describes the config symbol
> >>>> fully
> >>>> #73: FILE: drivers/thermal/broadcom/Kconfig:9:
> >>>> +config BRCMSTB_THERMAL
> >>>>
> >>>> I didn't see this for other Kconfig changes.
> >>> It's because your help message is only 2 lines long (instead of 3).
> >>>
> >>> Some (many?) maintainers aren't pedantic about that, a common sense
> >>> should be applied ;)
> >>
> >> thanks for explaining.
> >> Patch 1 and 2 queued for next merge window.
> >
> > Humm, I don't see this driver in your latest 4.14 pull request to Linus, so
> what happened here exactly? Can we expect this driver to be submitted for
> 4.14 or we just happened to have missed this window now?
> > --
> > Florian
> >
>
> --
> Florian

2017-09-26 21:37:02