qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reboot: Introduce thermal_zone_device_critical_reboot() 

JIRA: https://issues.redhat.com/browse/RHEL-31848
Conflicts: reboot.c has some drift, upstream a8c959402d4d results in
	   a context issue in thermal_core.h

commit 79fa723ba84c2b1b3124c72df8a3b07b851a5477
Author: Fabio Estevam <festevam@denx.de>
Date:   Wed Nov 29 09:43:29 2023 -0300

    reboot: Introduce thermal_zone_device_critical_reboot()

    Introduce thermal_zone_device_critical_reboot() to trigger an
    emergency reboot.

    It is a counterpart of thermal_zone_device_critical() with the
    difference that it will force a reboot instead of shutdown.

    The motivation for doing this is to allow the thermal subystem
    to trigger a reboot when the temperature reaches the critical
    temperature.

    Signed-off-by: Fabio Estevam <festevam@denx.de>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Link: https://lore.kernel.org/r/20231129124330.519423-3-festevam@gmail.com

Signed-off-by: David Arcari <darcari@redhat.com>
This commit is contained in:
David Arcari 2024-04-04 10:48:33 -04:00
parent 8723061369
commit 9abc7ab739
4 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/thermal/thermal_core.c
View File

@ -331,6 +331,8 @@ static void thermal_zone_device_halt(struct thermal_zone_device *tz, bool shutdo
if (shutdown)
hw_protection_shutdown(msg, poweroff_delay_ms);
else
hw_protection_reboot(msg, poweroff_delay_ms);
}
void thermal_zone_device_critical(struct thermal_zone_device *tz)
@ -339,6 +341,11 @@ void thermal_zone_device_critical(struct thermal_zone_device *tz)
}
EXPORT_SYMBOL(thermal_zone_device_critical);
void thermal_zone_device_critical_reboot(struct thermal_zone_device *tz)
{
thermal_zone_device_halt(tz, false);
}
static void handle_critical_trips(struct thermal_zone_device *tz,
const struct thermal_trip *trip)
{

1
drivers/thermal/thermal_core.h
View File

@ -112,6 +112,7 @@ int thermal_zone_device_set_policy(struct thermal_zone_device *, char *);
int thermal_build_list_of_policies(char *buf);
void __thermal_zone_device_update(struct thermal_zone_device *tz,
enum thermal_notify_event event);
void thermal_zone_device_critical_reboot(struct thermal_zone_device *tz);
void thermal_governor_update_tz(struct thermal_zone_device *tz,
enum thermal_notify_event reason);

5
include/linux/reboot.h
View File

@ -161,6 +161,11 @@ extern void orderly_poweroff(bool force);
extern void orderly_reboot(void);
void __hw_protection_shutdown(const char *reason, int ms_until_forced, bool shutdown);
static inline void hw_protection_reboot(const char *reason, int ms_until_forced)
{
__hw_protection_shutdown(reason, ms_until_forced, false);
}
static inline void hw_protection_shutdown(const char *reason, int ms_until_forced)
{
__hw_protection_shutdown(reason, ms_until_forced, true);

28
kernel/reboot.c
View File

@ -837,19 +837,22 @@ static void hw_failure_emergency_poweroff(int poweroff_delay_ms)
}
/**
* __hw_protection_shutdown - Trigger an emergency system poweroff
* __hw_protection_shutdown - Trigger an emergency system shutdown or reboot
*
* @reason: Reason of emergency shutdown to be printed.
* @ms_until_forced: Time to wait for orderly shutdown before tiggering a
* forced shudown. Negative value disables the forced
* shutdown.
* @reason: Reason of emergency shutdown or reboot to be printed.
* @ms_until_forced: Time to wait for orderly shutdown or reboot before
* triggering it. Negative value disables the forced
* shutdown or reboot.
* @shutdown: If true, indicates that a shutdown will happen
* after the critical tempeature is reached.
* If false, indicates that a reboot will happen
* after the critical tempeature is reached.
*
* Initiate an emergency system shutdown in order to protect hardware from
* further damage. Usage examples include a thermal protection or a voltage or
* current regulator failures.
* NOTE: The request is ignored if protection shutdown is already pending even
* if the previous request has given a large timeout for forced shutdown.
* Can be called from any context.
* Initiate an emergency system shutdown or reboot in order to protect
* hardware from further damage. Usage examples include a thermal protection.
* NOTE: The request is ignored if protection shutdown or reboot is already
* pending even if the previous request has given a large timeout for forced
* shutdown/reboot.
*/
void __hw_protection_shutdown(const char *reason, int ms_until_forced, bool shutdown)
{
@ -870,9 +873,12 @@ void __hw_protection_shutdown(const char *reason, int ms_until_forced, bool shut
hw_failure_emergency_poweroff(ms_until_forced);
if (shutdown)
orderly_poweroff(true);
else
orderly_reboot();
out:
printk_prefer_direct_exit();
}
EXPORT_SYMBOL_GPL(__hw_protection_shutdown);
static int __init reboot_setup(char *str)
{