Newer ThinkPads have a totally different EC program information DMI
table. And thermal subdriver can't work without correct EC version.
Read from this entry if the old method failed to get EC information.
Signed-off-by: Jiaxun Yang <[email protected]>
---
drivers/platform/x86/thinkpad_acpi.c | 62 ++++++++++++++++++++++------
1 file changed, 49 insertions(+), 13 deletions(-)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 2e24ee42a3c6..17fd2065000b 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -9959,6 +9959,37 @@ static char __init tpacpi_parse_fw_id(const char * const s,
return '\0';
}
+static void find_new_ec_fwstr(const struct dmi_header *dm, void *private)
+{
+ char *ec_fw_string = (char *) private;
+ const char *dmi_data = (const char *)dm;
+ /*
+ * ThinkPad Embedded Controller Program Table on newer models
+ *
+ * Offset | Name | Width | Description
+ * ----------------------------------------------------
+ * 0x00 | Type | BYTE | 0x8C
+ * 0x01 | Length | BYTE |
+ * 0x02 | Handle | WORD | Varies
+ * 0x04 | Signature | BYTEx6 | ASCII for "LENOVO"
+ * 0x0A | OEM struct offset | BYTE | 0x0B
+ * 0x0B | OEM struct number | BYTE | 0x07, for this structure
+ * 0x0C | OEM struct revision | BYTE | 0x01, for this format
+ * 0x0D | ECP version ID | STR ID |
+ * 0x0E | ECP release date | STR ID |
+ */
+
+ /* Return if data structure not match */
+ if (dm->type != 140 || dm->length < 0x0F ||
+ memcmp(dmi_data + 4, "LENOVO", 6) != 0 ||
+ dmi_data[0x0A] != 0x0B || dmi_data[0x0B] != 0x07 ||
+ dmi_data[0x0C] != 0x01)
+ return;
+
+ /* fwstr is the first 8byte string */
+ strncpy(ec_fw_string, dmi_data + 0x0F, 8);
+}
+
/* returns 0 - probe ok, or < 0 - probe error.
* Probe ok doesn't mean thinkpad found.
* On error, kfree() cleanup on tp->* is not performed, caller must do it */
@@ -9966,7 +9997,7 @@ static int __must_check __init get_thinkpad_model_data(
struct thinkpad_id_data *tp)
{
const struct dmi_device *dev = NULL;
- char ec_fw_string[18];
+ char ec_fw_string[18] = {0};
char const *s;
char t;
@@ -10006,20 +10037,25 @@ static int __must_check __init get_thinkpad_model_data(
ec_fw_string) == 1) {
ec_fw_string[sizeof(ec_fw_string) - 1] = 0;
ec_fw_string[strcspn(ec_fw_string, " ]")] = 0;
+ break;
+ }
+ }
- tp->ec_version_str = kstrdup(ec_fw_string, GFP_KERNEL);
- if (!tp->ec_version_str)
- return -ENOMEM;
+ /* Newer ThinkPads have different EC program info table */
+ if (!ec_fw_string[0])
+ dmi_walk(find_new_ec_fwstr, &ec_fw_string);
- t = tpacpi_parse_fw_id(ec_fw_string,
- &tp->ec_model, &tp->ec_release);
- if (t != 'H') {
- pr_notice("ThinkPad firmware release %s doesn't match the known patterns\n",
- ec_fw_string);
- pr_notice("please report this to %s\n",
- TPACPI_MAIL);
- }
- break;
+ if (ec_fw_string[0]) {
+ tp->ec_version_str = kstrdup(ec_fw_string, GFP_KERNEL);
+ if (!tp->ec_version_str)
+ return -ENOMEM;
+
+ t = tpacpi_parse_fw_id(ec_fw_string,
+ &tp->ec_model, &tp->ec_release);
+ if (t != 'H') {
+ pr_notice("ThinkPad firmware release %s doesn't match the known patterns\n",
+ ec_fw_string);
+ pr_notice("please report this to %s\n", TPACPI_MAIL);
}
}
--
2.20.1
On Fri, Mar 08, 2019 at 09:14:26PM +0800, Jiaxun Yang wrote:
> Newer ThinkPads have a totally different EC program information DMI
> table. And thermal subdriver can't work without correct EC version.
>
> Read from this entry if the old method failed to get EC information.
>
> Signed-off-by: Jiaxun Yang <[email protected]>
> ---
> drivers/platform/x86/thinkpad_acpi.c | 62 ++++++++++++++++++++++------
> 1 file changed, 49 insertions(+), 13 deletions(-)
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
On Fri, Mar 8, 2019 at 3:15 PM Jiaxun Yang <[email protected]> wrote:
>
> Newer ThinkPads have a totally different EC program information DMI
> table. And thermal subdriver can't work without correct EC version.
>
> Read from this entry if the old method failed to get EC information.
>
Thank you for the patch. See my comments below.
> Signed-off-by: Jiaxun Yang <[email protected]>
> ---
> drivers/platform/x86/thinkpad_acpi.c | 62 ++++++++++++++++++++++------
> 1 file changed, 49 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index 2e24ee42a3c6..17fd2065000b 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -9959,6 +9959,37 @@ static char __init tpacpi_parse_fw_id(const char * const s,
> return '\0';
> }
>
> +static void find_new_ec_fwstr(const struct dmi_header *dm, void *private)
> +{
Today it's a new one, tomorrow something else might come. Care to use
versioning instead?
Something line find_ec_fwstr_vXYZ().
> +}
> - tp->ec_version_str = kstrdup(ec_fw_string, GFP_KERNEL);
> - if (!tp->ec_version_str)
> - return -ENOMEM;
>
> - t = tpacpi_parse_fw_id(ec_fw_string,
> - &tp->ec_model, &tp->ec_release);
> - if (t != 'H') {
> - pr_notice("ThinkPad firmware release %s doesn't match the known patterns\n",
> - ec_fw_string);
> - pr_notice("please report this to %s\n",
> - TPACPI_MAIL);
> - }
Seems to me that this is the same to below. Can you leave indentation
in place and fix it in a separate (following) patch?
> - break;
> + if (ec_fw_string[0]) {
> + tp->ec_version_str = kstrdup(ec_fw_string, GFP_KERNEL);
> + if (!tp->ec_version_str)
> + return -ENOMEM;
> +
> + t = tpacpi_parse_fw_id(ec_fw_string,
> + &tp->ec_model, &tp->ec_release);
> + if (t != 'H') {
> + pr_notice("ThinkPad firmware release %s doesn't match the known patterns\n",
> + ec_fw_string);
> + pr_notice("please report this to %s\n", TPACPI_MAIL);
> }
> }
--
With Best Regards,
Andy Shevchenko