[PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[Richard Hartmann]

Handle HKEY event generated on AC power change. The current message
asks users to submit data related to this event which leads to
a lot of confusion and noise on the mailing list.

The following is a list affected models and 'Message-Id'
from ibm-acpi-devel@lists.sourceforge.net of people who saw this
event when either plugging or unplugging the AC adapter or
docking or undocking their laptop.

X120e - CAAAujb5v9dHdbdxDVvhNJoG4UrZC1TgKqeB_zGpAy7q8kZHMEQ@mail.gmail.com
X121e - 20120817143459.GB3462@x1.osrc.amd.com
X220  - Confirmed by Richard Hartmann
X220i - 4F406274.7070807@gmail.com
X220t - 4F489F5B.9040705@cs.tu-berlin.de
X230  - CAKx4u7kqvVH0-gstomsiVYdGC0i6=bGxzaQ8sq9gbg76TGme3w@mail.gmail.com
T420  - 9c848ee30b006737d0534d906bab0cf6@niklaas-baudet.net
T420s - 20120608080824.GS25324@hexapodia.org
W520  - 20121008181050.GF2549@ericlaptop.home.christensenplace.us

Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
---
 drivers/platform/x86/thinkpad_acpi.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 75dd651..15e2bba 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -209,9 +209,8 @@ enum tpacpi_hkey_event_t {
 	TP_HKEY_EV_ALARM_SENSOR_XHOT	= 0x6022, /* sensor critically hot */
 	TP_HKEY_EV_THM_TABLE_CHANGED	= 0x6030, /* thermal table changed */
 
-	TP_HKEY_EV_UNK_6040		= 0x6040, /* Related to AC change?
-						     some sort of APM hint,
-						     W520 */
+	/* AC-related events */
+	TP_HKEY_EV_AC_CHANGED		= 0x6040, /* AC status changed */
 
 	/* Misc */
 	TP_HKEY_EV_RFKILL_CHANGED	= 0x7000, /* rfkill switch changed */
@@ -3629,6 +3628,12 @@ static bool hotkey_notify_6xxx(const u32 hkey,
 			 "a sensor reports something is extremely hot!\n");
 		/* recommended action: immediate sleep/hibernate */
 		break;
+	case TP_HKEY_EV_AC_CHANGED:
+		/* X120e, X121e, X220, X220i, X220t, X230, T420, T420s, W520:
+		 * AC status changed; can be triggered by plugging or
+		 * unplugging AC adapter, docking or undocking. */
+
+		/* fallthrough */
 
 	case TP_HKEY_EV_KEY_NUMLOCK:
 	case TP_HKEY_EV_KEY_FN:
-- 
1.7.10.4

Re: [ibm-acpi-devel] [PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[Henrique de Moraes Holschuh]

On Sat, 29 Dec 2012, Richard Hartmann wrote:
> Handle HKEY event generated on AC power change. The current message
> asks users to submit data related to this event which leads to
> a lot of confusion and noise on the mailing list.
> 
> The following is a list affected models and 'Message-Id'
> from ibm-acpi-devel@lists.sourceforge.net of people who saw this
> event when either plugging or unplugging the AC adapter or
> docking or undocking their laptop.
> 
> X120e - CAAAujb5v9dHdbdxDVvhNJoG4UrZC1TgKqeB_zGpAy7q8kZHMEQ@mail.gmail.com
> X121e - 20120817143459.GB3462@x1.osrc.amd.com
> X220  - Confirmed by Richard Hartmann
> X220i - 4F406274.7070807@gmail.com
> X220t - 4F489F5B.9040705@cs.tu-berlin.de
> X230  - CAKx4u7kqvVH0-gstomsiVYdGC0i6=bGxzaQ8sq9gbg76TGme3w@mail.gmail.com
> T420  - 9c848ee30b006737d0534d906bab0cf6@niklaas-baudet.net
> T420s - 20120608080824.GS25324@hexapodia.org
> W520  - 20121008181050.GF2549@ericlaptop.home.christensenplace.us
> 
> Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>

Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>

> ---
>  drivers/platform/x86/thinkpad_acpi.c |   11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index 75dd651..15e2bba 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -209,9 +209,8 @@ enum tpacpi_hkey_event_t {
>  	TP_HKEY_EV_ALARM_SENSOR_XHOT	= 0x6022, /* sensor critically hot */
>  	TP_HKEY_EV_THM_TABLE_CHANGED	= 0x6030, /* thermal table changed */
>  
> -	TP_HKEY_EV_UNK_6040		= 0x6040, /* Related to AC change?
> -						     some sort of APM hint,
> -						     W520 */
> +	/* AC-related events */
> +	TP_HKEY_EV_AC_CHANGED		= 0x6040, /* AC status changed */
>  
>  	/* Misc */
>  	TP_HKEY_EV_RFKILL_CHANGED	= 0x7000, /* rfkill switch changed */
> @@ -3629,6 +3628,12 @@ static bool hotkey_notify_6xxx(const u32 hkey,
>  			 "a sensor reports something is extremely hot!\n");
>  		/* recommended action: immediate sleep/hibernate */
>  		break;
> +	case TP_HKEY_EV_AC_CHANGED:
> +		/* X120e, X121e, X220, X220i, X220t, X230, T420, T420s, W520:
> +		 * AC status changed; can be triggered by plugging or
> +		 * unplugging AC adapter, docking or undocking. */
> +
> +		/* fallthrough */
>  
>  	case TP_HKEY_EV_KEY_NUMLOCK:
>  	case TP_HKEY_EV_KEY_FN:

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh

Re: [ibm-acpi-devel] [PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[Henrique de Moraes Holschuh]

On Sun, 30 Dec 2012, Richard Hartmann wrote:
> On Sun, Dec 30, 2012 at 3:00 AM, Henrique de Moraes Holschuh <hmh@hmh.eng.br
> > wrote:
> 
> > Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
> >
> 
> Thanks for the two ACKs.
> 
> Just to make sure: From how I read the (outdated) Copyright section, you
> are the maintainer of thinkpad_acpi and thus will copy over the ACKs into
> my commit message, merge, and forward into what will become 3.9 at some
> point, correct?

Usually the subsystem maintainer picks such simple patches and ACKs directly
from the platform-driver-x86 list email, adds his signed-of-by, and
eventually sends it to Linus.

For this "obviously correct" single-code-line fix, we might even lucky
out and it could make it to 3.8, depends on his judgment.

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh

Re: [ibm-acpi-devel] [PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[Richard Hartmann]

On Mon, Dec 31, 2012 at 2:45 AM, Henrique de Moraes Holschuh
<hmh@hmh.eng.br> wrote:

> Usually the subsystem maintainer picks such simple patches and ACKs directly
> from the platform-driver-x86 list email, adds his signed-of-by, and
> eventually sends it to Linus.

Just so this does not get lost, neither Linus' tree nor [1] carry this
patch, yet. Is there anything more I can/should do?


> For this "obviously correct" single-code-line fix, we might even lucky
> out and it could make it to 3.8, depends on his judgment.

Sadly, no.


Thanks,
Richard

[1] git://cavan.codon.org.uk/platform-drivers-x86.git

Re: [PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[Borislav Petkov]

On Sat, Dec 29, 2012 at 10:51:49PM +0100, Richard Hartmann wrote:
> Handle HKEY event generated on AC power change. The current message
> asks users to submit data related to this event which leads to
> a lot of confusion and noise on the mailing list.
> 
> The following is a list affected models and 'Message-Id'
> from ibm-acpi-devel@lists.sourceforge.net of people who saw this
> event when either plugging or unplugging the AC adapter or
> docking or undocking their laptop.
> 
> X120e - CAAAujb5v9dHdbdxDVvhNJoG4UrZC1TgKqeB_zGpAy7q8kZHMEQ@mail.gmail.com
> X121e - 20120817143459.GB3462@x1.osrc.amd.com
> X220  - Confirmed by Richard Hartmann
> X220i - 4F406274.7070807@gmail.com
> X220t - 4F489F5B.9040705@cs.tu-berlin.de
> X230  - CAKx4u7kqvVH0-gstomsiVYdGC0i6=bGxzaQ8sq9gbg76TGme3w@mail.gmail.com
> T420  - 9c848ee30b006737d0534d906bab0cf6@niklaas-baudet.net
> T420s - 20120608080824.GS25324@hexapodia.org
> W520  - 20121008181050.GF2549@ericlaptop.home.christensenplace.us
> 
> Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>

Acked-by: Borislav Petkov <bp@alien8.de>

-- 
Regards/Gruss,
Boris.

[PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[Richard Hartmann]

Handle HKEY event generated on AC power change. The current message
asks users to submit data related to this event which leads to
a lot of confusion and noise on the mailing list.

The following is a list of causes, affected models, and 'message-id'
from ibm-acpi-devel@lists.sourceforge.net :

AC plug/unplug:

X120e - CAAAujb5v9dHdbdxDVvhNJoG4UrZC1TgKqeB_zGpAy7q8kZHMEQ@mail.gmail.com
x121e - 20120817143459.GB3462@x1.osrc.amd.com
X220  - Confirmed by Richard Hartmann
X220i - 4F406274.7070807@gmail.com
X220t - 4F489F5B.9040705@cs.tu-berlin.de
X230  - CAKx4u7kqvVH0-gstomsiVYdGC0i6=bGxzaQ8sq9gbg76TGme3w@mail.gmail.com
T420  - 9c848ee30b006737d0534d906bab0cf6@niklaas-baudet.net
T420s - 20120608080824.GS25324@hexapodia.org
W520  - 20121008181050.GF2549@ericlaptop.home.christensenplace.us

Lid closed/openend:

X220  - 4F4124DF.5030205@gmail.com
        Could not be confirmed by author

Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
---
 drivers/platform/x86/thinkpad_acpi.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 75dd651..2645084 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -209,9 +209,8 @@ enum tpacpi_hkey_event_t {
 	TP_HKEY_EV_ALARM_SENSOR_XHOT	= 0x6022, /* sensor critically hot */
 	TP_HKEY_EV_THM_TABLE_CHANGED	= 0x6030, /* thermal table changed */
 
-	TP_HKEY_EV_UNK_6040		= 0x6040, /* Related to AC change?
-						     some sort of APM hint,
-						     W520 */
+	/* AC-related events */
+	TP_HKEY_EV_AC_CHANGED		= 0x6040, /* AC status changed */
 
 	/* Misc */
 	TP_HKEY_EV_RFKILL_CHANGED	= 0x7000, /* rfkill switch changed */
@@ -3629,6 +3628,13 @@ static bool hotkey_notify_6xxx(const u32 hkey,
 			 "a sensor reports something is extremely hot!\n");
 		/* recommended action: immediate sleep/hibernate */
 		break;
+	case TP_HKEY_EV_AC_CHANGED:
+		pr_info("AC status has changed\n");
+		/* X120e, x121e, X220, X220i, X220t, X230, T420, T420s, W520:
+		 * AC status changed; can be triggered by plugging or
+		 * unplugging AC adapter, docking or undocking, or closing
+		 * or opening the lid. */
+		break;
 
 	case TP_HKEY_EV_KEY_NUMLOCK:
 	case TP_HKEY_EV_KEY_FN:
-- 
1.7.10.4

Re: [PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[Borislav Petkov]

On Wed, Dec 26, 2012 at 06:46:13PM +0100, Richard Hartmann wrote:
> Handle HKEY event generated on AC power change. The current message
> asks users to submit data related to this event which leads to
> a lot of confusion and noise on the mailing list.
> 
> The following is a list of causes, affected models, and 'message-id'
> from ibm-acpi-devel@lists.sourceforge.net :
> 
> AC plug/unplug:
> 
> X120e - CAAAujb5v9dHdbdxDVvhNJoG4UrZC1TgKqeB_zGpAy7q8kZHMEQ@mail.gmail.com
> x121e - 20120817143459.GB3462@x1.osrc.amd.com
> X220  - Confirmed by Richard Hartmann
> X220i - 4F406274.7070807@gmail.com
> X220t - 4F489F5B.9040705@cs.tu-berlin.de
> X230  - CAKx4u7kqvVH0-gstomsiVYdGC0i6=bGxzaQ8sq9gbg76TGme3w@mail.gmail.com
> T420  - 9c848ee30b006737d0534d906bab0cf6@niklaas-baudet.net
> T420s - 20120608080824.GS25324@hexapodia.org
> W520  - 20121008181050.GF2549@ericlaptop.home.christensenplace.us
> 
> Lid closed/openend:
> 
> X220  - 4F4124DF.5030205@gmail.com
>         Could not be confirmed by author
> 
> Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
> ---
>  drivers/platform/x86/thinkpad_acpi.c |   12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index 75dd651..2645084 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -209,9 +209,8 @@ enum tpacpi_hkey_event_t {
>  	TP_HKEY_EV_ALARM_SENSOR_XHOT	= 0x6022, /* sensor critically hot */
>  	TP_HKEY_EV_THM_TABLE_CHANGED	= 0x6030, /* thermal table changed */
>  
> -	TP_HKEY_EV_UNK_6040		= 0x6040, /* Related to AC change?
> -						     some sort of APM hint,
> -						     W520 */
> +	/* AC-related events */
> +	TP_HKEY_EV_AC_CHANGED		= 0x6040, /* AC status changed */
>  
>  	/* Misc */
>  	TP_HKEY_EV_RFKILL_CHANGED	= 0x7000, /* rfkill switch changed */
> @@ -3629,6 +3628,13 @@ static bool hotkey_notify_6xxx(const u32 hkey,
>  			 "a sensor reports something is extremely hot!\n");
>  		/* recommended action: immediate sleep/hibernate */
>  		break;
> +	case TP_HKEY_EV_AC_CHANGED:
> +		pr_info("AC status has changed\n");
> +		/* X120e, x121e, X220, X220i, X220t, X230, T420, T420s, W520:
> +		 * AC status changed; can be triggered by plugging or
> +		 * unplugging AC adapter, docking or undocking, or closing
> +		 * or opening the lid. */
> +		break;

It looks like a pretty useless message to me, AFAICT. If it is only an
APM hint, then we probably shouldn't say anything in dmesg but simply
ignore it.

I mean, do I additionally want to know that I just connected to AC after
I just plugged the cable in? There's this green lamp on the side, doh!
:-)

Thanks.

-- 
Regards/Gruss,
Boris.

Re: [PATCH] drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040

[Henrique de Moraes Holschuh]

On Wed, 26 Dec 2012, Richard Hartmann wrote:
> +	case TP_HKEY_EV_AC_CHANGED:
> +		pr_info("AC status has changed\n");
> +		/* X120e, x121e, X220, X220i, X220t, X230, T420, T420s, W520:
> +		 * AC status changed; can be triggered by plugging or
> +		 * unplugging AC adapter, docking or undocking, or closing
> +		 * or opening the lid. */
> +		break;
>  
>  	case TP_HKEY_EV_KEY_NUMLOCK:
>  	case TP_HKEY_EV_KEY_FN:

I guess we can drop that pr_info, and please block the issuing of the
event to userspace, like this:

case TP_HKEY_EV_AC_CHANGED:
/* X120e, x121e, X220, X220i, X220t, X230, T420, T420s, W520:
 * AC status changed; can be triggered by plugging or
 * unplugging AC adapter, docking or undocking, or closing
 * or opening the lid. */

/* fallthrough */

and letting it proceed to the TP_HKEY_EV_KEY_NUMLOCK block.

Also, do we have any confirmed reports about the lid switch
causing event 0x6040?  It doesn't look right... the comment
might need to be updated.

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh