[PATCH] thinkpad-acpi: Some BIOS versions don't end in WW, remove check

[PATCH] thinkpad-acpi: Some BIOS versions don't end in WW, remove check

[Keith Packard]

My X201s BIOS version string is 6QET46V1 (1.16 ). The
EC version string is 6QHT28WW-1.09. The driver was requiring that both
of these have 'WW' in positions 6 and 7. I don't know what the
significance of having 'V1' there instead is, but removing the test
makes the driver load on my machine.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 drivers/platform/x86/thinkpad_acpi.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index eb99223..32f602e 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -8617,8 +8617,7 @@ static bool __pure __init tpacpi_is_valid_fw_id(const char* const s,
 		tpacpi_is_fw_digit(s[1]) &&
 		s[2] == t && s[3] == 'T' &&
 		tpacpi_is_fw_digit(s[4]) &&
-		tpacpi_is_fw_digit(s[5]) &&
-		s[6] == 'W' && s[7] == 'W';
+		tpacpi_is_fw_digit(s[5]);
 }
 
 /* returns 0 - probe ok, or < 0 - probe error.
-- 
1.7.4.1

Re: [PATCH] thinkpad-acpi: Some BIOS versions don't end in WW, remove check

[Henrique de Moraes Holschuh]

On Sun, 13 Mar 2011, Keith Packard wrote:
> My X201s BIOS version string is 6QET46V1 (1.16 ). The

This is not marked as a production release.

> EC version string is 6QHT28WW-1.09. The driver was requiring that both
> of these have 'WW' in positions 6 and 7. I don't know what the
> significance of having 'V1' there instead is, but removing the test
> makes the driver load on my machine.

I also don't know what V1 is, but Lenovo has shipped ThinkPads with firmware
that was not supposed to get shipped to the production lines at least
once...

On this case, it looks like someone forgot to give the 6QET46 the "WW" stamp
of aproval, or they shipped the image to the factory from the wrong point in
the QA pipeline.

Here:
http://www-307.ibm.com/pc/support/site.wss/document.do?lndocid=MIGR-74983

You will find the "summarized" changelogs of the firmware for the X201 (and
it looks like it is a good idea to upgrade based on those alone).  Near the
end of the page, there is a complete list of released firmware:

release  BIOS (BIOS ID) ECP (ECP ID)
	
1.32 	1.32 (6QET62WW)	1.12/1.12 (6QHT31WW / 6SHT31WW)
1.31 	1.31 (6QET61WW)	1.12/1.12 (6QHT31WW / 6SHT31WW)
1.22 	1.22 (6QET52WW)	1.11/1.11 (6QHT30WW / 6SHT30WW)
1.17 	1.17 (6QET47WW)	1.10/1.10 (6QHT29WW / 6SHT29WW)
1.16 	1.16 (6QET46WW)	1.09/1.09 (6QHT28WW / 6SHT28WW)
1.15 	1.15 (6QET45WW)	1.09/1.09 (6QHT28WW / 6SHT28WW)
1.14 	1.14 (6QET44WW)	1.09/1.09 (6QHT27WW / 6SHT27WW)
1.12 	1.12 (6QET42WW)	1.07/1.07 (6QHT26WW / 6SHT26WW)

It is interesting to notice that there is a single BIOS (6Q), but two
different EC firmware (6Q and 6S), make sure to use the correct one if you
try the update.

I am unsure of what would be the best course of action.  What you have is a
BIOS bug, probably with a released fix.  OTOH, the reason why I am so strict
on that string matching is that I don't want to match on strings if the game
changed under the driver, but that WW _really_ doesn't matter at all for the
driver (or the thinkpad) itself.

Maybe the driver should accept non-WW firmware, but warn the user to check
for firmware updates?

-- 
  "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: [PATCH] thinkpad-acpi: Some BIOS versions don't end in WW, remove check

[Henrique de Moraes Holschuh]

On Sun, 13 Mar 2011, Keith Packard wrote:
> My X201s BIOS version string is 6QET46V1 (1.16 ). The
> EC version string is 6QHT28WW-1.09. The driver was requiring that both
> of these have 'WW' in positions 6 and 7. I don't know what the
> significance of having 'V1' there instead is, but removing the test
> makes the driver load on my machine.

Keith, thanks for the patch.  It has been shipped in mainline for a while
now.  That V1 postfix means the factory shipped a pre-release BIOS image for
some reason.  That's not a first with Lenovo and ThinkPads.

http://www-307.ibm.com/pc/support/site.wss/document.do?lndocid=MIGR-74983
(check the .txt file link):

VERSION INFORMATION
  The following versions of BIOS and ECP (Embedded Controller Program) have
  been released to date.

  Package        BIOS (BIOS ID)  ECP       (ECP ID)             Rev.  Issue
Date
  -------------- --------------- -----------------------------  ----
----------
  1.34           1.34 (6QET64WW) 1.13/1.13 (6QHT32WW/6SHT32WW)  01
2011/03/23
  1.32           1.32 (6QET62WW) 1.12/1.12 (6QHT31WW/6SHT31WW)  01
2011/01/13
  1.31           1.31 (6QET61WW) 1.12/1.12 (6QHT31WW/6SHT31WW)  01
2010/11/12
  1.22           1.22 (6QET52WW) 1.11/1.11 (6QHT30WW/6SHT30WW)  01
2010/09/09
  1.17           1.17 (6QET47WW) 1.10/1.10 (6QHT29WW/6SHT29WW)  01
2010/07/30
  1.16           1.16 (6QET46WW) 1.09/1.09 (6QHT28WW/6SHT28WW)  01
2010/06/29
  1.15-1.09/1.09 1.15 (6QET45WW) 1.09/1.09 (6QHT28WW/6SHT28WW)  01
2010/05/19
  1.14-1.09/1.09 1.14 (6QET44WW) 1.09/1.09 (6QHT28WW/6SHT28WW)  02
2010/05/07
  1.14-1.09/1.09 1.14 (6QET44WW) 1.09/1.09 (6QHT28WW/6SHT28WW)  01
2010/04/23
  1.12-1.07/1.07 1.12 (6QET42WW) 1.07/1.07 (6QHT26WW/6SHT26WW)  01
2010/04/05
  1.09-1.06/1.06 1.09 (6QET39WW) 1.06/1.06 (6QHT25WW/6SHT25WW)  01
2010/03/03
  1.05-1.03/1.03 1.05 (6QET35WW) 1.03/1.03 (6QHT22WW/6SHT22WW)  01
2010/02/16

Notice that all public releases have the WW suffix.

The changelog in that .txt file worries me.  You might really want to update
if you're still at 1.16/1.09.

Anyway, I will add an extra patch to the driver to keep accepting non-WW
firmware, but to alert the user that something is weird and to check for a
BIOS update.  Since that might well still trigger on your box, I thought I
should drop you a direct note.

-- 
  "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] thinkpad-acpi: Some BIOS versions don't end in WW, remove check

[Henrique de Moraes Holschuh]

Hah, my brain seems to be stuck in a time loop.  Apologies for the
duplicated content/reply.

-- 
  "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