support thinkpad HKEY interface version 0x200

Hi,

Please kindly review following patch. It support new BIOS which shiped with Thinkpad X1 Carbon 2nd generation. Without it, hotkey mask be routed to wrong branch and some hot key will not work.

Thanks,
Shuduo

From: Shuduo Sang <[email protected]>
Date: Tue, 11 Mar 2014 20:13:15 +0800
Subject: [PATCH] support HKEY interface version 0x200

Thinkpad X1 Carbon 2nd generation ships with new BIOS will return HKEY interface version 0x200. It need thinkpad-acpi support otherwise it will be routed to wrong branch and hotkey mask is wrong.

---
 drivers/platform/x86/thinkpad_acpi.c | 39
+++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

b/drivers/platform/x86/thinkpad_acpi.c
index defb6af..939fc81 100644

@@ -3244,11 +3244,8 @@ static int __init hotkey_init(struct

ibm_init_struct *iibm)
A30, R30, R31, T20-22, X20-21, X22-24. Detected by checking for HKEY interface version 0x100 */
if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
- if ((hkeyv >> 8) != 1) {
- pr_err("unknown version of the HKEY interface: 0x%x\n",
- hkeyv);
- pr_err("please report this to %s\n", TPACPI_MAIL);
- } else {
+ switch (hkeyv >> 8) {
+ case 1:
/*
* MHKV 0x100 in A31, R40, R40e,
* T4x, X31, and later
@@ -3261,13 +3258,41 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
if (!acpi_evalf(hkey_handle, &hotkey_all_mask,
"MHKA", "qd")) {
pr_err("missing MHKA handler, "
- "please report this to %s\n",
- TPACPI_MAIL);
+ "please report this to %s\n",
+ TPACPI_MAIL);
/* Fallback: pre-init for FN+F3,F4,F12 */ hotkey_all_mask = 0x080cU;
} else {
tp_features.hotkey_mask = 1;
}
+ break;
+
+ case 2:
+ /*
+ * MHKV 0x200 in X1
+ */
+ vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,
+ "firmware HKEY interface version: 0x%x\n",
+ hkeyv);
+
+ /* Paranoia check AND init hotkey_all_mask */
+ if (!acpi_evalf(hkey_handle, &hotkey_all_mask,
+ "MHKA", "dd", 1)) {
+ pr_err("missing MHKA handler, "
+ "please report this to %s\n",
+ TPACPI_MAIL);
+ /* Fallback: pre-init for FN+F3,F4,F12 */
+ hotkey_all_mask = 0x080cU;
+ } else {
+ tp_features.hotkey_mask = 1;
+ }
+ break;
+
+ default:
+ pr_err("unknown version of the HKEY interface: 0x%x\n",
+ hkeyv);
+ pr_err("please report this to %s\n", TPACPI_MAIL);
+ break;
}
}

1.9.0

Can you guys get documentation on the new mode from Lenovo?

  "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

On Thu, Apr 3, 2014 at 11:44 PM, Henrique de Moraes Holschuh <hmh-N3TV7GIv+o9fyO9Q7EP/[email protected]

Yes, actually it's a joint-effort to officially enable X1 carbon 2nd generation by Canonical and Lenovo.

------------------------------------------------------------------------------

_______________________________________________
ibm-acpi-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

Ok. Feel free to contact me over private email if required.

  "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

Hi Matthew,

This patch is not in your recent for_linus branch. Why?

Thanks,
Shuduo

I'm sorry, I'd somehow missed it. I'll get it in the next pull.

Matthew Garrett <[email protected]>
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�

On Fri, Apr 11, 2014 at 9:43 PM, Matthew Garrett <matthew.garrett-05XSO3Yj/[email protected]

Thanks!

------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration Continuously Automate Build, Test & Deployment Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees

_______________________________________________
ibm-acpi-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

Hi Matthew,

I see Linus tree version continue to increase but seems you did not ask platform driver tree pull
and my third patch for thinkpad_acpi did not be upstreamed. May I know what cycle you used to
ask Linus pull?

Thanks,
Shuduo

------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
&#149; 3 signs your SCM is hindering your productivity
&#149; Requirements for releasing software faster
&#149; Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce

_______________________________________________
ibm-acpi-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

Hi Matthew,

Sorry for asking this again.
Just realize previous email was blocked by mailling list rule.

May I know when the platform driver tree will be pulled next time?

Thanks,
Shuduo

------------------------------------------------------------------------------
The best possible search technologies are now affordable for all companies. Download your FREE open source Enterprise Search Engine today! Our experts will assist you in its installation for $59/mo, no commitment. Test it for FREE on our Cloud platform anytime!
http://pubads.g.doubleclick.net/gampad/clk?id=145328191&iu=/4140/ostg.clktrk

_______________________________________________
ibm-acpi-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

Hi Matthew,

Sorry for asking this again.
Just realize previous email was blocked by mailling list rule.

May I know when the platform driver tree will be pulled next time?

Thanks,
Shuduo