From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: daniel.lezcano@linaro.org, rafael@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
rui.zhang@intel.com, "Raju Rangoju" <rajur@chelsio.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Peter Kaestle" <peter@piie.net>,
"Hans de Goede" <hdegoede@redhat.com>,
"Mark Gross" <markgross@kernel.org>,
"Miquel Raynal" <miquel.raynal@bootlin.com>,
"Amit Kucheria" <amitk@kernel.org>,
"Nicolas Saenz Julienne" <nsaenz@kernel.org>,
"Broadcom Kernel Team" <bcm-kernel-feedback-list@broadcom.com>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Ray Jui" <rjui@broadcom.com>,
"Scott Branden" <sbranden@broadcom.com>,
"Support Opensource" <support.opensource@diasemi.com>,
"Lukasz Luba" <lukasz.luba@arm.com>,
"Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"Fabio Estevam" <festevam@gmail.com>,
"NXP Linux Team" <linux-imx@nxp.com>,
"Thara Gopinath" <thara.gopinath@linaro.org>,
"Andy Gross" <agross@kernel.org>,
"Bjorn Andersson" <bjorn.andersson@linaro.org>,
"Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
"Bartlomiej Zolnierkiewicz" <bzolnier@gmail.com>,
"Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>,
"Alim Akhtar" <alim.akhtar@samsung.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Eduardo Valentin" <edubezval@gmail.com>,
Keerthy <j-keerthy@ti.com>,
"Kunihiko Hayashi" <hayashi.kunihiko@socionext.com>,
"Masami Hiramatsu" <mhiramat@kernel.org>,
"Antoine Tenart" <atenart@kernel.org>,
"Srinivas Pandruvada" <srinivas.pandruvada@linux.intel.com>,
"Dmitry Osipenko" <digetx@gmail.com>,
netdev@vger.kernel.org, platform-driver-x86@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-omap@vger.kernel.org
Subject: [PATCH v7 21/29] thermal/drivers/imx: Use generic thermal_zone_get_trip() function
Date: Wed, 28 Sep 2022 23:00:51 +0200 [thread overview]
Message-ID: <20220928210059.891387-22-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20220928210059.891387-1-daniel.lezcano@linaro.org>
The thermal framework gives the possibility to register the trip
points with the thermal zone. When that is done, no get_trip_* ops are
needed and they can be removed.
Convert ops content logic into generic trip points and register them with the
thermal zone.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/thermal/imx_thermal.c | 72 +++++++++++++----------------------
1 file changed, 27 insertions(+), 45 deletions(-)
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 16663373b682..fb0d5cab70af 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -76,7 +76,6 @@
enum imx_thermal_trip {
IMX_TRIP_PASSIVE,
IMX_TRIP_CRITICAL,
- IMX_TRIP_NUM,
};
#define IMX_POLLING_DELAY 2000 /* millisecond */
@@ -115,6 +114,11 @@ struct thermal_soc_data {
u32 low_alarm_shift;
};
+static struct thermal_trip trips[] = {
+ [IMX_TRIP_PASSIVE] = { .type = THERMAL_TRIP_PASSIVE },
+ [IMX_TRIP_CRITICAL] = { .type = THERMAL_TRIP_CRITICAL },
+};
+
static struct thermal_soc_data thermal_imx6q_data = {
.version = TEMPMON_IMX6Q,
@@ -201,8 +205,6 @@ struct imx_thermal_data {
struct thermal_cooling_device *cdev;
struct regmap *tempmon;
u32 c1, c2; /* See formula in imx_init_calib() */
- int temp_passive;
- int temp_critical;
int temp_max;
int alarm_temp;
int last_temp;
@@ -279,12 +281,12 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)
/* Update alarm value to next higher trip point for TEMPMON_IMX6Q */
if (data->socdata->version == TEMPMON_IMX6Q) {
- if (data->alarm_temp == data->temp_passive &&
- *temp >= data->temp_passive)
- imx_set_alarm_temp(data, data->temp_critical);
- if (data->alarm_temp == data->temp_critical &&
- *temp < data->temp_passive) {
- imx_set_alarm_temp(data, data->temp_passive);
+ if (data->alarm_temp == trips[IMX_TRIP_PASSIVE].temperature &&
+ *temp >= trips[IMX_TRIP_PASSIVE].temperature)
+ imx_set_alarm_temp(data, trips[IMX_TRIP_CRITICAL].temperature);
+ if (data->alarm_temp == trips[IMX_TRIP_CRITICAL].temperature &&
+ *temp < trips[IMX_TRIP_PASSIVE].temperature) {
+ imx_set_alarm_temp(data, trips[IMX_TRIP_PASSIVE].temperature);
dev_dbg(&tz->device, "thermal alarm off: T < %d\n",
data->alarm_temp / 1000);
}
@@ -330,29 +332,10 @@ static int imx_change_mode(struct thermal_zone_device *tz,
return 0;
}
-static int imx_get_trip_type(struct thermal_zone_device *tz, int trip,
- enum thermal_trip_type *type)
-{
- *type = (trip == IMX_TRIP_PASSIVE) ? THERMAL_TRIP_PASSIVE :
- THERMAL_TRIP_CRITICAL;
- return 0;
-}
-
static int imx_get_crit_temp(struct thermal_zone_device *tz, int *temp)
{
- struct imx_thermal_data *data = tz->devdata;
-
- *temp = data->temp_critical;
- return 0;
-}
-
-static int imx_get_trip_temp(struct thermal_zone_device *tz, int trip,
- int *temp)
-{
- struct imx_thermal_data *data = tz->devdata;
+ *temp = trips[IMX_TRIP_CRITICAL].temperature;
- *temp = (trip == IMX_TRIP_PASSIVE) ? data->temp_passive :
- data->temp_critical;
return 0;
}
@@ -371,10 +354,10 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip,
return -EPERM;
/* do not allow passive to be set higher than critical */
- if (temp < 0 || temp > data->temp_critical)
+ if (temp < 0 || temp > trips[IMX_TRIP_CRITICAL].temperature)
return -EINVAL;
- data->temp_passive = temp;
+ trips[IMX_TRIP_PASSIVE].temperature = temp;
imx_set_alarm_temp(data, temp);
@@ -423,8 +406,6 @@ static struct thermal_zone_device_ops imx_tz_ops = {
.unbind = imx_unbind,
.get_temp = imx_get_temp,
.change_mode = imx_change_mode,
- .get_trip_type = imx_get_trip_type,
- .get_trip_temp = imx_get_trip_temp,
.get_crit_temp = imx_get_crit_temp,
.set_trip_temp = imx_set_trip_temp,
};
@@ -507,8 +488,8 @@ static void imx_init_temp_grade(struct platform_device *pdev, u32 ocotp_mem0)
* Set the critical trip point at 5 °C under max
* Set the passive trip point at 10 °C under max (changeable via sysfs)
*/
- data->temp_critical = data->temp_max - (1000 * 5);
- data->temp_passive = data->temp_max - (1000 * 10);
+ trips[IMX_TRIP_PASSIVE].temperature = data->temp_max - (1000 * 10);
+ trips[IMX_TRIP_CRITICAL].temperature = data->temp_max - (1000 * 5);
}
static int imx_init_from_tempmon_data(struct platform_device *pdev)
@@ -743,12 +724,13 @@ static int imx_thermal_probe(struct platform_device *pdev)
goto legacy_cleanup;
}
- data->tz = thermal_zone_device_register("imx_thermal_zone",
- IMX_TRIP_NUM,
- BIT(IMX_TRIP_PASSIVE), data,
- &imx_tz_ops, NULL,
- IMX_PASSIVE_DELAY,
- IMX_POLLING_DELAY);
+ data->tz = thermal_zone_device_register_with_trips("imx_thermal_zone",
+ trips,
+ ARRAY_SIZE(trips),
+ BIT(IMX_TRIP_PASSIVE), data,
+ &imx_tz_ops, NULL,
+ IMX_PASSIVE_DELAY,
+ IMX_POLLING_DELAY);
if (IS_ERR(data->tz)) {
ret = PTR_ERR(data->tz);
dev_err(&pdev->dev,
@@ -758,8 +740,8 @@ static int imx_thermal_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "%s CPU temperature grade - max:%dC"
" critical:%dC passive:%dC\n", data->temp_grade,
- data->temp_max / 1000, data->temp_critical / 1000,
- data->temp_passive / 1000);
+ data->temp_max / 1000, trips[IMX_TRIP_CRITICAL].temperature / 1000,
+ trips[IMX_TRIP_PASSIVE].temperature / 1000);
/* Enable measurements at ~ 10 Hz */
regmap_write(map, data->socdata->measure_freq_ctrl + REG_CLR,
@@ -767,10 +749,10 @@ static int imx_thermal_probe(struct platform_device *pdev)
measure_freq = DIV_ROUND_UP(32768, 10); /* 10 Hz */
regmap_write(map, data->socdata->measure_freq_ctrl + REG_SET,
measure_freq << data->socdata->measure_freq_shift);
- imx_set_alarm_temp(data, data->temp_passive);
+ imx_set_alarm_temp(data, trips[IMX_TRIP_PASSIVE].temperature);
if (data->socdata->version == TEMPMON_IMX6SX)
- imx_set_panic_temp(data, data->temp_critical);
+ imx_set_panic_temp(data, trips[IMX_TRIP_CRITICAL].temperature);
regmap_write(map, data->socdata->sensor_ctrl + REG_CLR,
data->socdata->power_down_mask);
--
2.34.1
next prev parent reply other threads:[~2022-09-28 21:06 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 21:00 [PATCH v7 00/29] Rework the trip points creation Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 01/29] thermal/core: Add a generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-30 17:20 ` Rafael J. Wysocki
2022-09-28 21:00 ` [PATCH v7 02/29] thermal/sysfs: Always expose hysteresis attributes Daniel Lezcano
2022-09-30 17:23 ` Rafael J. Wysocki
2022-09-28 21:00 ` [PATCH v7 03/29] thermal/core: Add a generic thermal_zone_set_trip() function Daniel Lezcano
2022-09-30 17:27 ` Rafael J. Wysocki
2022-09-28 21:00 ` [PATCH v7 04/29] thermal/core/governors: Use thermal_zone_get_trip() instead of ops functions Daniel Lezcano
2022-09-30 17:31 ` Rafael J. Wysocki
2022-09-28 21:00 ` [PATCH v7 05/29] thermal/of: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 06/29] thermal/of: Remove unused functions Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 07/29] thermal/drivers/exynos: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 08/29] thermal/drivers/exynos: of_thermal_get_ntrips() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 09/29] thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by thermal_zone_get_trip() Daniel Lezcano
2022-09-29 7:31 ` Krzysztof Kozlowski
2022-09-28 21:00 ` [PATCH v7 10/29] thermal/drivers/tegra: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 11/29] thermal/drivers/uniphier: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 12/29] thermal/drivers/hisi: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 13/29] thermal/drivers/qcom: " Daniel Lezcano
2022-09-29 13:31 ` Dmitry Baryshkov
2022-09-28 21:00 ` [PATCH v7 14/29] thermal/drivers/armada: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 15/29] thermal/drivers/rcar_gen3: Use the generic function to get the number of trips Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 16/29] thermal/of: Remove of_thermal_get_ntrips() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 17/29] thermal/of: Remove of_thermal_is_trip_valid() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 18/29] thermal/of: Remove of_thermal_set_trip_hyst() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 19/29] thermal/of: Remove of_thermal_get_crit_temp() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 20/29] thermal/drivers/st: Use generic trip points Daniel Lezcano
2022-09-28 21:00 ` Daniel Lezcano [this message]
2022-09-28 21:00 ` [PATCH v7 22/29] thermal/drivers/rcar: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 23/29] thermal/drivers/broadcom: " Daniel Lezcano
2022-09-29 17:34 ` Florian Fainelli
2022-09-28 21:00 ` [PATCH v7 24/29] thermal/drivers/da9062: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 25/29] thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() / ti_thermal_trip_is_valid() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 26/29] thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 27/29] thermal/drivers/cxgb4: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 28/29] thermal/intel/int340x: Replace parameter to simplify Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 29/29] thermal/drivers/intel: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-29 12:25 ` [PATCH v7 00/29] Rework the trip points creation Daniel Lezcano
2022-09-29 13:58 ` Rafael J. Wysocki
2022-09-29 14:57 ` Daniel Lezcano
2022-09-29 19:35 ` Rafael J. Wysocki
2022-09-30 17:39 ` Rafael J. Wysocki
2022-10-03 7:32 ` Lukasz Luba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220928210059.891387-22-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=agross@kernel.org \
--cc=alim.akhtar@samsung.com \
--cc=amitk@kernel.org \
--cc=atenart@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bjorn.andersson@linaro.org \
--cc=bzolnier@gmail.com \
--cc=davem@davemloft.net \
--cc=digetx@gmail.com \
--cc=edubezval@gmail.com \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=festevam@gmail.com \
--cc=hayashi.kunihiko@socionext.com \
--cc=hdegoede@redhat.com \
--cc=j-keerthy@ti.com \
--cc=jonathanh@nvidia.com \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski@linaro.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=markgross@kernel.org \
--cc=mhiramat@kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=nsaenz@kernel.org \
--cc=pabeni@redhat.com \
--cc=peter@piie.net \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rajur@chelsio.com \
--cc=rjui@broadcom.com \
--cc=rui.zhang@intel.com \
--cc=s.hauer@pengutronix.de \
--cc=sbranden@broadcom.com \
--cc=shawnguo@kernel.org \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=support.opensource@diasemi.com \
--cc=thara.gopinath@linaro.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).