12 files changed, 145 insertions, 67 deletions

diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
index 25d244cbbe8f..031018e7a65b 100644
--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
@@ -262,13 +262,12 @@ static int int3400_thermal_probe(struct platform_device *pdev)
         result = acpi_parse_art(priv->adev->handle, &priv->art_count,
                                 &priv->arts, true);
         if (result)
-                goto free_priv;
-
+                dev_dbg(&pdev->dev, "_ART table parsing error\n");
 
         result = acpi_parse_trt(priv->adev->handle, &priv->trt_count,
                                 &priv->trts, true);
         if (result)
-                goto free_art;
+                dev_dbg(&pdev->dev, "_TRT table parsing error\n");
 
         platform_set_drvdata(pdev, priv);
 
@@ -281,7 +280,7 @@ static int int3400_thermal_probe(struct platform_device *pdev)
                                                 &int3400_thermal_params, 0, 0);
         if (IS_ERR(priv->thermal)) {
                 result = PTR_ERR(priv->thermal);
-                goto free_trt;
+                goto free_art_trt;
         }
 
         priv->rel_misc_dev_res = acpi_thermal_rel_misc_device_add(
@@ -295,9 +294,8 @@ static int int3400_thermal_probe(struct platform_device *pdev)
 
 free_zone:
         thermal_zone_device_unregister(priv->thermal);
-free_trt:
+free_art_trt:
         kfree(priv->trts);
-free_art:
         kfree(priv->arts);
 free_priv:
         kfree(priv);
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
index 6ceebd659dd4..12623bc02f46 100644
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@ -688,6 +688,7 @@ static const struct x86_cpu_id intel_powerclamp_ids[] = {
         { X86_VENDOR_INTEL, 6, 0x45},
         { X86_VENDOR_INTEL, 6, 0x46},
         { X86_VENDOR_INTEL, 6, 0x4c},
+        { X86_VENDOR_INTEL, 6, 0x4d},
         { X86_VENDOR_INTEL, 6, 0x56},
         {}
 };
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 2580a4872f90..fe4e767018c4 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -387,21 +387,9 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 
         irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (irq) {
-                int ret;
-
                 /*
                  * platform has IRQ support.
                  * Then, driver uses common registers
-                 */
-
-                ret = devm_request_irq(dev, irq->start, rcar_thermal_irq, 0,
-                                       dev_name(dev), common);
-                if (ret) {
-                        dev_err(dev, "irq request failed\n ");
-                        return ret;
-                }
-
-                /*
                  * rcar_has_irq_support() will be enabled
                  */
                 res = platform_get_resource(pdev, IORESOURCE_MEM, mres++);
@@ -456,8 +444,16 @@ static int rcar_thermal_probe(struct platform_device *pdev)
         }
 
         /* enable temperature comparation */
-        if (irq)
+        if (irq) {
+                ret = devm_request_irq(dev, irq->start, rcar_thermal_irq, 0,
+                                       dev_name(dev), common);
+                if (ret) {
+                        dev_err(dev, "irq request failed\n ");
+                        goto error_unregister;
+                }
+
                 rcar_thermal_common_write(common, ENR, enr_bits);
+        }
 
         platform_set_drvdata(pdev, common);
 
@@ -467,9 +463,9 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 
 error_unregister:
         rcar_thermal_for_each_priv(priv, common) {
-                thermal_zone_device_unregister(priv->zone);
                 if (rcar_has_irq_support(priv))
                         rcar_thermal_irq_disable(priv);
+                thermal_zone_device_unregister(priv->zone);
         }
 
         pm_runtime_put(dev);
@@ -485,9 +481,9 @@ static int rcar_thermal_remove(struct platform_device *pdev)
         struct rcar_thermal_priv *priv;
 
         rcar_thermal_for_each_priv(priv, common) {
-                thermal_zone_device_unregister(priv->zone);
                 if (rcar_has_irq_support(priv))
                         rcar_thermal_irq_disable(priv);
+                thermal_zone_device_unregister(priv->zone);
         }
 
         pm_runtime_put(dev);
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 933cd80a6bc5..1fc54ab911d2 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -918,34 +918,16 @@ static irqreturn_t exynos_tmu_irq(int irq, void *id)
 }
 
 static const struct of_device_id exynos_tmu_match[] = {
-        {
-                .compatible = "samsung,exynos3250-tmu",
-        },
-        {
-                .compatible = "samsung,exynos4210-tmu",
-        },
-        {
-                .compatible = "samsung,exynos4412-tmu",
-        },
-        {
-                .compatible = "samsung,exynos5250-tmu",
-        },
-        {
-                .compatible = "samsung,exynos5260-tmu",
-        },
-        {
-                .compatible = "samsung,exynos5420-tmu",
-        },
-        {
-                .compatible = "samsung,exynos5420-tmu-ext-triminfo",
-        },
-        {
-                .compatible = "samsung,exynos5440-tmu",
-        },
-        {
-                .compatible = "samsung,exynos7-tmu",
-        },
-        {},
+        { .compatible = "samsung,exynos3250-tmu", },
+        { .compatible = "samsung,exynos4210-tmu", },
+        { .compatible = "samsung,exynos4412-tmu", },
+        { .compatible = "samsung,exynos5250-tmu", },
+        { .compatible = "samsung,exynos5260-tmu", },
+        { .compatible = "samsung,exynos5420-tmu", },
+        { .compatible = "samsung,exynos5420-tmu-ext-triminfo", },
+        { .compatible = "samsung,exynos5440-tmu", },
+        { .compatible = "samsung,exynos7-tmu", },
+        { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, exynos_tmu_match);
 
diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index 634b6ce0e63a..62a5d449c388 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -1402,7 +1402,7 @@ int ti_bandgap_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int ti_bandgap_save_ctxt(struct ti_bandgap *bgp)
 {
         int i;
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index 3fb054a10f6a..a38c1756442a 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@ -429,7 +429,7 @@ int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id)
 
         data = ti_bandgap_get_sensor_data(bgp, id);
 
-        if (data && data->cool_dev)
+        if (data)
                 cpufreq_cooling_unregister(data->cool_dev);
 
         return 0;
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index fc52e307efab..5eac316490ea 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -314,6 +314,8 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
 }
 
 #endif
+
+#if IS_ENABLED(CONFIG_THERMAL)
 struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
                 void *, struct thermal_zone_device_ops *,
                 const struct thermal_zone_params *, int, int);
@@ -340,8 +342,58 @@ struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
                 struct thermal_cooling_device *, int);
 void thermal_cdev_update(struct thermal_cooling_device *);
 void thermal_notify_framework(struct thermal_zone_device *, int);
-
-#ifdef CONFIG_NET
+#else
+static inline struct thermal_zone_device *thermal_zone_device_register(
+        const char *type, int trips, int mask, void *devdata,
+        struct thermal_zone_device_ops *ops,
+        const struct thermal_zone_params *tzp,
+        int passive_delay, int polling_delay)
+{ return ERR_PTR(-ENODEV); }
+static inline void thermal_zone_device_unregister(
+        struct thermal_zone_device *tz)
+{ }
+static inline int thermal_zone_bind_cooling_device(
+        struct thermal_zone_device *tz, int trip,
+        struct thermal_cooling_device *cdev,
+        unsigned long upper, unsigned long lower)
+{ return -ENODEV; }
+static inline int thermal_zone_unbind_cooling_device(
+        struct thermal_zone_device *tz, int trip,
+        struct thermal_cooling_device *cdev)
+{ return -ENODEV; }
+static inline void thermal_zone_device_update(struct thermal_zone_device *tz)
+{ }
+static inline struct thermal_cooling_device *
+thermal_cooling_device_register(char *type, void *devdata,
+        const struct thermal_cooling_device_ops *ops)
+{ return ERR_PTR(-ENODEV); }
+static inline struct thermal_cooling_device *
+thermal_of_cooling_device_register(struct device_node *np,
+        char *type, void *devdata, const struct thermal_cooling_device_ops *ops)
+{ return ERR_PTR(-ENODEV); }
+static inline void thermal_cooling_device_unregister(
+        struct thermal_cooling_device *cdev)
+{ }
+static inline struct thermal_zone_device *thermal_zone_get_zone_by_name(
+                const char *name)
+{ return ERR_PTR(-ENODEV); }
+static inline int thermal_zone_get_temp(
+                struct thermal_zone_device *tz, unsigned long *temp)
+{ return -ENODEV; }
+static inline int get_tz_trend(struct thermal_zone_device *tz, int trip)
+{ return -ENODEV; }
+static inline struct thermal_instance *
+get_thermal_instance(struct thermal_zone_device *tz,
+        struct thermal_cooling_device *cdev, int trip)
+{ return ERR_PTR(-ENODEV); }
+static inline void thermal_cdev_update(struct thermal_cooling_device *cdev)
+{ }
+static inline void thermal_notify_framework(struct thermal_zone_device *tz,
+        int trip)
+{ }
+#endif /* CONFIG_THERMAL */
+
+#if defined(CONFIG_NET) && IS_ENABLED(CONFIG_THERMAL)
 extern int thermal_generate_netlink_event(struct thermal_zone_device *tz,
                                                 enum events event);
 #else
diff --git a/tools/thermal/tmon/.gitignore b/tools/thermal/tmon/.gitignore
new file mode 100644
index 000000000000..06e96be65276
--- /dev/null
+++ b/tools/thermal/tmon/.gitignore
@@ -0,0 +1 @@
+/tmon
diff --git a/tools/thermal/tmon/Makefile b/tools/thermal/tmon/Makefile
index e775adcbd29f..0788621c8d76 100644
--- a/tools/thermal/tmon/Makefile
+++ b/tools/thermal/tmon/Makefile
@@ -2,8 +2,8 @@ VERSION = 1.0
 
 BINDIR=usr/bin
 WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
-CFLAGS= -O1 ${WARNFLAGS} -fstack-protector
-CC=gcc
+CFLAGS+= -O1 ${WARNFLAGS} -fstack-protector
+CC=$(CROSS_COMPILE)gcc
 
 CFLAGS+=-D VERSION=\"$(VERSION)\"
 LDFLAGS+=
@@ -16,12 +16,21 @@ INSTALL_CONFIGFILE=install -m 644 -p
 CONFIG_FILE=
 CONFIG_PATH=
 
+# Static builds might require -ltinfo, for instance
+ifneq ($(findstring -static, $(LDFLAGS)),)
+STATIC := --static
+endif
+
+TMON_LIBS=-lm -lpthread
+TMON_LIBS += $(shell pkg-config --libs $(STATIC) panelw ncursesw 2> /dev/null || \
+                     pkg-config --libs $(STATIC) panel ncurses 2> /dev/null || \
+                     echo -lpanel -lncurses)
 
 OBJS = tmon.o tui.o sysfs.o pid.o
 OBJS +=
 
 tmon: $(OBJS) Makefile tmon.h
-        $(CC) ${CFLAGS} $(LDFLAGS) $(OBJS)  -o $(TARGET) -lm -lpanel -lncursesw -ltinfo -lpthread
+        $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS)  -o $(TARGET) $(TMON_LIBS)
 
 valgrind: tmon
          sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET)  1> /dev/null
diff --git a/tools/thermal/tmon/tmon.8 b/tools/thermal/tmon/tmon.8
index 0be727cb9892..02d5179803aa 100644
--- a/tools/thermal/tmon/tmon.8
+++ b/tools/thermal/tmon/tmon.8
@@ -55,6 +55,8 @@ The \fB-l --log\fP option write data to /var/tmp/tmon.log
 .PP
 The \fB-t --time-interval\fP option sets the polling interval in seconds
 .PP
+The \fB-T --target-temp\fP option sets the initial target temperature
+.PP
 The \fB-v --version\fP option shows the version of \fBtmon \fP
 .PP
 The \fB-z --zone\fP option sets the target therma zone instance to be controlled
diff --git a/tools/thermal/tmon/tmon.c b/tools/thermal/tmon/tmon.c
index 09b7c3218334..9aa19652e8e8 100644
--- a/tools/thermal/tmon/tmon.c
+++ b/tools/thermal/tmon/tmon.c
@@ -64,6 +64,7 @@ void usage()
         printf("  -h, --help            show this help message\n");
         printf("  -l, --log             log data to /var/tmp/tmon.log\n");
         printf("  -t, --time-interval   sampling time interval, > 1 sec.\n");
+        printf("  -T, --target-temp     initial target temperature\n");
         printf("  -v, --version         show version\n");
         printf("  -z, --zone            target thermal zone id\n");
 
@@ -219,6 +220,7 @@ static struct option opts[] = {
         { "control", 1, NULL, 'c' },
         { "daemon", 0, NULL, 'd' },
         { "time-interval", 1, NULL, 't' },
+        { "target-temp", 1, NULL, 'T' },
         { "log", 0, NULL, 'l' },
         { "help", 0, NULL, 'h' },
         { "version", 0, NULL, 'v' },
@@ -231,7 +233,7 @@ int main(int argc, char **argv)
 {
         int err = 0;
         int id2 = 0, c;
-        double yk = 0.0; /* controller output */
+        double yk = 0.0, temp; /* controller output */
         int target_tz_index;
 
         if (geteuid() != 0) {
@@ -239,7 +241,7 @@ int main(int argc, char **argv)
                 exit(EXIT_FAILURE);
         }
 
-        while ((c = getopt_long(argc, argv, "c:dlht:vgz:", opts, &id2)) != -1) {
+        while ((c = getopt_long(argc, argv, "c:dlht:T:vgz:", opts, &id2)) != -1) {
                 switch (c) {
                 case 'c':
                         no_control = 0;
@@ -254,6 +256,14 @@ int main(int argc, char **argv)
                         if (ticktime < 1)
                                 ticktime = 1;
                         break;
+                case 'T':
+                        temp = strtod(optarg, NULL);
+                        if (temp < 0) {
+                                fprintf(stderr, "error: temperature must be positive\n");
+                                return 1;
+                        }
+                        target_temp_user = temp;
+                        break;
                 case 'l':
                         printf("Logging data to /var/tmp/tmon.log\n");
                         logging = 1;
diff --git a/tools/thermal/tmon/tui.c b/tools/thermal/tmon/tui.c
index 89f8ef0e15c8..b5d1c6b22dd3 100644
--- a/tools/thermal/tmon/tui.c
+++ b/tools/thermal/tmon/tui.c
@@ -30,6 +30,18 @@
 
 #include "tmon.h"
 
+#define min(x, y) ({                            \
+        typeof(x) _min1 = (x);                  \
+        typeof(y) _min2 = (y);                  \
+        (void) (&_min1 == &_min2);              \
+        _min1 < _min2 ? _min1 : _min2; })
+
+#define max(x, y) ({                            \
+        typeof(x) _max1 = (x);                  \
+        typeof(y) _max2 = (y);                  \
+        (void) (&_max1 == &_max2);              \
+        _max1 > _max2 ? _max1 : _max2; })
+
 static PANEL *data_panel;
 static PANEL *dialogue_panel;
 static PANEL *top;
@@ -98,6 +110,18 @@ void write_status_bar(int x, char *line)
         wrefresh(status_bar_window);
 }
 
+/* wrap at 5 */
+#define DIAG_DEV_ROWS  5
+/*
+ * list cooling devices + "set temp" entry; wraps after 5 rows, if they fit
+ */
+static int diag_dev_rows(void)
+{
+        int entries = ptdata.nr_cooling_dev + 1;
+        int rows = max(DIAG_DEV_ROWS, (entries + 1) / 2);
+        return min(rows, entries);
+}
+
 void setup_windows(void)
 {
         int y_begin = 1;
@@ -122,7 +146,7 @@ void setup_windows(void)
          * dialogue window is a pop-up, when needed it lays on top of cdev win
          */
 
-        dialogue_window = subwin(stdscr, ptdata.nr_cooling_dev+5, maxx-50,
+        dialogue_window = subwin(stdscr, diag_dev_rows() + 5, maxx-50,
                                 DIAG_Y, DIAG_X);
 
         thermal_data_window = subwin(stdscr, ptdata.nr_tz_sensor *
@@ -258,21 +282,26 @@ void show_cooling_device(void)
 }
 
 const char DIAG_TITLE[] = "[ TUNABLES ]";
-#define DIAG_DEV_ROWS  5
 void show_dialogue(void)
 {
         int j, x = 0, y = 0;
+        int rows, cols;
         WINDOW *w = dialogue_window;
 
         if (tui_disabled || !w)
                 return;
 
+        getmaxyx(w, rows, cols);
+
+        /* Silence compiler 'unused' warnings */
+        (void)cols;
+
         werase(w);
         box(w, 0, 0);
         mvwprintw(w, 0, maxx/4, DIAG_TITLE);
         /* list all the available tunables */
         for (j = 0; j <= ptdata.nr_cooling_dev; j++) {
-                y = j % DIAG_DEV_ROWS;
+                y = j % diag_dev_rows();
                 if (y == 0 && j != 0)
                         x += 20;
                 if (j == ptdata.nr_cooling_dev)
@@ -283,12 +312,10 @@ void show_dialogue(void)
                                 ptdata.cdi[j].type, ptdata.cdi[j].instance);
         }
         wattron(w, A_BOLD);
-        mvwprintw(w, DIAG_DEV_ROWS+1, 1, "Enter Choice [A-Z]?");
+        mvwprintw(w, diag_dev_rows()+1, 1, "Enter Choice [A-Z]?");
         wattroff(w, A_BOLD);
-        /* y size of dialogue win is nr cdev + 5, so print legend
-         * at the bottom line
-         */
-        mvwprintw(w, ptdata.nr_cooling_dev+3, 1,
+        /* print legend at the bottom line */
+        mvwprintw(w, rows - 2, 1,
                 "Legend: A=Active, P=Passive, C=Critical");
 
         wrefresh(dialogue_window);
@@ -437,7 +464,7 @@ static void handle_input_choice(int ch)
                         snprintf(buf, sizeof(buf), "New Value for %.10s-%2d: ",
                                 ptdata.cdi[cdev_id].type,
                                 ptdata.cdi[cdev_id].instance);
-                write_dialogue_win(buf, DIAG_DEV_ROWS+2, 2);
+                write_dialogue_win(buf, diag_dev_rows() + 2, 2);
                 handle_input_val(cdev_id);
         } else {
                 snprintf(buf, sizeof(buf), "Invalid selection %d", ch);