[kernel] r22660 - in dists/jessie/linux/debian: . patches patches/features/x86

[Ben Hutchings]

Author: benh
Date: Mon May 18 00:51:13 2015
New Revision: 22660

Log:
[x86] thinkpad_acpi: support new BIOS version string pattern (Closes: #780467)

Added:
   dists/jessie/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch
Modified:
   dists/jessie/linux/debian/changelog
   dists/jessie/linux/debian/patches/series

Modified: dists/jessie/linux/debian/changelog
==============================================================================
--- dists/jessie/linux/debian/changelog	Mon May 18 00:50:11 2015	(r22659)
+++ dists/jessie/linux/debian/changelog	Mon May 18 00:51:13 2015	(r22660)
@@ -156,6 +156,8 @@
     - rtc: hctosys: use function name in the error log
   * [x86] Input: synaptics: Fix routing of trackpoint buttons on Lenovo
     2015 models (Closes: #780862)
+  * [x86] thinkpad_acpi: support new BIOS version string pattern
+    (Closes: #780467)
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

Added: dists/jessie/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch	Mon May 18 00:51:13 2015	(r22660)
@@ -0,0 +1,56 @@
+From: Adam Lee <adam.lee at canonical.com>
+Date: Wed, 11 Feb 2015 13:43:10 +0800
+Subject: thinkpad_acpi: support new BIOS version string pattern
+Origin: https://git.kernel.org/linus/1b0eb5bc241354aa854671fdf02132d2d1452bdf
+Bug-Debian: https://bugs.debian.org/780467
+
+Latest ThinkPad models use a new string pattern of BIOS version,
+thinkpad_acpi won't be loaded automatically without this fix.
+
+Signed-off-by: Adam Lee <adam.lee at canonical.com>
+
+Intentatation cleanup.
+
+Signed-off-by: Darren Hart <dvhart at linux.intel.com>
+[bwh: Backported to 3.16: adjust context]
+---
+ drivers/platform/x86/thinkpad_acpi.c | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+--- a/drivers/platform/x86/thinkpad_acpi.c
++++ b/drivers/platform/x86/thinkpad_acpi.c
+@@ -8793,17 +8793,31 @@ static bool __pure __init tpacpi_is_fw_d
+ 	return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z');
+ }
+ 
+-/* Most models: xxyTkkWW (#.##c); Ancient 570/600 and -SL lacks (#.##c) */
+ static bool __pure __init tpacpi_is_valid_fw_id(const char* const s,
+ 						const char t)
+ {
+-	return s && strlen(s) >= 8 &&
++	/*
++	 * Most models: xxyTkkWW (#.##c)
++	 * Ancient 570/600 and -SL lacks (#.##c)
++	 */
++	if (s && strlen(s) >= 8 &&
+ 		tpacpi_is_fw_digit(s[0]) &&
+ 		tpacpi_is_fw_digit(s[1]) &&
+ 		s[2] == t &&
+ 		(s[3] == 'T' || s[3] == 'N') &&
+ 		tpacpi_is_fw_digit(s[4]) &&
+-		tpacpi_is_fw_digit(s[5]);
++		tpacpi_is_fw_digit(s[5]))
++		return true;
++
++	/* New models: xxxyTkkW (#.##c); T550 and some others */
++	return s && strlen(s) >= 8 &&
++		tpacpi_is_fw_digit(s[0]) &&
++		tpacpi_is_fw_digit(s[1]) &&
++		tpacpi_is_fw_digit(s[2]) &&
++		s[3] == t &&
++		(s[4] == 'T' || s[4] == 'N') &&
++		tpacpi_is_fw_digit(s[5]) &&
++		tpacpi_is_fw_digit(s[6]);
+ }
+ 
+ /* returns 0 - probe ok, or < 0 - probe error.

Modified: dists/jessie/linux/debian/patches/series
==============================================================================
--- dists/jessie/linux/debian/patches/series	Mon May 18 00:50:11 2015	(r22659)
+++ dists/jessie/linux/debian/patches/series	Mon May 18 00:51:13 2015	(r22660)
@@ -592,3 +592,4 @@
 bugfix/x86/input-synaptics-retrieve-the-extended-capabilities-i.patch
 bugfix/x86/input-synaptics-remove-topbuttonpad-property-for-len.patch
 bugfix/x86/input-synaptics-re-route-tracksticks-buttons-on-the-.patch
+features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch