From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DB7BCA9EBC for ; Thu, 24 Oct 2019 21:29:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2349821D71 for ; Thu, 24 Oct 2019 21:29:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZoIO9H51" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729270AbfJXV3u (ORCPT ); Thu, 24 Oct 2019 17:29:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50146 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729153AbfJXV3u (ORCPT ); Thu, 24 Oct 2019 17:29:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571952588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JobxRVr+NwVjfSR8ziaS3yVKI9oYnBsWZ+xmwOL53ig=; b=ZoIO9H51ywIpprzjlDo5j4/4fgLUztmyIrTFDMdjdsd4eAz/bz+RTKGgLYOT9SEAofINQB MJY3fGdeattMuvzyJg3fKpxxrBwlH7G1N2Z8DpsMe03NOG00+dQeg7d/cPZfI1/UelV3Y7 GLwuwh+uxR/tAfF+AoDMgjSW69Yqa6Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-SRF8guhFOde6PXpQUWSUHQ-1; Thu, 24 Oct 2019 17:29:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 204DB476; Thu, 24 Oct 2019 21:29:44 +0000 (UTC) Received: from shalem.localdomain.com (unknown [10.36.118.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C32860BE0; Thu, 24 Oct 2019 21:29:42 +0000 (UTC) From: Hans de Goede To: "Rafael J . Wysocki" , Len Brown Cc: Hans de Goede , Andy Shevchenko , Mika Westerberg , linux-acpi@vger.kernel.org, Pierre-Louis Bossart , stable@vger.kernel.org Subject: [PATCH 3/3] ACPI / LPSS: Add dmi quirk for skipping _DEP check for some device-links Date: Thu, 24 Oct 2019 23:29:36 +0200 Message-Id: <20191024212936.144648-3-hdegoede@redhat.com> In-Reply-To: <20191024212936.144648-1-hdegoede@redhat.com> References: <20191024212936.144648-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: SRF8guhFOde6PXpQUWSUHQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org The iGPU / GFX0 device's _PS0 method on the ASUS T200TA depends on the I2C1 controller (which is connected to the embedded controller). But unlike in the T100TA/T100CHI this dependency is not listed in the _DEP of the GFX0 device. This results in the dev_WARN_ONCE(..., "Transfer while suspended\n") call in i2c-designware-master.c triggering and the AML code not working as it should. This commit fixes this by adding a dmi based quirk mechanism for devices which miss a _DEP, and adding a quirk for the LNXVIDEO depending on the I2C1 device on the Asus T200TA. Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede --- drivers/acpi/acpi_lpss.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index cd8cf3333f04..751ed38f2a10 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -463,6 +464,18 @@ struct lpss_device_links { =09const char *consumer_hid; =09const char *consumer_uid; =09u32 flags; +=09const struct dmi_system_id *dep_missing_ids; +}; + +/* Please keep this list sorted alphabetically by vendor and model */ +static const struct dmi_system_id i2c1_dep_missing_dmi_ids[] =3D { +=09{ +=09=09.matches =3D { +=09=09=09DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), +=09=09=09DMI_MATCH(DMI_PRODUCT_NAME, "T200TA"), +=09=09}, +=09}, +=09{} }; =20 /* @@ -478,7 +491,8 @@ static const struct lpss_device_links lpss_device_links= [] =3D { =09/* CHT iGPU depends on PMIC I2C controller */ =09{"808622C1", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME}, =09/* BYT iGPU depends on the Embedded Controller I2C controller (UID 1) *= / -=09{"80860F41", "1", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME}, +=09{"80860F41", "1", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME, +=09 i2c1_dep_missing_dmi_ids}, =09/* BYT CR iGPU depends on PMIC I2C controller (UID 5 on CR) */ =09{"80860F41", "5", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME}, =09/* BYT iGPU depends on PMIC I2C controller (UID 7 on non CR) */ @@ -577,7 +591,8 @@ static void acpi_lpss_link_consumer(struct device *dev1= , =09if (!dev2) =09=09return; =20 -=09if (acpi_lpss_dep(ACPI_COMPANION(dev2), ACPI_HANDLE(dev1))) +=09if ((link->dep_missing_ids && dmi_check_system(link->dep_missing_ids)) +=09 || acpi_lpss_dep(ACPI_COMPANION(dev2), ACPI_HANDLE(dev1))) =09=09device_link_add(dev2, dev1, link->flags); =20 =09put_device(dev2); @@ -592,7 +607,8 @@ static void acpi_lpss_link_supplier(struct device *dev1= , =09if (!dev2) =09=09return; =20 -=09if (acpi_lpss_dep(ACPI_COMPANION(dev1), ACPI_HANDLE(dev2))) +=09if ((link->dep_missing_ids && dmi_check_system(link->dep_missing_ids)) +=09 || acpi_lpss_dep(ACPI_COMPANION(dev1), ACPI_HANDLE(dev2))) =09=09device_link_add(dev1, dev2, link->flags); =20 =09put_device(dev2); --=20 2.23.0