| Message ID | 20180424195605.17526-3-hmh@hmh.eng.br (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Andy Shevchenko |
| Headers | show |
On Tue, Apr 24, 2018 at 10:56 PM, Henrique de Moraes Holschuh <hmh@hmh.eng.br> wrote: > Do not consider unknown HKEY events in the 0x6000 range to be thermal > warnings. Instead, handle them as a generic unknown HKEY event, which > are reported to the kernel log at priority "notice", and do not trigger > a thermal registers state dump to the log. > All 3 are pushed to my review and testing queue, thanks! > Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> > Tested-by: Jordan Glover <Golden_Miller83@protonmail.ch> > --- > drivers/platform/x86/thinkpad_acpi.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index 3d70ef7e8a68..a0e9ce0d85b9 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -4039,8 +4039,6 @@ static bool hotkey_notify_6xxx(const u32 hkey, > bool *send_acpi_ev, > bool *ignore_acpi_ev) > { > - bool known = true; > - > /* 0x6000-0x6FFF: thermal alarms/notices and keyboard events */ > *send_acpi_ev = true; > *ignore_acpi_ev = false; > @@ -4107,13 +4105,12 @@ static bool hotkey_notify_6xxx(const u32 hkey, > return true; > > default: > - pr_warn("unknown possible thermal alarm or keyboard event received\n"); > - known = false; > + /* report simply as unknown, no sensor dump */ > + return false; > } > > thermal_dump_all_sensors(); > - > - return known; > + return true; > } > > static void hotkey_notify(struct ibm_struct *ibm, u32 event) > -- > 2.11.0 >
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 3d70ef7e8a68..a0e9ce0d85b9 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -4039,8 +4039,6 @@ static bool hotkey_notify_6xxx(const u32 hkey, bool *send_acpi_ev, bool *ignore_acpi_ev) { - bool known = true; - /* 0x6000-0x6FFF: thermal alarms/notices and keyboard events */ *send_acpi_ev = true; *ignore_acpi_ev = false; @@ -4107,13 +4105,12 @@ static bool hotkey_notify_6xxx(const u32 hkey, return true; default: - pr_warn("unknown possible thermal alarm or keyboard event received\n"); - known = false; + /* report simply as unknown, no sensor dump */ + return false; } thermal_dump_all_sensors(); - - return known; + return true; } static void hotkey_notify(struct ibm_struct *ibm, u32 event)