mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 21:39:02 +00:00
b7ef3ca1e0
- legacy received upstream patches - current had broken headers installation + few missing patches - dev was bumped to 5.8.y
138 lines
4.7 KiB
Text
138 lines
4.7 KiB
Text
From 674482a5933e94789105d32872adff0ffce48d01 Mon Sep 17 00:00:00 2001
|
|
From: Lukasz Luba <l.luba@partner.samsung.com>
|
|
Date: Wed, 7 Nov 2018 18:09:44 +0100
|
|
Subject: [PATCH 15/24] MEMEKA: thermal: add irq-mode configuration for trip
|
|
point
|
|
|
|
This patch adds support irq mode in trip point.
|
|
When that flag is set in DT, there is no need for polling
|
|
in thermal framework. Crossing the trip point will rise an IRQ.
|
|
The naming convention for tip point 'type' can be confussing
|
|
and 'passive' (whic is passive cooling) might be interpretted wrongly.
|
|
|
|
This mechanism prevents from missue and adds explicit setting
|
|
for hardware which support interrupts for pre-configured temperature
|
|
threshold.
|
|
|
|
Cc: Zhang Rui <rui.zhang@intel.com>
|
|
Cc: Eduardo Valentin <edubezval@gmail.com>
|
|
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Signed-off-by: Lukasz Luba <l.luba@partner.samsung.com>
|
|
Signed-off-by: memeka <mihailescu2m@gmail.com>
|
|
---
|
|
drivers/thermal/of-thermal.c | 17 +++++++++++++++++
|
|
drivers/thermal/thermal_core.c | 10 ++++++++--
|
|
include/linux/thermal.h | 5 +++++
|
|
3 files changed, 30 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
|
|
index 874a47d6923f..1549561e28b2 100644
|
|
--- a/drivers/thermal/of-thermal.c
|
|
+++ b/drivers/thermal/of-thermal.c
|
|
@@ -315,6 +315,20 @@ static int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,
|
|
return 0;
|
|
}
|
|
|
|
+static int
|
|
+of_thermal_get_trip_irq_mode(struct thermal_zone_device *tz, int trip,
|
|
+ bool *mode)
|
|
+{
|
|
+ struct __thermal_zone *data = tz->devdata;
|
|
+
|
|
+ if (trip >= data->ntrips || trip < 0)
|
|
+ return -EDOM;
|
|
+
|
|
+ *mode = data->trips[trip].irq_mode;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int of_thermal_get_trip_temp(struct thermal_zone_device *tz, int trip,
|
|
int *temp)
|
|
{
|
|
@@ -397,6 +411,7 @@ static struct thermal_zone_device_ops of_thermal_ops = {
|
|
.set_mode = of_thermal_set_mode,
|
|
|
|
.get_trip_type = of_thermal_get_trip_type,
|
|
+ .get_trip_irq_mode = of_thermal_get_trip_irq_mode,
|
|
.get_trip_temp = of_thermal_get_trip_temp,
|
|
.set_trip_temp = of_thermal_set_trip_temp,
|
|
.get_trip_hyst = of_thermal_get_trip_hyst,
|
|
@@ -860,6 +875,8 @@ static int thermal_of_populate_trip(struct device_node *np,
|
|
return ret;
|
|
}
|
|
|
|
+ trip->irq_mode = of_property_read_bool(np, "irq-mode");
|
|
+
|
|
/* Required for cooling map matching */
|
|
trip->np = np;
|
|
of_node_get(np);
|
|
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
|
|
index 9a321dc548c8..ef23a33d34b6 100644
|
|
--- a/drivers/thermal/thermal_core.c
|
|
+++ b/drivers/thermal/thermal_core.c
|
|
@@ -410,6 +410,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz,
|
|
static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
|
|
{
|
|
enum thermal_trip_type type;
|
|
+ bool irq_mode = false;
|
|
|
|
/* Ignore disabled trip points */
|
|
if (test_bit(trip, &tz->trips_disabled))
|
|
@@ -423,9 +424,14 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
|
|
handle_non_critical_trips(tz, trip);
|
|
/*
|
|
* Alright, we handled this trip successfully.
|
|
- * So, start monitoring again.
|
|
+ * So, start monitoring in polling mode if
|
|
+ * trip is not using irq HW support.
|
|
*/
|
|
- monitor_thermal_zone(tz);
|
|
+ if (tz->ops->get_trip_irq_mode)
|
|
+ tz->ops->get_trip_irq_mode(tz, trip, &irq_mode);
|
|
+
|
|
+ if (!irq_mode)
|
|
+ monitor_thermal_zone(tz);
|
|
}
|
|
|
|
static void update_temperature(struct thermal_zone_device *tz)
|
|
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
|
|
index c91b1e344d56..c4ce2b875b73 100644
|
|
--- a/include/linux/thermal.h
|
|
+++ b/include/linux/thermal.h
|
|
@@ -92,6 +92,7 @@ struct thermal_zone_device_ops {
|
|
enum thermal_device_mode);
|
|
int (*get_trip_type) (struct thermal_zone_device *, int,
|
|
enum thermal_trip_type *);
|
|
+ int (*get_trip_irq_mode) (struct thermal_zone_device *, int, bool *);
|
|
int (*get_trip_temp) (struct thermal_zone_device *, int, int *);
|
|
int (*set_trip_temp) (struct thermal_zone_device *, int, int);
|
|
int (*get_trip_hyst) (struct thermal_zone_device *, int, int *);
|
|
@@ -185,6 +186,7 @@ struct thermal_zone_device {
|
|
struct thermal_attr *trip_temp_attrs;
|
|
struct thermal_attr *trip_type_attrs;
|
|
struct thermal_attr *trip_hyst_attrs;
|
|
+ struct thermal_attr *trip_irq_mode_attrs;
|
|
void *devdata;
|
|
int trips;
|
|
unsigned long trips_disabled; /* bitmap for disabled trips */
|
|
@@ -353,6 +355,8 @@ struct thermal_zone_of_device_ops {
|
|
* @temperature: temperature value in miliCelsius
|
|
* @hysteresis: relative hysteresis in miliCelsius
|
|
* @type: trip point type
|
|
+ * @irq_mode: to not use polling in framework set support of HW irq (which will
|
|
+ * be triggered when temperature reaches this level).
|
|
*/
|
|
|
|
struct thermal_trip {
|
|
@@ -360,6 +364,7 @@ struct thermal_trip {
|
|
int temperature;
|
|
int hysteresis;
|
|
enum thermal_trip_type type;
|
|
+ bool irq_mode;
|
|
};
|
|
|
|
/* Function declarations */
|
|
--
|
|
2.20.1
|
|
|