linux-next: build failure after merge of the thermal tree

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

Hi Zhang,

After merging the thermal tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/thermal/Kconfig:265: can't open file "drivers/thermal/int340x_thermal/Kconfig"

Caused by commit 4152c8bc018d ("Thermal: introduce INT3406 thermal
driver").  Presumable a new file was missed.

I have used teh thermal tree from next-20141208 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Aaron Lu]

Sorry for the trouble.

Hi Rui,

Please let me know if you want an update to the original patch
or an incremental one.

Thanks,
Aaron

On 12/09/2014 10:17 AM, Stephen Rothwell wrote:
> Hi Zhang,
> 
> After merging the thermal tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/thermal/Kconfig:265: can't open file "drivers/thermal/int340x_thermal/Kconfig"
> 
> Caused by commit 4152c8bc018d ("Thermal: introduce INT3406 thermal
> driver").  Presumable a new file was missed.
> 
> I have used teh thermal tree from next-20141208 for today.
> 

Re: linux-next: build failure after merge of the thermal tree

[Zhang Rui]

On Tue, 2014-12-09 at 10:31 +0800, Aaron Lu wrote:
> Sorry for the trouble.
> 
> Hi Rui,
> 
> Please let me know if you want an update to the original patch
> or an incremental one.
> 
updated one
> Thanks,
> Aaron
> 
> On 12/09/2014 10:17 AM, Stephen Rothwell wrote:
> > Hi Zhang,
> > 
> > After merging the thermal tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/thermal/Kconfig:265: can't open file "drivers/thermal/int340x_thermal/Kconfig"
> > 
> > Caused by commit 4152c8bc018d ("Thermal: introduce INT3406 thermal
> > driver").  Presumable a new file was missed.
> > 
> > I have used teh thermal tree from next-20141208 for today.
> > 
> 

[PATCH] Thermal: introduce INT3406 thermal driver

[Aaron Lu]

INT3406 ACPI device object resembles an ACPI video output device, but its
_BCM is said to be deprecated and should not be used. So we will make
use of the raw interface to do the actual cooling. Due to this, the
backlight core has some modifications. Also, to re-use some of the ACPI
video module's code, one function has been exported.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 drivers/acpi/video.c                              |  78 ++++----
 drivers/thermal/Kconfig                           |  26 +--
 drivers/thermal/int340x_thermal/Kconfig           |  41 ++++
 drivers/thermal/int340x_thermal/Makefile          |   1 +
 drivers/thermal/int340x_thermal/int3406_thermal.c | 230 ++++++++++++++++++++++
 drivers/video/backlight/backlight.c               |  44 +++--
 include/acpi/video.h                              |  20 ++
 include/linux/backlight.h                         |   2 +
 8 files changed, 367 insertions(+), 75 deletions(-)
 create mode 100644 drivers/thermal/int340x_thermal/Kconfig
 create mode 100644 drivers/thermal/int340x_thermal/int3406_thermal.c

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 9d75ead..12f5c5d 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -186,19 +186,6 @@ struct acpi_video_device_cap {
 	u8 _DDC:1;		/* Return the EDID for this device */
 };
 
-struct acpi_video_brightness_flags {
-	u8 _BCL_no_ac_battery_levels:1;	/* no AC/Battery levels in _BCL */
-	u8 _BCL_reversed:1;		/* _BCL package is in a reversed order */
-	u8 _BQC_use_index:1;		/* _BQC returns an index value */
-};
-
-struct acpi_video_device_brightness {
-	int curr;
-	int count;
-	int *levels;
-	struct acpi_video_brightness_flags flags;
-};
-
 struct acpi_video_device {
 	unsigned long device_id;
 	struct acpi_video_device_flags flags;
@@ -344,7 +331,7 @@ static const struct thermal_cooling_device_ops video_cooling_ops = {
  */
 
 static int
-acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
+acpi_video_device_lcd_query_levels(acpi_handle handle,
 				   union acpi_object **levels)
 {
 	int status;
@@ -354,7 +341,7 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
 
 	*levels = NULL;
 
-	status = acpi_evaluate_object(device->dev->handle, "_BCL", NULL, &buffer);
+	status = acpi_evaluate_object(handle, "_BCL", NULL, &buffer);
 	if (!ACPI_SUCCESS(status))
 		return status;
 	obj = (union acpi_object *)buffer.pointer;
@@ -727,29 +714,18 @@ static int acpi_video_bqc_quirk(struct acpi_video_device *device,
 	return 0;
 }
 
-
-/*
- *  Arg:
- *	device	: video output device (LCD, CRT, ..)
- *
- *  Return Value:
- *	Maximum brightness level
- *
- *  Allocate and initialize device->brightness.
- */
-
-static int
-acpi_video_init_brightness(struct acpi_video_device *device)
+int acpi_video_get_levels(struct acpi_device *device,
+			  struct acpi_video_device_brightness **dev_br)
 {
 	union acpi_object *obj = NULL;
 	int i, max_level = 0, count = 0, level_ac_battery = 0;
-	unsigned long long level, level_old;
 	union acpi_object *o;
 	struct acpi_video_device_brightness *br = NULL;
-	int result = -EINVAL;
+	int result = 0;
 	u32 value;
 
-	if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device, &obj))) {
+	if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device->handle,
+								&obj))) {
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available "
 						"LCD brightness level\n"));
 		goto out;
@@ -822,6 +798,38 @@ acpi_video_init_brightness(struct acpi_video_device *device)
 			    "Found unordered _BCL package"));
 
 	br->count = count;
+	*dev_br = br;
+
+out:
+	kfree(obj);
+	return result;
+out_free:
+	kfree(br);
+	goto out;
+}
+EXPORT_SYMBOL(acpi_video_get_levels);
+
+/*
+ *  Arg:
+ *	device	: video output device (LCD, CRT, ..)
+ *
+ *  Return Value:
+ *	Maximum brightness level
+ *
+ *  Allocate and initialize device->brightness.
+ */
+
+static int
+acpi_video_init_brightness(struct acpi_video_device *device)
+{
+	int i, max_level = 0;
+	unsigned long long level, level_old;
+	struct acpi_video_device_brightness *br = NULL;
+	int result = -EINVAL;
+
+	result = acpi_video_get_levels(device->dev, &br);
+	if (result)
+		return result;
 	device->brightness = br;
 
 	/* _BQC uses INDEX while _BCL uses VALUE in some laptops */
@@ -864,17 +872,13 @@ set_level:
 		goto out_free_levels;
 
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-			  "found %d brightness levels\n", count - 2));
-	kfree(obj);
-	return result;
+			  "found %d brightness levels\n", br->count - 2));
+	return 0;
 
 out_free_levels:
 	kfree(br->levels);
-out_free:
 	kfree(br);
-out:
 	device->brightness = NULL;
-	kfree(obj);
 	return result;
 }
 
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index f554d25..ac391d8 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -229,29 +229,9 @@ config INTEL_SOC_DTS_THERMAL
 	  notification methods.The other trip is a critical trip point, which
 	  was set by the driver based on the TJ MAX temperature.
 
-config INT340X_THERMAL
-	tristate "ACPI INT340X thermal drivers"
-	depends on X86 && ACPI
-	select THERMAL_GOV_USER_SPACE
-	select ACPI_THERMAL_REL
-	select ACPI_FAN
-	help
-	  Newer laptops and tablets that use ACPI may have thermal sensors and
-	  other devices with thermal control capabilities outside the core
-	  CPU/SOC, for thermal safety reasons.
-	  They are exposed for the OS to use via the INT3400 ACPI device object
-	  as the master, and INT3401~INT340B ACPI device objects as the slaves.
-	  Enable this to expose the temperature information and cooling ability
-	  from these objects to userspace via the normal thermal framework.
-	  This means that a wide range of applications and GUI widgets can show
-	  the information to the user or use this information for making
-	  decisions. For example, the Intel Thermal Daemon can use this
-	  information to allow the user to select his laptop to run without
-	  turning on the fans.
-
-config ACPI_THERMAL_REL
-	tristate
-	depends on ACPI
+menu "ACPI INT340X thermal drivers"
+source drivers/thermal/int340x_thermal/Kconfig
+endmenu
 
 menu "Texas Instruments thermal drivers"
 source "drivers/thermal/ti-soc-thermal/Kconfig"
diff --git a/drivers/thermal/int340x_thermal/Kconfig b/drivers/thermal/int340x_thermal/Kconfig
new file mode 100644
index 0000000..b92892a
--- /dev/null
+++ b/drivers/thermal/int340x_thermal/Kconfig
@@ -0,0 +1,41 @@
+#
+# ACPI INT340x thermal drivers configuration
+#
+
+config INT340X_THERMAL
+	tristate "ACPI INT340X thermal drivers"
+	depends on X86 && ACPI
+	select THERMAL_GOV_USER_SPACE
+	select ACPI_THERMAL_REL
+	select ACPI_FAN
+	help
+	  Newer laptops and tablets that use ACPI may have thermal sensors and
+	  other devices with thermal control capabilities outside the core
+	  CPU/SOC, for thermal safety reasons.
+	  They are exposed for the OS to use via the INT3400 ACPI device object
+	  as the master, and INT3401~INT340B ACPI device objects as the slaves.
+	  Enable this to expose the temperature information and cooling ability
+	  from these objects to userspace via the normal thermal framework.
+	  This means that a wide range of applications and GUI widgets can show
+	  the information to the user or use this information for making
+	  decisions. For example, the Intel Thermal Daemon can use this
+	  information to allow the user to select his laptop to run without
+	  turning on the fans.
+
+if INT340X_THERMAL
+
+config ACPI_THERMAL_REL
+	tristate
+	depends on ACPI
+
+config INT3406_THERMAL
+	tristate "ACPI INT3406 display thermal driver"
+	depends on ACPI_VIDEO
+	help
+	  The display thermal device represents the LED/LCD display panel
+	  that may or may not include touch support. The main function of
+	  the display thermal device is to allow control of the display
+	  brightness in order to address a thermal condition or to reduce
+	  power consumed by display device.
+
+endif
diff --git a/drivers/thermal/int340x_thermal/Makefile b/drivers/thermal/int340x_thermal/Makefile
index ffe40bf..a9d0429 100644
--- a/drivers/thermal/int340x_thermal/Makefile
+++ b/drivers/thermal/int340x_thermal/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_INT340X_THERMAL)	+= int3400_thermal.o
 obj-$(CONFIG_INT340X_THERMAL)	+= int3402_thermal.o
 obj-$(CONFIG_INT340X_THERMAL)	+= int3403_thermal.o
+obj-$(CONFIG_INT3406_THERMAL)	+= int3406_thermal.o
 obj-$(CONFIG_ACPI_THERMAL_REL)	+= acpi_thermal_rel.o
diff --git a/drivers/thermal/int340x_thermal/int3406_thermal.c b/drivers/thermal/int340x_thermal/int3406_thermal.c
new file mode 100644
index 0000000..162ddee
--- /dev/null
+++ b/drivers/thermal/int340x_thermal/int3406_thermal.c
@@ -0,0 +1,230 @@
+/*
+ * INT3406 thermal driver for display participant device
+ *
+ * Copyright (C) 2014, Intel Corporation
+ * Authors: Aaron Lu <aaron.lu@intel.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 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/acpi.h>
+#include <linux/backlight.h>
+#include <linux/thermal.h>
+#include <acpi/video.h>
+
+#define INT3406_BRIGHTNESS_LIMITS_CHANGED	0x80
+
+struct int3406_thermal_data {
+	int upper_limit;
+	int upper_limit_index;
+	int lower_limit;
+	int lower_limit_index;
+	acpi_handle handle;
+	struct acpi_video_device_brightness *br;
+	struct backlight_device *raw_bd;
+	struct thermal_cooling_device *cooling_dev;
+};
+
+static int int3406_thermal_to_raw(int level, struct int3406_thermal_data *d)
+{
+	int max_level = d->br->levels[d->br->count - 1];
+	int raw_max = d->raw_bd->props.max_brightness;
+
+	return level * raw_max / max_level;
+}
+
+static int int3406_thermal_to_acpi(int level, struct int3406_thermal_data *d)
+{
+	int raw_max = d->raw_bd->props.max_brightness;
+	int max_level = d->br->levels[d->br->count - 1];
+
+	return level * max_level / raw_max;
+}
+
+static int
+int3406_thermal_get_max_state(struct thermal_cooling_device *cooling_dev,
+			      unsigned long *state)
+{
+	struct int3406_thermal_data *d = cooling_dev->devdata;
+	int index = d->lower_limit_index ? d->lower_limit_index : 2;
+
+	*state = d->br->count - 1 - index;
+	return 0;
+}
+
+static int
+int3406_thermal_set_cur_state(struct thermal_cooling_device *cooling_dev,
+			      unsigned long state)
+{
+	struct int3406_thermal_data *d = cooling_dev->devdata;
+	int level, raw_level;
+
+	if (state > d->br->count - 3)
+		return -EINVAL;
+
+	state = d->br->count - 1 - state;
+	level = d->br->levels[state];
+
+	if ((d->upper_limit && level > d->upper_limit) ||
+	    (d->lower_limit && level < d->lower_limit))
+		return -EINVAL;
+
+	raw_level = int3406_thermal_to_raw(level, d);
+	return backlight_device_set_brightness(d->raw_bd, raw_level);
+}
+
+static int
+int3406_thermal_get_cur_state(struct thermal_cooling_device *cooling_dev,
+			      unsigned long *state)
+{
+	struct int3406_thermal_data *d = cooling_dev->devdata;
+	int raw_level, level, i;
+
+	raw_level = d->raw_bd->props.brightness;
+	level = int3406_thermal_to_acpi(raw_level, d);
+
+	/*
+	 * There is no 1:1 mapping between the firmware interface level with the
+	 * raw interface level, we will have to find one that is close enough.
+	 */
+	for (i = 2; i < d->br->count - 1; i++) {
+		if (level >= d->br->levels[i] && level <= d->br->levels[i + 1])
+			break;
+	}
+
+	*state = i;
+	return 0;
+}
+
+static const struct thermal_cooling_device_ops video_cooling_ops = {
+	.get_max_state = int3406_thermal_get_max_state,
+	.get_cur_state = int3406_thermal_get_cur_state,
+	.set_cur_state = int3406_thermal_set_cur_state,
+};
+
+static int int3406_thermal_get_index(int *array, int nr, int value)
+{
+	int i;
+
+	for (i = 0; i < nr; i++) {
+		if (array[i] == value)
+			break;
+	}
+	return i == nr ? -ENOENT : i;
+}
+
+static void int3406_thermal_get_limit(struct int3406_thermal_data *d)
+{
+	acpi_status status;
+	unsigned long long lower_limit, upper_limit;
+	int index;
+
+	status = acpi_evaluate_integer(d->handle, "DDDL", NULL, &lower_limit);
+	if (ACPI_SUCCESS(status)) {
+		index = int3406_thermal_get_index(d->br->levels, d->br->count,
+						  lower_limit);
+		if (index > 0) {
+			d->lower_limit = (int)lower_limit;
+			d->lower_limit_index = index;
+		}
+	}
+
+	status = acpi_evaluate_integer(d->handle, "DDPC", NULL, &upper_limit);
+	if (ACPI_SUCCESS(status)) {
+		index = int3406_thermal_get_index(d->br->levels, d->br->count,
+						  upper_limit);
+		if (index > 0) {
+			d->upper_limit = (int)upper_limit;
+			d->upper_limit_index = index;
+		}
+	}
+}
+
+static void int3406_notify(acpi_handle handle, u32 event, void *data)
+{
+	if (event == INT3406_BRIGHTNESS_LIMITS_CHANGED)
+		int3406_thermal_get_limit(data);
+}
+
+static int int3406_thermal_probe(struct platform_device *pdev)
+{
+	struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
+	struct int3406_thermal_data *d;
+	struct backlight_device *bd;
+	int ret;
+
+	if (!ACPI_HANDLE(&pdev->dev))
+		return -ENODEV;
+
+	d = devm_kzalloc(&pdev->dev, sizeof(*d), GFP_KERNEL);
+	if (!d)
+		return -ENOMEM;
+	d->handle = ACPI_HANDLE(&pdev->dev);
+
+	bd = backlight_device_get_by_type(BACKLIGHT_RAW);
+	if (!bd)
+		return -ENODEV;
+	d->raw_bd = bd;
+
+	ret = acpi_video_get_levels(ACPI_COMPANION(&pdev->dev), &d->br);
+	if (ret)
+		return ret;
+
+	int3406_thermal_get_limit(d);
+
+	d->cooling_dev = thermal_cooling_device_register(acpi_device_bid(adev),
+							 d, &video_cooling_ops);
+	if (IS_ERR(d->cooling_dev))
+		goto err;
+
+	ret = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY,
+					  int3406_notify, d);
+	if (ret)
+		goto err_cdev;
+
+	platform_set_drvdata(pdev, d);
+
+	return 0;
+
+err_cdev:
+	thermal_cooling_device_unregister(d->cooling_dev);
+err:
+	kfree(d->br);
+	return -ENODEV;
+}
+
+static int int3406_thermal_remove(struct platform_device *pdev)
+{
+	struct int3406_thermal_data *d = platform_get_drvdata(pdev);
+
+	thermal_cooling_device_unregister(platform_get_drvdata(pdev));
+	kfree(d->br);
+	return 0;
+}
+
+static const struct acpi_device_id int3406_thermal_match[] = {
+	{"INT3406", 0},
+	{}
+};
+
+MODULE_DEVICE_TABLE(acpi, int3406_thermal_match);
+
+static struct platform_driver int3406_thermal_driver = {
+	.probe = int3406_thermal_probe,
+	.remove = int3406_thermal_remove,
+	.driver = {
+		   .name = "int3406 thermal",
+		   .owner = THIS_MODULE,
+		   .acpi_match_table = int3406_thermal_match,
+		   },
+};
+
+module_platform_driver(int3406_thermal_driver);
+
+MODULE_DESCRIPTION("INT3406 Thermal driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index bddc8b1..bea7493 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -164,28 +164,19 @@ static ssize_t brightness_show(struct device *dev,
 	return sprintf(buf, "%d\n", bd->props.brightness);
 }
 
-static ssize_t brightness_store(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
+int backlight_device_set_brightness(struct backlight_device *bd, int brightness)
 {
-	int rc;
-	struct backlight_device *bd = to_backlight_device(dev);
-	unsigned long brightness;
-
-	rc = kstrtoul(buf, 0, &brightness);
-	if (rc)
-		return rc;
-
-	rc = -ENXIO;
+	int rc = -ENXIO;
 
 	mutex_lock(&bd->ops_lock);
 	if (bd->ops) {
 		if (brightness > bd->props.max_brightness)
 			rc = -EINVAL;
 		else {
-			pr_debug("set brightness to %lu\n", brightness);
+			pr_debug("set brightness to %u\n", brightness);
 			bd->props.brightness = brightness;
 			backlight_update_status(bd);
-			rc = count;
+			rc = 0;
 		}
 	}
 	mutex_unlock(&bd->ops_lock);
@@ -194,6 +185,23 @@ static ssize_t brightness_store(struct device *dev,
 
 	return rc;
 }
+EXPORT_SYMBOL(backlight_device_set_brightness);
+
+static ssize_t brightness_store(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t count)
+{
+	int rc;
+	struct backlight_device *bd = to_backlight_device(dev);
+	unsigned long brightness;
+
+	rc = kstrtoul(buf, 0, &brightness);
+	if (rc)
+		return rc;
+
+	rc = backlight_device_set_brightness(bd, brightness);
+
+	return rc ? rc : count;
+}
 static DEVICE_ATTR_RW(brightness);
 
 static ssize_t type_show(struct device *dev, struct device_attribute *attr,
@@ -380,7 +388,7 @@ struct backlight_device *backlight_device_register(const char *name,
 }
 EXPORT_SYMBOL(backlight_device_register);
 
-bool backlight_device_registered(enum backlight_type type)
+struct backlight_device *backlight_device_get_by_type(enum backlight_type type)
 {
 	bool found = false;
 	struct backlight_device *bd;
@@ -394,7 +402,13 @@ bool backlight_device_registered(enum backlight_type type)
 	}
 	mutex_unlock(&backlight_dev_list_mutex);
 
-	return found;
+	return found ? bd : NULL;
+}
+EXPORT_SYMBOL(backlight_device_get_by_type);
+
+bool backlight_device_registered(enum backlight_type type)
+{
+	return backlight_device_get_by_type(type) ? true : false;
 }
 EXPORT_SYMBOL(backlight_device_registered);
 
diff --git a/include/acpi/video.h b/include/acpi/video.h
index 843ef1a..956300d 100644
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -3,6 +3,19 @@
 
 #include <linux/errno.h> /* for ENODEV */
 
+struct acpi_video_brightness_flags {
+	u8 _BCL_no_ac_battery_levels:1;	/* no AC/Battery levels in _BCL */
+	u8 _BCL_reversed:1;		/* _BCL package is in a reversed order */
+	u8 _BQC_use_index:1;		/* _BQC returns an index value */
+};
+
+struct acpi_video_device_brightness {
+	int curr;
+	int count;
+	int *levels;
+	struct acpi_video_brightness_flags flags;
+};
+
 struct acpi_device;
 
 #define ACPI_VIDEO_CLASS	"video"
@@ -22,6 +35,8 @@ extern void acpi_video_unregister(void);
 extern void acpi_video_unregister_backlight(void);
 extern int acpi_video_get_edid(struct acpi_device *device, int type,
 			       int device_id, void **edid);
+extern int acpi_video_get_levels(struct acpi_device *device,
+				struct acpi_video_device_brightness **dev_br);
 extern bool acpi_video_verify_backlight_support(void);
 #else
 static inline int acpi_video_register(void) { return 0; }
@@ -32,6 +47,11 @@ static inline int acpi_video_get_edid(struct acpi_device *device, int type,
 {
 	return -ENODEV;
 }
+static int acpi_video_get_levels(struct acpi_device *device,
+			struct acpi_video_device_brightness **dev_br)
+{
+	return -ENODEV;
+}
 static inline bool acpi_video_verify_backlight_support(void) { return false; }
 #endif
 
diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index adb14a8..c59a020 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -140,6 +140,8 @@ extern void backlight_force_update(struct backlight_device *bd,
 extern bool backlight_device_registered(enum backlight_type type);
 extern int backlight_register_notifier(struct notifier_block *nb);
 extern int backlight_unregister_notifier(struct notifier_block *nb);
+extern struct backlight_device *backlight_device_get_by_type(enum backlight_type type);
+extern int backlight_device_set_brightness(struct backlight_device *bd, int brightness);
 
 #define to_backlight_device(obj) container_of(obj, struct backlight_device, dev)
 
-- 
1.9.3

Re: linux-next: build failure after merge of the thermal tree

[Fabio Estevam]

Hi Stephen,

On 20/12/2023 22:17, Stephen Rothwell wrote:

>> > diff --git a/kernel/reboot.c b/kernel/reboot.c
>> > index 07eb6537ed8b..f814568525f1 100644
>> > --- a/kernel/reboot.c
>> > +++ b/kernel/reboot.c
>> > @@ -1002,6 +1002,7 @@ void __hw_protection_shutdown(const char *reason, > int ms_until_forced, bool shut
>> >          if (shutdown)
>> >                  orderly_poweroff(true);
>> >   }
>> > +EXPORT_SYMBOL_GPL(__hw_protection_shutdown);
>> 
>> Yeah, I've done it
> 
> Forgot to push out?

The 'bleeding-edge' branch contains the fix now:

https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=bleeding-edge&id=f21b0d185f75e15561047312dd4b8306eac8ad71

Re: linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]

Hi Daniel,

On Tue, 19 Dec 2023 18:59:14 +0100 Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>
> On 19/12/2023 03:10, Fabio Estevam wrote:
> > 
> > On 18/12/2023 20:34, Stephen Rothwell wrote:  
> >> Hi all,
> >>
> >> After merging the thermal tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> ERROR: modpost: "__hw_protection_shutdown"
> >> [drivers/platform/chrome/cros_ec_lpcs.ko] undefined!
> >>
> >> Caused by commit
> >>
> >>   726edaad90f6 ("thermal/core: Prepare for introduction of thermal >> reboot")  
> > 
> > Thanks for reporting.
> > 
> > Daniel,
> > 
> > Could you please squash the following fix to the commit above?
> > 
> > diff --git a/kernel/reboot.c b/kernel/reboot.c
> > index 07eb6537ed8b..f814568525f1 100644
> > --- a/kernel/reboot.c
> > +++ b/kernel/reboot.c
> > @@ -1002,6 +1002,7 @@ void __hw_protection_shutdown(const char *reason, > int ms_until_forced, bool shut
> >          if (shutdown)
> >                  orderly_poweroff(true);
> >   }
> > +EXPORT_SYMBOL_GPL(__hw_protection_shutdown);  
> 
> Yeah, I've done it

Forgot to push out?
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Daniel Lezcano]

On 19/12/2023 03:10, Fabio Estevam wrote:
> Hi Stephen,
> 
> On 18/12/2023 20:34, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the thermal tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> ERROR: modpost: "__hw_protection_shutdown"
>> [drivers/platform/chrome/cros_ec_lpcs.ko] undefined!
>>
>> Caused by commit
>>
>>   726edaad90f6 ("thermal/core: Prepare for introduction of thermal 
>> reboot")
> 
> Thanks for reporting.
> 
> Daniel,
> 
> Could you please squash the following fix to the commit above?
> 
> diff --git a/kernel/reboot.c b/kernel/reboot.c
> index 07eb6537ed8b..f814568525f1 100644
> --- a/kernel/reboot.c
> +++ b/kernel/reboot.c
> @@ -1002,6 +1002,7 @@ void __hw_protection_shutdown(const char *reason, 
> int ms_until_forced, bool shut
>          if (shutdown)
>                  orderly_poweroff(true);
>   }
> +EXPORT_SYMBOL_GPL(__hw_protection_shutdown);

Yeah, I've done it


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

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

Re: linux-next: build failure after merge of the thermal tree

[Fabio Estevam]

Hi Stephen,

On 18/12/2023 20:34, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: modpost: "__hw_protection_shutdown"
> [drivers/platform/chrome/cros_ec_lpcs.ko] undefined!
> 
> Caused by commit
> 
>   726edaad90f6 ("thermal/core: Prepare for introduction of thermal 
> reboot")

Thanks for reporting.

Daniel,

Could you please squash the following fix to the commit above?

diff --git a/kernel/reboot.c b/kernel/reboot.c
index 07eb6537ed8b..f814568525f1 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -1002,6 +1002,7 @@ void __hw_protection_shutdown(const char *reason, 
int ms_until_forced, bool shut
         if (shutdown)
                 orderly_poweroff(true);
  }
+EXPORT_SYMBOL_GPL(__hw_protection_shutdown);

  static int __init reboot_setup(char *str)
  {

x86_64 allmodconfig builds successfully with this change.


Thanks,

Fabio Estevam

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

Hi all,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: modpost: "__hw_protection_shutdown" [drivers/platform/chrome/cros_ec_lpcs.ko] undefined!

Caused by commit

  726edaad90f6 ("thermal/core: Prepare for introduction of thermal reboot")

I have used the thermal tree from next-20231218 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]

Hi all,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: modpost: "thermal_acpi_trip_crit" [drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.ko] undefined!
ERROR: modpost: "thermal_acpi_trip_psv" [drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.ko] undefined!
ERROR: modpost: "thermal_acpi_trip_act" [drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.ko] undefined!
ERROR: modpost: "thermal_acpi_trip_gtsh" [drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.ko] undefined!

Caused by commit

  0d568e144ead ("thermal/drivers/intel: Use generic trip points int340x")

and me choosing commit

  7a0e39748861 ("thermal: ACPI: Add ACPI trip point routines")

from the pm tree over commit

  4bb6439371e9 ("thermal/acpi: Add ACPI trip point routines")

from the thermal tree in the merge fix up.

I have just reverted commit 0d568e144ead for today until this can be
sorted out.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

Hi all,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:


Caused by commit

  0a3e14bd1947 ("thermal/drivers/qcom: Remove duplicate set next trip point interrupt code")

I have used the thermal tree from next-20230113 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Daniel Lezcano]

On 05/01/2023 00:46, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> make[4]: *** No rule to make target 'drivers/thermal/thermal_acpi.o', needed by 'drivers/thermal/built-in.a'.  Stop.
> 
> Caused by commit
> 
>    cc54ca385577 ("thermal/acpi: Add ACPI trip point routines")
> 
> Forgot to "git add" a new file?

Yes, correct.

> I have used the thermal tree from next-20221226 for today.

I dropped the patches and updated the branch.

Thanks

-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

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

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

Hi all,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

make[4]: *** No rule to make target 'drivers/thermal/thermal_acpi.o', needed by 'drivers/thermal/built-in.a'.  Stop.

Caused by commit

  cc54ca385577 ("thermal/acpi: Add ACPI trip point routines")

Forgot to "git add" a new file?

I have used the thermal tree from next-20221226 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Daniel Lezcano]

On 03/08/2022 15:05, broonie@kernel.org wrote:
> Hi all,
> 
> After merging the thermal tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> /tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c: In function 'sun4i_gpadc_probe':
> /tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c:640:44: error: passing argument 1 of 'thermal_of_zone_register' from incompatible pointer type [-Werror=incompatible-pointer-types]
>    640 |   info->tzd = thermal_of_zone_register(info->sensor_device,
>        |                                        ~~~~^~~~~~~~~~~~~~~
>        |                                            |
>        |                                            struct device *
> In file included from /tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c:31:
> /tmp/next/build/include/linux/thermal.h:301:29: note: expected 'struct device_node *' but argument is of type 'struct device *'
>    301 | struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor, int id, void *data,
>        |                             ^~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c: In function 'sun4i_gpadc_remove':
> /tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c:684:2: error: implicit declaration of function 'thermal_zone_of_sensor_unregister'; did you mean 'thermal_zone_device_unregister'? [-Werror=implicit-function-declaration]
>    684 |  thermal_zone_of_sensor_unregister(info->sensor_device, info->tzd);
>        |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>        |  thermal_zone_device_unregister
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>     990ee4496499ef61c06bbf ("iio/drivers/sun4i_gpadc: Switch to new of thermal API")

Fixed and linux-next branch updated



-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

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

linux-next: build failure after merge of the thermal tree

[broonie]

Hi all,

After merging the thermal tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

/tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c: In function 'sun4i_gpadc_probe':
/tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c:640:44: error: passing argument 1 of 'thermal_of_zone_register' from incompatible pointer type [-Werror=incompatible-pointer-types]
  640 |   info->tzd = thermal_of_zone_register(info->sensor_device,
      |                                        ~~~~^~~~~~~~~~~~~~~
      |                                            |
      |                                            struct device *
In file included from /tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c:31:
/tmp/next/build/include/linux/thermal.h:301:29: note: expected 'struct device_node *' but argument is of type 'struct device *'
  301 | struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor, int id, void *data,
      |                             ^~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c: In function 'sun4i_gpadc_remove':
/tmp/next/build/drivers/iio/adc/sun4i-gpadc-iio.c:684:2: error: implicit declaration of function 'thermal_zone_of_sensor_unregister'; did you mean 'thermal_zone_device_unregister'? [-Werror=implicit-function-declaration]
  684 |  thermal_zone_of_sensor_unregister(info->sensor_device, info->tzd);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |  thermal_zone_device_unregister
cc1: all warnings being treated as errors

Caused by commit

   990ee4496499ef61c06bbf ("iio/drivers/sun4i_gpadc: Switch to new of thermal API")

I have used the version of the tree from 20220728 instead.

Re: linux-next: build failure after merge of the thermal tree

[Daniel Lezcano]

On 02/08/2022 17:04, Mark Brown wrote:
> On Mon, Aug 01, 2022 at 11:35:09PM +0100, broonie@kernel.org wrote:
> 
>> After merging the thermal tree, today's linux-next build (x86
>> allmodconfig) failed like this:
> 
> ...
> 
>> I'll figure out how to handle this tomorrow since I don't expect to
>> release today, I'm just droping the tree for now.
> 
> The error persists, I have used the thermal tree from 20220828 instead.

I've fixed the issue, I'll push the branch in a moment


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

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

Re: linux-next: build failure after merge of the thermal tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

On Mon, Aug 01, 2022 at 11:35:09PM +0100, broonie@kernel.org wrote:

> After merging the thermal tree, today's linux-next build (x86
> allmodconfig) failed like this:

...

> I'll figure out how to handle this tomorrow since I don't expect to
> release today, I'm just droping the tree for now.

The error persists, I have used the thermal tree from 20220828 instead.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the thermal tree

[broonie]

Hi all,

After merging the thermal tree, today's linux-next build (x86
allmodconfig) failed like this:

/tmp/next/build/drivers/thermal/samsung/exynos_tmu.c:753:44: warning: 'struct thermal_zone' declared inside parameter list will not be visible outside of this definition or declaration
  753 | static int exynos_tmu_set_emulation(struct thermal_zone *tz, int temp)
      |                                            ^~~~~~~~~~~~
/tmp/next/build/drivers/thermal/samsung/exynos_tmu.c:1002:19: error: initialization of 'int (*)(struct thermal_zone_device *, int)' from incompatible pointer type 'int (*)(struct thermal_zone *, int)' [-Werror=incompatible-pointer-types]
 1002 |  .set_emul_temp = exynos_tmu_set_emulation,
      |                   ^~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/thermal/samsung/exynos_tmu.c:1002:19: note: (near initialization for 'exynos_sensor_ops.set_emul_temp')
cc1: some warnings being treated as errors

Caused by commit

  a5e9a144258bf898 ("thermal/drivers/samsung: Switch to new of thermal API")

which looks like it missed some conversions.

I'll figure out how to handle this tomorrow since I don't expect to
release today, I'm just droping the tree for now.

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2363 bytes --]

Hi all,

After merging the thermal tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/thermal/devfreq_cooling.c: In function 'devfreq_cooling_set_cur_state':
drivers/thermal/devfreq_cooling.c:102:9: error: 'struct device' has no member named 'em_pd'
  102 |  if (dev->em_pd) {
      |         ^~
drivers/thermal/devfreq_cooling.c:104:13: error: 'struct device' has no member named 'em_pd'
  104 |   freq = dev->em_pd->table[perf_idx].frequency * 1000;
      |             ^~
drivers/thermal/devfreq_cooling.c: In function 'devfreq_cooling_get_requested_power':
drivers/thermal/devfreq_cooling.c:207:23: error: 'struct device' has no member named 'em_pd'
  207 |    dfc->res_util = dev->em_pd->table[state].power;
      |                       ^~
drivers/thermal/devfreq_cooling.c:217:30: error: 'struct device' has no member named 'em_pd'
  217 |   perf_idx = get_perf_idx(dev->em_pd, freq / 1000);
      |                              ^~
drivers/thermal/devfreq_cooling.c:226:15: error: 'struct device' has no member named 'em_pd'
  226 |   *power = dev->em_pd->table[perf_idx].power;
      |               ^~
drivers/thermal/devfreq_cooling.c: In function 'devfreq_cooling_state2power':
drivers/thermal/devfreq_cooling.c:252:14: error: 'struct device' has no member named 'em_pd'
  252 |  *power = dev->em_pd->table[perf_idx].power;
      |              ^~
drivers/thermal/devfreq_cooling.c: In function 'devfreq_cooling_power2state':
drivers/thermal/devfreq_cooling.c:290:23: error: 'struct device' has no member named 'em_pd'
  290 |   if (est_power >= dev->em_pd->table[i].power)
      |                       ^~
drivers/thermal/devfreq_cooling.c: In function 'of_devfreq_cooling_register_power':
drivers/thermal/devfreq_cooling.c:377:9: error: 'struct device' has no member named 'em_pd'
  377 |  if (dev->em_pd) {
      |         ^~
drivers/thermal/devfreq_cooling.c:385:38: error: 'struct device' has no member named 'em_pd'
  385 |   num_opps = em_pd_nr_perf_states(dev->em_pd);
      |                                      ^~

Caused by commit

  615510fe13bd ("thermal: devfreq_cooling: remove old power model and use EM")

em_pd is only available when CONFIG_ENERGY_MODEL is set.

I have used the thermal tree from next-20201214 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Zhang Rui]

On Mon, 2020-03-23 at 11:08 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/intel/intel_pch_thermal.c:306:2: error: expected '}'
> before '[' token
>   306 |  [board_lwb] = {
>       |  ^
> drivers/thermal/intel/intel_pch_thermal.c:285:18: note: to match this
> '{'
>   285 | } board_info[] = {
>       |                  ^
> 
> Caused by commit
> 
>   16cd95bab00f ("thermal: intel_pch_thermal: Add PCI ids for
> Lewisburg PCH.")
> 
> I have used the thermal tree from next-20200320 for today.
> 
Bug has been fixed.
BTW, I think you can remove Eduardo from this loop, because he is not
working as the thermal maintainer right now.

thanks,
rui

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

Hi all,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/intel/intel_pch_thermal.c:306:2: error: expected '}' before '[' token
  306 |  [board_lwb] = {
      |  ^
drivers/thermal/intel/intel_pch_thermal.c:285:18: note: to match this '{'
  285 | } board_info[] = {
      |                  ^

Caused by commit

  16cd95bab00f ("thermal: intel_pch_thermal: Add PCI ids for Lewisburg PCH.")

I have used the thermal tree from next-20200320 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

RE: linux-next: build failure after merge of the thermal tree

[Anson Huang]

Hi, Daniel

> Subject: Re: linux-next: build failure after merge of the thermal tree
> 
> 
> Hi Anson,
> 
> could be please fix those two errors (this one and the
> thermal_zone_of_get_sensor_id)


Sure, I will fix them and send out patch for review.

Thanks,
Anson

> 
> Thanks
> 
>   -- Daniel
> 
> On 03/03/2020 07:07, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the thermal tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > ld: drivers/thermal/imx_sc_thermal.o: in function
> `.imx_sc_thermal_get_temp':
> > imx_sc_thermal.c:(.text.imx_sc_thermal_get_temp+0x68): undefined
> reference to `.imx_scu_call_rpc'
> > ld: drivers/thermal/imx_sc_thermal.o: in function `.imx_sc_thermal_probe':
> > imx_sc_thermal.c:(.text.imx_sc_thermal_probe+0x30): undefined
> reference to `.imx_scu_get_handle'
> >
> > Caused by commit
> >
> >   ed0843633fee ("thermal: imx_sc: add i.MX system controller thermal
> > support")
> >
> > I have added the following patch for today.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 3 Mar 2020 16:52:49 +1100
> > Subject: [PATCH] thermal: imx_sc: remove COMPILE_TEST from
> > IMX_SC_THERMAL
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/thermal/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index
> > 478eda79520d..f3f70503df04 100644
> > --- a/drivers/thermal/Kconfig
> > +++ b/drivers/thermal/Kconfig
> > @@ -254,7 +254,7 @@ config IMX_THERMAL
> >
> >  config IMX_SC_THERMAL
> >  	tristate "Temperature sensor driver for NXP i.MX SoCs with System
> Controller"
> > -	depends on IMX_SCU || COMPILE_TEST
> > +	depends on IMX_SCU
> >  	depends on OF
> >  	help
> >  	  Support for Temperature Monitor (TEMPMON) found on NXP i.MX
> SoCs
> > with
> >
> 
> 
> --
>  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
> 
> Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
> <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-
> blog/> Blog
> 

Re: linux-next: build failure after merge of the thermal tree

[Daniel Lezcano]

[-- Attachment #1.1: Type: text/plain, Size: 1899 bytes --]


Hi Anson,

could be please fix those two errors (this one and the
thermal_zone_of_get_sensor_id)

Thanks

  -- Daniel

On 03/03/2020 07:07, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the thermal tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> ld: drivers/thermal/imx_sc_thermal.o: in function `.imx_sc_thermal_get_temp':
> imx_sc_thermal.c:(.text.imx_sc_thermal_get_temp+0x68): undefined reference to `.imx_scu_call_rpc'
> ld: drivers/thermal/imx_sc_thermal.o: in function `.imx_sc_thermal_probe':
> imx_sc_thermal.c:(.text.imx_sc_thermal_probe+0x30): undefined reference to `.imx_scu_get_handle'
> 
> Caused by commit
> 
>   ed0843633fee ("thermal: imx_sc: add i.MX system controller thermal support")
> 
> I have added the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 3 Mar 2020 16:52:49 +1100
> Subject: [PATCH] thermal: imx_sc: remove COMPILE_TEST from IMX_SC_THERMAL
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/thermal/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 478eda79520d..f3f70503df04 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -254,7 +254,7 @@ config IMX_THERMAL
>  
>  config IMX_SC_THERMAL
>  	tristate "Temperature sensor driver for NXP i.MX SoCs with System Controller"
> -	depends on IMX_SCU || COMPILE_TEST
> +	depends on IMX_SCU
>  	depends on OF
>  	help
>  	  Support for Temperature Monitor (TEMPMON) found on NXP i.MX SoCs with
> 


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

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



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]

Hi all,

After merging the thermal tree, today's linux-next build (powerpc
allyesconfig) failed like this:

ld: drivers/thermal/imx_sc_thermal.o: in function `.imx_sc_thermal_get_temp':
imx_sc_thermal.c:(.text.imx_sc_thermal_get_temp+0x68): undefined reference to `.imx_scu_call_rpc'
ld: drivers/thermal/imx_sc_thermal.o: in function `.imx_sc_thermal_probe':
imx_sc_thermal.c:(.text.imx_sc_thermal_probe+0x30): undefined reference to `.imx_scu_get_handle'

Caused by commit

  ed0843633fee ("thermal: imx_sc: add i.MX system controller thermal support")

I have added the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Mar 2020 16:52:49 +1100
Subject: [PATCH] thermal: imx_sc: remove COMPILE_TEST from IMX_SC_THERMAL

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 478eda79520d..f3f70503df04 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -254,7 +254,7 @@ config IMX_THERMAL
 
 config IMX_SC_THERMAL
 	tristate "Temperature sensor driver for NXP i.MX SoCs with System Controller"
-	depends on IMX_SCU || COMPILE_TEST
+	depends on IMX_SCU
 	depends on OF
 	help
 	  Support for Temperature Monitor (TEMPMON) found on NXP i.MX SoCs with

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Daniel Lezcano]

[-- Attachment #1.1: Type: text/plain, Size: 2184 bytes --]

On 20/12/2019 01:04, Stephen Rothwell wrote:
> Hi Daniel,
> 
> On Fri, 13 Dec 2019 02:03:05 +0100 Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>>
>> On 12/12/2019 23:14, Stephen Rothwell wrote:
>>>
>>> On Thu, 12 Dec 2019 09:50:20 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
>>>>
>>>> After merging the thermal tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> drivers/thermal/qoriq_thermal.c: In function 'qoriq_tmu_probe':
>>>> drivers/thermal/qoriq_thermal.c:247:20: error: 'SZ_4K' undeclared (first use in this function)
>>>>   247 |   .max_register  = SZ_4K,
>>>>       |                    ^~~~~
>>>>
>>>> Caused by commit
>>>>
>>>>   c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")
>>>>
>>>> I have used the thermal tree from next-20191211 for today.  
>>>
>>> Today, I applied the following patch instead:  
>>
>> Thanks for the fix, I'll fold it with the commit c98030e5440d in order
>> to recover the bisectability.
>>
>>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>>> Date: Fri, 13 Dec 2019 09:08:24 +1100
>>> Subject: [PATCH] thermal: qoriq: using SZ_4K requires linux/sizes.h
>>>
>>> Fixes: c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")
>>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>> ---
>>>  drivers/thermal/qoriq_thermal.c | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
>>> index b75d34e07da5..874bc46e6c73 100644
>>> --- a/drivers/thermal/qoriq_thermal.c
>>> +++ b/drivers/thermal/qoriq_thermal.c
>>> @@ -10,6 +10,7 @@
>>>  #include <linux/of.h>
>>>  #include <linux/of_address.h>
>>>  #include <linux/regmap.h>
>>> +#include <linux/sizes.h>
>>>  #include <linux/thermal.h>
>>>  
>>>  #include "thermal_core.h"
> 
> I am still applying this patch ...

It should be fixed now.


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

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



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]

Hi Daniel,

On Fri, 13 Dec 2019 02:03:05 +0100 Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>
> On 12/12/2019 23:14, Stephen Rothwell wrote:
> > 
> > On Thu, 12 Dec 2019 09:50:20 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> >>
> >> After merging the thermal tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/thermal/qoriq_thermal.c: In function 'qoriq_tmu_probe':
> >> drivers/thermal/qoriq_thermal.c:247:20: error: 'SZ_4K' undeclared (first use in this function)
> >>   247 |   .max_register  = SZ_4K,
> >>       |                    ^~~~~
> >>
> >> Caused by commit
> >>
> >>   c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")
> >>
> >> I have used the thermal tree from next-20191211 for today.  
> > 
> > Today, I applied the following patch instead:  
> 
> Thanks for the fix, I'll fold it with the commit c98030e5440d in order
> to recover the bisectability.
> 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 13 Dec 2019 09:08:24 +1100
> > Subject: [PATCH] thermal: qoriq: using SZ_4K requires linux/sizes.h
> > 
> > Fixes: c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/thermal/qoriq_thermal.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> > index b75d34e07da5..874bc46e6c73 100644
> > --- a/drivers/thermal/qoriq_thermal.c
> > +++ b/drivers/thermal/qoriq_thermal.c
> > @@ -10,6 +10,7 @@
> >  #include <linux/of.h>
> >  #include <linux/of_address.h>
> >  #include <linux/regmap.h>
> > +#include <linux/sizes.h>
> >  #include <linux/thermal.h>
> >  
> >  #include "thermal_core.h"

I am still applying this patch ...
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Daniel Lezcano]

[-- Attachment #1.1: Type: text/plain, Size: 1879 bytes --]

On 12/12/2019 23:14, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 12 Dec 2019 09:50:20 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the thermal tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/thermal/qoriq_thermal.c: In function 'qoriq_tmu_probe':
>> drivers/thermal/qoriq_thermal.c:247:20: error: 'SZ_4K' undeclared (first use in this function)
>>   247 |   .max_register  = SZ_4K,
>>       |                    ^~~~~
>>
>> Caused by commit
>>
>>   c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")
>>
>> I have used the thermal tree from next-20191211 for today.
> 
> Today, I applied the following patch instead:

Thanks for the fix, I'll fold it with the commit c98030e5440d in order
to recover the bisectability.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 13 Dec 2019 09:08:24 +1100
> Subject: [PATCH] thermal: qoriq: using SZ_4K requires linux/sizes.h
> 
> Fixes: c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/thermal/qoriq_thermal.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> index b75d34e07da5..874bc46e6c73 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -10,6 +10,7 @@
>  #include <linux/of.h>
>  #include <linux/of_address.h>
>  #include <linux/regmap.h>
> +#include <linux/sizes.h>
>  #include <linux/thermal.h>
>  
>  #include "thermal_core.h"
> 


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

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



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

Hi all,

On Thu, 12 Dec 2019 09:50:20 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/qoriq_thermal.c: In function 'qoriq_tmu_probe':
> drivers/thermal/qoriq_thermal.c:247:20: error: 'SZ_4K' undeclared (first use in this function)
>   247 |   .max_register  = SZ_4K,
>       |                    ^~~~~
> 
> Caused by commit
> 
>   c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")
> 
> I have used the thermal tree from next-20191211 for today.

Today, I applied the following patch instead:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Dec 2019 09:08:24 +1100
Subject: [PATCH] thermal: qoriq: using SZ_4K requires linux/sizes.h

Fixes: c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/thermal/qoriq_thermal.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index b75d34e07da5..874bc46e6c73 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -10,6 +10,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/regmap.h>
+#include <linux/sizes.h>
 #include <linux/thermal.h>
 
 #include "thermal_core.h"
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

Hi all,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/qoriq_thermal.c: In function 'qoriq_tmu_probe':
drivers/thermal/qoriq_thermal.c:247:20: error: 'SZ_4K' undeclared (first use in this function)
  247 |   .max_register  = SZ_4K,
      |                    ^~~~~

Caused by commit

  c98030e5440d ("thermal: qoriq: Convert driver to use regmap API")

I have used the thermal tree from next-20191211 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Amit Kucheria]

Hi Stephen, Rui,

On Fri, Dec 7, 2018 at 6:55 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Zhang,
>
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/thermal/qcom/qcom-spmi-temp-alarm.c:26:10: fatal error: thermal_core.h: No such file or directory
>  #include "thermal_core.h"
>           ^~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   150a4fe8c335 ("drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir")

Apologies for the build error. My scripts failed to enable the config
and test it correctly. There was bug on where the .config file ended
up. I've fixed it and sent v4 of the patches. Please consider applying
them instead.

Regards,
Amit

> I have used the thermal tree from next-20181206 for today.
>
> --
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

Hi Zhang,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/qcom/qcom-spmi-temp-alarm.c:26:10: fatal error: thermal_core.h: No such file or directory
 #include "thermal_core.h"
          ^~~~~~~~~~~~~~~~

Caused by commit

  150a4fe8c335 ("drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir")

I have used the thermal tree from next-20181206 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 955 bytes --]

Hi all,

On Fri, 8 Jun 2018 10:51:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/qcom/tsens.c: In function 'tsens_probe':
> drivers/thermal/qcom/tsens.c:144:31: error: 's' undeclared (first use in this function)
>          num_sensors * sizeof(*s), GFP_KERNEL);
>                                ^
> 
> Caused by commit
> 
>   6d7c70d1cd65 ("thermal: qcom: tsens: Allow number of sensors to come from DT")
> 
> interacting with commit
> 
>   0ed2dd03b94b ("treewide: Use struct_size() for devm_kmalloc() and friends")
> 
> from Linus' tree.  It looks like git somehow screwed up the automatic
> conflict resolution.

OK, this was caused by a bad rerere entry in my tree (from my recent import of Andrew's mmotm patch series).  Sorry about that, I have fixed it up.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]

Hi Zhang,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/qcom/tsens.c: In function 'tsens_probe':
drivers/thermal/qcom/tsens.c:144:31: error: 's' undeclared (first use in this function)
         num_sensors * sizeof(*s), GFP_KERNEL);
                               ^

Caused by commit

  6d7c70d1cd65 ("thermal: qcom: tsens: Allow number of sensors to come from DT")

interacting with commit

  0ed2dd03b94b ("treewide: Use struct_size() for devm_kmalloc() and friends")

from Linus' tree.  It looks like git somehow screwed up the automatic
conflict resolution.

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Jun 2018 10:46:46 +1000
Subject: [PATCH] thermal: gcom: fix up bad git conflict resolution

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/thermal/qcom/tsens.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index fb8c87f55240..6164fd36dda3 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -140,8 +140,8 @@ static int tsens_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	tmdev = devm_kzalloc(dev, sizeof(*tmdev) +
-			     num_sensors * sizeof(*s), GFP_KERNEL);
+	tmdev = devm_kzalloc(dev, struct_size(tmdev, sensor, num_sensors),
+			     GFP_KERNEL);
 	if (!tmdev)
 		return -ENOMEM;
 
-- 
2.17.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]

Hi Zhang,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/thermal_core.c:1183:1: error: redefinition of 'thermal_cooling_device_register'
 thermal_cooling_device_register(char *type, void *devdata,
 ^
In file included from drivers/thermal/thermal_core.c:34:0:
include/linux/thermal.h:345:46: note: previous definition of 'thermal_cooling_device_register' was here
 static inline struct thermal_cooling_device *thermal_cooling_device_register(
                                              ^
drivers/thermal/thermal_core.c:1221:6: error: redefinition of 'thermal_cooling_device_unregister'
 void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
      ^
In file included from drivers/thermal/thermal_core.c:34:0:
include/linux/thermal.h:351:20: note: previous definition of 'thermal_cooling_device_unregister' was here
 static inline void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
                    ^

Caused by commit 571ed5a8177a ("Thermal: int340x thermal: fix a Kconfig
dependency error").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Zhang Rui]

On Fri, 2014-10-10 at 12:14 +1100, Stephen Rothwell wrote:
> Hi Zhang,
> 
> After merging the thermal tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from /scratch/sfr/next/init/main.c:27:0:
> /scratch/sfr/next/include/linux/acpi.h: In function 'acpi_create_platform_device':
> /scratch/sfr/next/include/linux/acpi.h:528:12: error: parameter name omitted
>      struct acpi_device *)
>             ^
> In file included from /scratch/sfr/next/drivers/i2c/i2c-core.c:54:0:
> /scratch/sfr/next/include/linux/acpi.h: In function 'acpi_create_platform_device':
> /scratch/sfr/next/include/linux/acpi.h:528:12: error: parameter name omitted
>      struct acpi_device *)
>             ^
> 
> And so on ...
> 
> Caused by commit 55fe2ff57c7e ("ACPI: make
> acpi_create_platform_device() an external API").  This build does not
> have CONFIG_ACPI set.  This has come along a bit late. :-(
> 
> I have used the thermal tree from next-20141009 for today.

I've fixed the problem in my tree. Please re-pull.

thanks,
rui

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 985 bytes --]

Hi Zhang,

After merging the thermal tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from /scratch/sfr/next/init/main.c:27:0:
/scratch/sfr/next/include/linux/acpi.h: In function 'acpi_create_platform_device':
/scratch/sfr/next/include/linux/acpi.h:528:12: error: parameter name omitted
     struct acpi_device *)
            ^
In file included from /scratch/sfr/next/drivers/i2c/i2c-core.c:54:0:
/scratch/sfr/next/include/linux/acpi.h: In function 'acpi_create_platform_device':
/scratch/sfr/next/include/linux/acpi.h:528:12: error: parameter name omitted
     struct acpi_device *)
            ^

And so on ...

Caused by commit 55fe2ff57c7e ("ACPI: make
acpi_create_platform_device() an external API").  This build does not
have CONFIG_ACPI set.  This has come along a bit late. :-(

I have used the thermal tree from next-20141009 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the thermal tree

[Fengguang Wu]

On Mon, Oct 08, 2012 at 11:02:05AM +1100, Stephen Rothwell wrote:
> Hi Zhang,
> 
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/cpu_cooling.c: In function 'get_idr':
> drivers/thermal/cpu_cooling.c:89:14: error: 'MAX_ID_MASK' undeclared (first use in this function)
> 
> Caused by commit 023614183768 ("thermal: add generic cpufreq cooling
> implementation") interacting with commit 125c4c706b68 ("idr: rename
> MAX_LEVEL to MAX_IDR_LEVEL") which very recently entered Linus' tree.
> 
> I have applied the following fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Oct 2012 10:56:56 +1100
> Subject: [PATCH] thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename

Thank you Stephen! Sorry for all the troubles on the rename..

Thanks,
Fengguang

RE: linux-next: build failure after merge of the thermal tree

[Zhang, Rui]

Hi,

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Monday, October 08, 2012 8:02 AM
> To: Zhang, Rui
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Amit
> Daniel Kachhap; Wu, Fengguang; Andrew Morton
> Subject: linux-next: build failure after merge of the thermal tree
> Importance: High
> 
> Hi Zhang,
> 
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/cpu_cooling.c: In function 'get_idr':
> drivers/thermal/cpu_cooling.c:89:14: error: 'MAX_ID_MASK' undeclared
> (first use in this function)
> 
> Caused by commit 023614183768 ("thermal: add generic cpufreq cooling
> implementation") interacting with commit 125c4c706b68 ("idr: rename
> MAX_LEVEL to MAX_IDR_LEVEL") which very recently entered Linus' tree.
> 
> I have applied the following fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Oct 2012 10:56:56 +1100
> Subject: [PATCH] thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK
> rename
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

The patch looks good to me, thanks for the fix.

-rui
> ---
>  drivers/thermal/cpu_cooling.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/thermal/cpu_cooling.c
> b/drivers/thermal/cpu_cooling.c index 9050c1b..cc1c930 100644
> --- a/drivers/thermal/cpu_cooling.c
> +++ b/drivers/thermal/cpu_cooling.c
> @@ -86,7 +86,7 @@ again:
>  	else if (unlikely(err))
>  		return err;
> 
> -	*id = *id & MAX_ID_MASK;
> +	*id = *id & MAX_IDR_MASK;
>  	return 0;
>  }
> 
> --
> 1.7.10.280.gaa39
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]

Hi Zhang,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/cpu_cooling.c: In function 'get_idr':
drivers/thermal/cpu_cooling.c:89:14: error: 'MAX_ID_MASK' undeclared (first use in this function)

Caused by commit 023614183768 ("thermal: add generic cpufreq cooling
implementation") interacting with commit 125c4c706b68 ("idr: rename
MAX_LEVEL to MAX_IDR_LEVEL") which very recently entered Linus' tree.

I have applied the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 10:56:56 +1100
Subject: [PATCH] thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/thermal/cpu_cooling.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 9050c1b..cc1c930 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -86,7 +86,7 @@ again:
 	else if (unlikely(err))
 		return err;
 
-	*id = *id & MAX_ID_MASK;
+	*id = *id & MAX_IDR_MASK;
 	return 0;
 }
 
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]