Skip to contentSkip to conversation

thermal: Add mode helpers

PATCH Guenter Roeck 2 participants 3 messages May 29, 2020 – Jun 1, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw
Quoted 17 lines · Andrzej Pietrasiewicz

Prepare for making the drivers not access tzd's private members.

---
 drivers/thermal/thermal_core.c | 53 ++++++++++++++++++++++++++++++++++
 include/linux/thermal.h        | 13 +++++++++
 2 files changed, 66 insertions(+)
drivers/thermal/thermal_core.c +1 -0
index 14d3b1b94c4f..f2a5c5ee3455 100644
@@ -459,6 +459,59 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)
 	thermal_zone_device_init(tz);
 }
 
+int thermal_zone_device_set_mode(struct thermal_zone_device *tz,

drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 472

Quoted 10 lines
drivers/thermal/thermal_core.c +10 -0
+				 enum thermal_device_mode mode)
+{
+	int ret = 0;
+
+	mutex_lock(&tz->lock);
+
+	/* do nothing if mode isn't changing */
+	if (mode == tz->mode) {
+		mutex_unlock(&tz->lock);
+

Nit: unnecessary empty line.

Quoted 11 lines
drivers/thermal/thermal_core.c +11 -0
+		return ret;
+	}
+
+	if (tz->ops->set_mode)
+		ret = tz->ops->set_mode(tz, mode);
+
+	if (!ret)
+		tz->mode = mode;
+
+	mutex_unlock(&tz->lock);
+

drivers/thermal/thermal_core.c static void thermal_zone_device_reset(struct thermal_zone_device *tz) · line 493

Quoted 10 lines
drivers/thermal/thermal_core.c +10 -0
+	thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
+
+	return ret;
+}
+
+int thermal_zone_device_enable(struct thermal_zone_device *tz)
+{
+	return thermal_zone_device_set_mode(tz, THERMAL_DEVICE_ENABLED);
+}
+EXPORT_SYMBOL(thermal_zone_device_enable);

Other exports in thermal/ use EXPORT_SYMBOL_GPL.

Quoted 55 lines
drivers/thermal/thermal_core.c +21 -0
+
+int thermal_zone_device_disable(struct thermal_zone_device *tz)
+{
+	return thermal_zone_device_set_mode(tz, THERMAL_DEVICE_DISABLED);
+}
+EXPORT_SYMBOL(thermal_zone_device_disable);
+
+int thermal_zone_device_is_enabled(struct thermal_zone_device *tz)
+{
+	enum thermal_device_mode mode;
+
+	mutex_lock(&tz->lock);
+
+	mode = tz->mode;
+
+	mutex_unlock(&tz->lock);
+
+	return mode == THERMAL_DEVICE_ENABLED;
+}
+EXPORT_SYMBOL(thermal_zone_device_is_enabled);
+
 void thermal_zone_device_update(struct thermal_zone_device *tz,
 				enum thermal_notify_event event)
 {
include/linux/thermal.h +13 -0
index a808f6fa2777..df013c39ba9b 100644
@@ -416,6 +416,9 @@ int thermal_zone_get_offset(struct thermal_zone_device *tz);
 
 void thermal_cdev_update(struct thermal_cooling_device *);
 void thermal_notify_framework(struct thermal_zone_device *, int);
+int thermal_zone_device_enable(struct thermal_zone_device *tz);
+int thermal_zone_device_disable(struct thermal_zone_device *tz);
+int thermal_zone_device_is_enabled(struct thermal_zone_device *tz);
 #else
 static inline struct thermal_zone_device *thermal_zone_device_register(
 	const char *type, int trips, int mask, void *devdata,
@@ -463,6 +466,16 @@ static inline void thermal_cdev_update(struct thermal_cooling_device *cdev)
 static inline void thermal_notify_framework(struct thermal_zone_device *tz,
 	int trip)
 { }
+
+static inline int thermal_zone_device_enable(struct thermal_zone_device *tz)
+{ return -ENODEV; }
+
+static inline int thermal_zone_device_disable(struct thermal_zone_device *tz)
+{ return -ENODEV; }
+
+static inline int
+thermal_zone_device_is_enabled(struct thermal_zone_device *tz)
+{ return -ENODEV; }
 #endif /* CONFIG_THERMAL */
 
 #endif /* __THERMAL_H__ */
#1 lore raw

Hi Guenter,

W dniu 29.05.2020 o 17:52, Guenter Roeck pisze:

Quoted 4 lines · Andrzej Pietrasiewicz
Quoted 3 lines

Prepare for making the drivers not access tzd's private members.

<snip>

Quoted 4 lines
Quoted 1 line

+

Nit: unnecessary empty line.

Quoted 1 line
(quoted diff) +1 -0
+		return ret;

<snip>

Quoted 5 lines

Review

Quoted 3 lines
(quoted diff) +3 -0
+	return thermal_zone_device_set_mode(tz, THERMAL_DEVICE_ENABLED);
+}
+EXPORT_SYMBOL(thermal_zone_device_enable);

Other exports in thermal/ use EXPORT_SYMBOL_GPL.

Other than that does it look good to you?
I can send a v5 where the two above will be corrected, but did you have a chance to review patches 7-11?

Andrzej

#2 lore raw
Quoted 17 lines · Andrzej Pietrasiewicz

Hi Guenter,

W dniu 29.05.2020 o 17:52, Guenter Roeck pisze:

Quoted 4 lines · Andrzej Pietrasiewicz
Quoted 3 lines

Prepare for making the drivers not access tzd's private members.

<snip>

Quoted 4 lines
Quoted 1 line

+

Nit: unnecessary empty line.

Quoted 1 line

+        return ret;

<snip>

Quoted 7 lines
Quoted 5 lines

Review

Quoted 3 lines

+    return thermal_zone_device_set_mode(tz, THERMAL_DEVICE_ENABLED);

(quoted diff) +2 -0
+}
+EXPORT_SYMBOL(thermal_zone_device_enable);

Other exports in thermal/ use EXPORT_SYMBOL_GPL.

Other than that does it look good to you?

Yes, it does.

Quoted 3 lines

I can send a v5 where the two above will be corrected, but did you have a chance to review patches 7-11?

Not yet. I got distracted, sorry. Hopefully I'll get to it today or tomorrow.

Guenter