lkml.org 
[lkml]   [2018]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 013/220] platform/chrome: cros_ec_lpc: do not try DMI match when ACPI device found
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

    commit b410b1226620b6c959f1e9c87529acd058e90caf upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/platform/chrome/cros_ec_lpc.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    --- a/drivers/platform/chrome/cros_ec_lpc.c
    +++ b/drivers/platform/chrome/cros_ec_lpc.c
    @@ -435,7 +435,13 @@ static int __init cros_ec_lpc_init(void)
    int ret;
    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");
    return -ENODEV;
    }
    @@ -450,11 +456,6 @@ static int __init cros_ec_lpc_init(void)
    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) {
    /* Register the device, and it'll get hooked up automatically */
    ret = platform_device_register(&cros_ec_lpc_device);

    \
     
     \ /
      Last update: 2018-07-01 19:29    [W:4.121 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site