kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

platform/chrome: cros_ec_lpc: do not try DMI match when ACPI device found

Browse source 
Older models of Chromebooks did not describe the LPC EC in their ACPI
tables; starting with Strago-based devices Google is using GOOG0004 device
to describe EC LPC.

DMI-based match is fragile and does not work reliably, especially when
using custom firmware. It is also not needed when we can locate the right
ACPI device, so let's stop bailing out when DMI does not match but the
right ACPI device is present.

Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Benson Leung <bleung@chromium.org>
This commit is contained in:
Dmitry Torokhov 2018-05-22 16:08:41 -07:00 committed by Benson Leung
parent 60cc43fc88
commit b410b12266
No known key found for this signature in database
GPG key ID: 1F09F57B0A2FE658
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/platform/chrome/cros_ec_lpc.c
View file

@ -435,7 +435,13 @@ static int __init cros_ec_lpc_init(void)
int ret; int ret;
acpi_status status; acpi_status status;
if (!dmi_check_system(cros_ec_lpc_dmi_table)) { status = acpi_get_devices(ACPI_DRV_NAME, cros_ec_lpc_parse_device,
&cros_ec_lpc_acpi_device_found, NULL);
if (ACPI_FAILURE(status))
pr_warn(DRV_NAME ": Looking for %s failed\n", ACPI_DRV_NAME);
if (!cros_ec_lpc_acpi_device_found &&
!dmi_check_system(cros_ec_lpc_dmi_table)) {
pr_err(DRV_NAME ": unsupported system.\n"); pr_err(DRV_NAME ": unsupported system.\n");
return -ENODEV; return -ENODEV;
} }
@ -450,11 +456,6 @@ static int __init cros_ec_lpc_init(void)
return ret; return ret;
} }
status = acpi_get_devices(ACPI_DRV_NAME, cros_ec_lpc_parse_device,
&cros_ec_lpc_acpi_device_found, NULL);
if (ACPI_FAILURE(status))
pr_warn(DRV_NAME ": Looking for %s failed\n", ACPI_DRV_NAME);
if (!cros_ec_lpc_acpi_device_found) { if (!cros_ec_lpc_acpi_device_found) {
/* Register the device, and it'll get hooked up automatically */ /* Register the device, and it'll get hooked up automatically */
ret = platform_device_register(&cros_ec_lpc_device); ret = platform_device_register(&cros_ec_lpc_device);