From: Fabio Estevam <festevam@gmail.com>
To: rafael@kernel.org
Cc: daniel.lezcano@linaro.org, amitk@kernel.org, rui.zhang@intel.com,
linux-pm@vger.kernel.org, krzysztof.kozlowski+dt@linaro.org,
robh+dt@kernel.org, conor+dt@kernel.org,
devicetree@vger.kernel.org, Fabio Estevam <festevam@denx.de>
Subject: [PATCH v6 3/3] thermal: thermal_core: Allow rebooting after critical temp
Date: Wed, 30 Aug 2023 12:19:08 -0300 [thread overview]
Message-ID: <20230830151908.2149847-3-festevam@gmail.com> (raw)
In-Reply-To: <20230830151908.2149847-1-festevam@gmail.com>
From: Fabio Estevam <festevam@denx.de>
Currently, the default mechanism is to trigger a shutdown after the
critical temperature is reached.
In some embedded cases, such behavior does not suit well, as the board may
be unattended in the field and rebooting may be a better approach.
The bootloader may also check the temperature and only allow the boot to
proceed when the temperature is below a certain threshold.
Introduce support for allowing a reboot to be triggered after the
critical temperature is reached.
If the "critical-action" devicetree property is not found, fall back to
the shutdown action to preserve the existing default behavior.
Tested on a i.MX8MM board with the following devicetree changes:
thermal-zones {
cpu-thermal {
critical-action = "reboot";
};
};
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v5:
- Simplify thermal_of_get_critical_action(). (Rafael)
drivers/thermal/thermal_core.c | 6 +++++-
drivers/thermal/thermal_of.c | 21 +++++++++++++++++++++
include/linux/thermal.h | 6 ++++++
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index a59700593d32..062114608667 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -320,11 +320,15 @@ void thermal_zone_device_critical(struct thermal_zone_device *tz)
* Its a must for forced_emergency_poweroff_work to be scheduled.
*/
int poweroff_delay_ms = CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS;
+ static const char *msg = "Temperature too high";
dev_emerg(&tz->device, "%s: critical temperature reached, "
"shutting down\n", tz->type);
- hw_protection_shutdown("Temperature too high", poweroff_delay_ms);
+ if (tz->action == THERMAL_CRITICAL_ACTION_REBOOT)
+ hw_protection_reboot(msg, poweroff_delay_ms);
+ else
+ hw_protection_shutdown(msg, poweroff_delay_ms);
}
EXPORT_SYMBOL(thermal_zone_device_critical);
diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index 4ca905723429..a644a896a617 100644
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -218,6 +218,25 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
return tz;
}
+static const char * const critical_actions[] = {
+ [THERMAL_CRITICAL_ACTION_SHUTDOWN] = "shutdown",
+ [THERMAL_CRITICAL_ACTION_REBOOT] = "reboot",
+};
+
+static void thermal_of_get_critical_action(struct device_node *np,
+ enum thermal_action *action)
+{
+ const char *action_string;
+ int ret;
+
+ ret = of_property_read_string(np, "critical-action", &action_string);
+ if (ret < 0)
+ *action = THERMAL_CRITICAL_ACTION_SHUTDOWN;
+
+ if (!strcasecmp(action_string, "reboot"))
+ *action = THERMAL_CRITICAL_ACTION_REBOOT;
+}
+
static int thermal_of_monitor_init(struct device_node *np, int *delay, int *pdelay)
{
int ret;
@@ -516,6 +535,8 @@ static struct thermal_zone_device *thermal_of_zone_register(struct device_node *
goto out_kfree_trips;
}
+ thermal_of_get_critical_action(np, &tz->action);
+
ret = thermal_zone_device_enable(tz);
if (ret) {
pr_err("Failed to enabled thermal zone '%s', id=%d: %d\n",
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index b449a46766f5..b68e5734823d 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -34,6 +34,11 @@ struct thermal_cooling_device;
struct thermal_instance;
struct thermal_attr;
+enum thermal_action {
+ THERMAL_CRITICAL_ACTION_SHUTDOWN = 0, /* shutdown when crit temperature is reached */
+ THERMAL_CRITICAL_ACTION_REBOOT, /* reboot when crit temperature is reached */
+};
+
enum thermal_trend {
THERMAL_TREND_STABLE, /* temperature is stable */
THERMAL_TREND_RAISING, /* temperature is raising */
@@ -187,6 +192,7 @@ struct thermal_zone_device {
struct list_head node;
struct delayed_work poll_queue;
enum thermal_notify_event notify_event;
+ enum thermal_action action;
};
/**
--
2.34.1
next prev parent reply other threads:[~2023-08-30 18:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-30 15:19 [PATCH v6 1/3] dt-bindings: thermal-zones: Document critical-action Fabio Estevam
2023-08-30 15:19 ` [PATCH v6 2/3] reboot: Introduce hw_protection_reboot() Fabio Estevam
2023-08-30 15:19 ` Fabio Estevam [this message]
2023-08-30 16:56 ` [PATCH v6 3/3] thermal: thermal_core: Allow rebooting after critical temp Fabio Estevam
2023-08-30 23:59 ` kernel test robot
2023-08-31 9:35 ` kernel test robot
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=20230830151908.2149847-3-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=amitk@kernel.org \
--cc=conor+dt@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@denx.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.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).