Re: patchthinkpad-acpi-fix-incorrect-use-of-tpacpi_brght_mode_ecnvram.patch addedto 2.6.30-stable tree

[Henrique de Moraes Holschuh]

On Fri, 07 Aug 2009, Stefan Lippers-Hollmann wrote:
> This patch fails to compile if applied to 2.6.30 + current stable queue.
[...]
> It seems to depend on the new quirk handling, introduced in:
> commit 7d95a3d564901e88ed42810f054e579874151999

Good catch.  And I _will_ need that quirk handling stuff to keep 2.6.30 in
shape :-(

The dependencies for the "thinkpad-acpi: fix incorrect use of
TPACPI_BRGHT_MODE_ECNVRAM" patch are:

commit 050df107c408a3df048524b3783a5fc6d4dccfdb
Author: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx>
Date:   Sat May 30 13:25:05 2009 -0300

    thinkpad-acpi: store fw version with strict checking

    Extend the thinkpad model and firmware identification data with the
    release serial number for the BIOS and firmware (when available), as
    that is easier to parse and compare than the version strings.

    We're going to greatly extend the use of the ThinkPad DMI data through
    quirk lists, so it is best to be quite strict and make sure what we
    get from DMI is exactly what we expect, otherwise quirk matching may
    result in quite insane things.

    IBM (and Lenovo, at least for the ThinkPad line) uses this schema for
    firmware versioning and model:

    Firmware model: Two digits, [0-9A-Z]

    Firmware version: AABBCCDD, where
      AA = firmware model, see above
      BB = "ET" for BIOS, "HT" for EC
      CC = release version, two digits, [0-9A-Z],
           "00" < "09" < "0A" < "10" < "A0" < "ZZ"
      DD = "WW"

    Signed-off-by: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx>
    Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

And, as identified by Stefan,

commit 7d95a3d564901e88ed42810f054e579874151999
Author: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx>
Date:   Sat May 30 13:25:06 2009 -0300

    thinkpad-acpi: add quirklist engine

    Add a quirklist engine suitable for matching ThinkPad firmware,
    and change the code to use it.

    Signed-off-by: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx>
    Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

I cherry picked the commits on the order below, on top of v2.6.30.4 and it
compiled properly (and visual inspection of the result shows it is fine):

050df107c408a3df048524b3783a5fc6d4dccfdb
7d95a3d564901e88ed42810f054e579874151999
59fe4fe34d7afdf63208124f313be9056feaa2f4

Now, commit 7d95a3d564901e88ed42810f054e579874151999 could be reduced a bit
for -stable if you guys prefer (only the first hunk is really necessary),
but that would just make things more complicated later on if I find myself
in need to patch anything in the fan control subdriver for 2.6.30.y
(unlikely, but still...)

-- 
  "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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/