Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
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 On 2014年05月06日 20:27, Shuduo Sang wrote: 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 > > > > On Fri, Apr 11, 2014 at 9:55 PM, Shuduo Sang wrote: > > > > > On Fri, Apr 11, 2014 at 9:43 PM, Matthew Garrett wrote: > > On Fri, 2014-04-11 at 21:10 +0800, Shuduo Sang wrote: > > Hi Matthew, > > > > This patch is not in your recent for_linus branch. Why? > > I'm sorry, I'd somehow missed it. I'll get it in the next pull. > > > Thanks! > > > -- > Matthew Garrett > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
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 On 2014年05月06日 20:27, Shuduo Sang wrote: 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 On Fri, Apr 11, 2014 at 9:55 PM, Shuduo Sang shuduo.s...@canonical.com wrote: On Fri, Apr 11, 2014 at 9:43 PM, Matthew Garrett matthew.garr...@nebula.com wrote: On Fri, 2014-04-11 at 21:10 +0800, Shuduo Sang wrote: Hi Matthew, This patch is not in your recent for_linus branch. Why? I'm sorry, I'd somehow missed it. I'll get it in the next pull. Thanks! -- Matthew Garrett matthew.garr...@nebula.com -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
On Fri, 2014-04-11 at 21:10 +0800, Shuduo Sang wrote: > Hi Matthew, > > This patch is not in your recent for_linus branch. Why? I'm sorry, I'd somehow missed it. I'll get it in the next pull. -- Matthew Garrett
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
Hi Matthew, This patch is not in your recent for_linus branch. Why? Thanks, Shuduo On Thu, Apr 3, 2014 at 11:44 PM, Henrique de Moraes Holschuh wrote: > On Tue, 11 Mar 2014, Shuduo Sang wrote: >> 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. > > Acked-by: Henrique de Moraes Holschuh > > 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 > > -- > ___ > ibm-acpi-devel mailing list > ibm-acpi-de...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
Hi Matthew, This patch is not in your recent for_linus branch. Why? Thanks, Shuduo On Thu, Apr 3, 2014 at 11:44 PM, Henrique de Moraes Holschuh h...@hmh.eng.br wrote: On Tue, 11 Mar 2014, Shuduo Sang wrote: 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. Acked-by: Henrique de Moraes Holschuh h...@hmh.eng.br 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 -- ___ ibm-acpi-devel mailing list ibm-acpi-de...@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
On Fri, 2014-04-11 at 21:10 +0800, Shuduo Sang wrote: Hi Matthew, This patch is not in your recent for_linus branch. Why? I'm sorry, I'd somehow missed it. I'll get it in the next pull. -- Matthew Garrett matthew.garr...@nebula.com
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
On Fri, 04 Apr 2014, Shuduo Sang wrote: > On Thu, Apr 3, 2014 at 11:44 PM, Henrique de Moraes Holschuh > wrote: > > > On Tue, 11 Mar 2014, Shuduo Sang wrote: > > > 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. > > > > Acked-by: Henrique de Moraes Holschuh > > > > Can you guys get documentation on the new mode from Lenovo? > > > > Yes, actually it's a joint-effort to officially enable X1 carbon 2nd > generation by Canonical and Lenovo. 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
On Tue, 11 Mar 2014, Shuduo Sang wrote: > 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. Acked-by: Henrique de Moraes Holschuh 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
On Tue, 11 Mar 2014, Shuduo Sang wrote: 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. Acked-by: Henrique de Moraes Holschuh h...@hmh.eng.br 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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [ibm-acpi-devel] [PATCH] support thinkpad HKEY interface version 0x200
On Fri, 04 Apr 2014, Shuduo Sang wrote: On Thu, Apr 3, 2014 at 11:44 PM, Henrique de Moraes Holschuh h...@hmh.eng.br wrote: On Tue, 11 Mar 2014, Shuduo Sang wrote: 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. Acked-by: Henrique de Moraes Holschuh h...@hmh.eng.br Can you guys get documentation on the new mode from Lenovo? Yes, actually it's a joint-effort to officially enable X1 carbon 2nd generation by Canonical and Lenovo. 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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] 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 3c67b2731a61539363a62284a43b98fa3e2ba784 Mon Sep 17 00:00:00 2001 From: Shuduo Sang 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. Signed-off-by: Bruce Ma Signed-off-by: Shuduo Sang --- drivers/platform/x86/thinkpad_acpi.c | 39 +--- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index defb6af..939fc81 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -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, , "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, _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, _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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] 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 3c67b2731a61539363a62284a43b98fa3e2ba784 Mon Sep 17 00:00:00 2001 From: Shuduo Sang shuduo.s...@canonical.com 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. Signed-off-by: Bruce Ma bruce...@canonical.com Signed-off-by: Shuduo Sang shuduo.s...@canonical.com --- drivers/platform/x86/thinkpad_acpi.c | 39 +--- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index defb6af..939fc81 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/