Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e6bc5f6 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Andy Shevchenko
Browse files

platform/x86: thinkpad_acpi: silence HKEY 0x6032, 0x60f0, 0x6030 



Demote to debug level one existing thermal-control related event, and
also add two new ones that would otherwise trigger unknown event
warnings.  These events are Windows-only for now.

We do report them to userspace in case they become useful in the future.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Reported-by: default avatarJordan Glover <Golden_Miller83@protonmail.ch>
Tested-by: default avatarJordan Glover <Golden_Miller83@protonmail.ch>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 19e75205

Documentation/laptops/thinkpad-acpi.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -540,8 +540,10 @@ Events that are propagated by the driver to userspace: 
0x6021		ALARM: a sensor is too hot

0x6021		ALARM: a sensor is too hot

0x6022		ALARM: a sensor is extremely hot

0x6022		ALARM: a sensor is extremely hot

0x6030		System thermal table changed

0x6030		System thermal table changed

0x6032		Thermal Control command set completion  (DYTC, Windows)

0x6040		Nvidia Optimus/AC adapter related (TO BE VERIFIED)

0x6040		Nvidia Optimus/AC adapter related (TO BE VERIFIED)

0x60C0		X1 Yoga 2016, Tablet mode status changed

0x60C0		X1 Yoga 2016, Tablet mode status changed

0x60F0		Thermal Transformation changed (GMTS, Windows)





Battery nearly empty alarms are a last resort attempt to get the

Battery nearly empty alarms are a last resort attempt to get the

operating system to hibernate or shutdown cleanly (0x2313), or shutdown

operating system to hibernate or shutdown cleanly (0x2313), or shutdown

drivers/platform/x86/thinkpad_acpi.c

+17 −2
Original line number Original line Diff line number Diff line
@@ -212,7 +212,12 @@ enum tpacpi_hkey_event_t { 
	TP_HKEY_EV_ALARM_BAT_XHOT	= 0x6012, /* battery critically hot */

	TP_HKEY_EV_ALARM_BAT_XHOT	= 0x6012, /* battery critically hot */

	TP_HKEY_EV_ALARM_SENSOR_HOT	= 0x6021, /* sensor too hot */

	TP_HKEY_EV_ALARM_SENSOR_HOT	= 0x6021, /* sensor too hot */

	TP_HKEY_EV_ALARM_SENSOR_XHOT	= 0x6022, /* sensor critically hot */

	TP_HKEY_EV_ALARM_SENSOR_XHOT	= 0x6022, /* sensor critically hot */

	TP_HKEY_EV_THM_TABLE_CHANGED	= 0x6030, /* thermal table changed */

	TP_HKEY_EV_THM_TABLE_CHANGED	= 0x6030, /* windows; thermal table changed */

	TP_HKEY_EV_THM_CSM_COMPLETED    = 0x6032, /* windows; thermal control set

						   * command completed. Related to

						   * AML DYTC */

	TP_HKEY_EV_THM_TRANSFM_CHANGED  = 0x60F0, /* windows; thermal transformation

						   * changed. Related to AML GMTS */





	/* AC-related events */

	/* AC-related events */

	TP_HKEY_EV_AC_CHANGED		= 0x6040, /* AC status changed */

	TP_HKEY_EV_AC_CHANGED		= 0x6040, /* AC status changed */
@@ -4042,7 +4047,17 @@ static bool hotkey_notify_6xxx(const u32 hkey, 




	switch (hkey) {

	switch (hkey) {

	case TP_HKEY_EV_THM_TABLE_CHANGED:

	case TP_HKEY_EV_THM_TABLE_CHANGED:

		pr_info("EC reports that Thermal Table has changed\n");

		pr_debug("EC reports: Thermal Table has changed\n");

		/* recommended action: do nothing, we don't have

		 * Lenovo ATM information */

		return true;

	case TP_HKEY_EV_THM_CSM_COMPLETED:

		pr_debug("EC reports: Thermal Control Command set completed (DYTC)\n");

		/* recommended action: do nothing, we don't have

		 * Lenovo ATM information */

		return true;

	case TP_HKEY_EV_THM_TRANSFM_CHANGED:

		pr_debug("EC reports: Thermal Transformation changed (GMTS)\n");

		/* recommended action: do nothing, we don't have

		/* recommended action: do nothing, we don't have

		 * Lenovo ATM information */

		 * Lenovo ATM information */

		return true;

		return true;