From patchwork Mon Oct 29 22:17:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 10660305 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55E3213B5 for ; Mon, 29 Oct 2018 22:17:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33C9928D64 for ; Mon, 29 Oct 2018 22:17:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2629829C98; Mon, 29 Oct 2018 22:17:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A838028D64 for ; Mon, 29 Oct 2018 22:17:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727676AbeJ3HHq (ORCPT ); Tue, 30 Oct 2018 03:07:46 -0400 Received: from mail-oi1-f202.google.com ([209.85.167.202]:37072 "EHLO mail-oi1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727639AbeJ3HHp (ORCPT ); Tue, 30 Oct 2018 03:07:45 -0400 Received: by mail-oi1-f202.google.com with SMTP id t68-v6so8281106oih.4 for ; Mon, 29 Oct 2018 15:17:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=v2rMXvzKWECS79zyMLwtUWxdg5/xyv6bQsMHck8PeHs=; b=LUCJ4X6onUxUt+WiTRlTWYzC2I5Qs7dVa42ShD2nZxYWJSLPs9VeRT0iXu6rbPPmre qYEDlYXyyIk4zJTU/u7sMPSmX+Iau0sMeoXPV1EwFkfHExPObyFVY+ySelIRTInAASL4 Urg8zM/rexr8FgHKuI1D3e2sSXn0ValX4gAjS/awKJ2Vfd7a3CI/Q5H60Z75cTPTSUx/ 1Q90nK6Tu+zwTlH/8jzH6hWQV5j/KhQq3jPVQLidwTUN2KM3Y/se4EjtdrCf7W6BFbNq wvKGretz1Gu4nBJi7sdj8JxxgtoZIGpR0LlSk3yJ5VUqCnAxzjiz4QISLhFybbTUNrlG tO2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=v2rMXvzKWECS79zyMLwtUWxdg5/xyv6bQsMHck8PeHs=; b=MsBmQvM2COKXlkuxjOGf56QeDn/377Y41pP1HfGH5hdO+/UjWlwy65bZF5iFjmbEUy wVHwqNXNmRGaaP+y62JjEEJMBAh+ZVLCX3zie08BctHRJXDD3W/rdj/JPvVcs8FNkpg+ UEMviUDneTpnuIT24N/lHC7by3L++CxBeojXgL1rQUo7r51e0T7T4f1YzWSBYrQsaTIG hB5VuPAIapf37EhEWLIbSUosdljJSkQGOsXOY/eVa9B22eVy4FJTwyGcVNWuj2wTMTZr 4cvM4HLKmasqSbfLKdLIv8u1qpgXwNiRMUssQ9QKkyGqtB1KAZz8BGy/pP0TQI4oqTjt 7gSA== X-Gm-Message-State: AGRZ1gI8Uej9jGlxy2+AQj55vs7ZXZCI4Mg7DAhWtzLhoXwBRe+i8MT2 etNVANTGnitFoZjKuDoJ/5QiBJdkNv0C X-Google-Smtp-Source: AJdET5dBlSMM8lfjYMLAqPBijGOAbWSEAXhg9dhXCJwZUCFL5/Zq0I4DXXXV89TAzIbUCX4ehV1czbF9DzTO X-Received: by 2002:a9d:6552:: with SMTP id q18mr11827520otl.37.1540851425913; Mon, 29 Oct 2018 15:17:05 -0700 (PDT) Date: Mon, 29 Oct 2018 15:17:01 -0700 In-Reply-To: Message-Id: <20181029221701.51376-1-rajatja@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [PATCH v2] mmc: sdhci-pci: Try "cd" for card-detect lookup before using NULL From: Rajat Jain To: adrian.hunter@intel.com, Ulf Hansson , linux-mmc@vger.kernel.org, Linus Walleij , Rajat Jain , Linux Kernel Mailing List , Mika Westerberg , Andy Shevchenko , Dmitry Torokhov , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, Andy Shevchenko Cc: Rajat Jain Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Problem: The card detect IRQ does not work with modern BIOS (that want to use _DSD to provide the card detect GPIO to the driver). Details: The mmc core provides the mmc_gpiod_request_cd() API to let host drivers request the gpio descriptor for the "card detect" pin. This pin is specified in the ACPI for the SDHC device: * Either as a resource using _CRS. This is a method used by legacy BIOS. (The driver needs to tell which resource index). * Or as a named property ("cd-gpios"/"cd-gpio") in _DSD (which internally points to an entry in _CRS). This way, the driver can lookup using a string. This is what modern BIOS prefer to use. This API finally results in a call to the following code: struct gpio_desc *acpi_find_gpio(..., const char *con_id,...) { ... /* Lookup gpio (using "-gpio") in the _DSD */ ... if (!acpi_can_fallback_to_crs(adev, con_id)) return ERR_PTR(-ENOENT); ... /* Falling back to _CRS is allowed, Lookup gpio in the _CRS */ ... } Note that this means that if the ACPI has _DSD properties, the kernel will never use _CRS for the lookup (Because acpi_can_fallback_to_crs() will always be false for any device hat has _DSD entries). The SDHCI driver is thus currently broken on a modern BIOS, even if BIOS provides both _CRS (for index based lookup) and _DSD entries (for string based lookup). Ironically, none of these will be used for the lookup currently because: * Since the con_id is NULL, acpi_find_gpio() does not find a matching entry in DSDT. (The _DSDT entry has the property name = "cd-gpios") * Because ACPI contains DSDT entries, thus acpi_can_fallback_to_crs() returns false (because device properties have been populated from _DSD), thus the _CRS is never used for the lookup. Fix: Try "cd" for lookup in the _DSD before falling back to using NULL so as to try looking up in the _CRS. I've tested this patch successfully with both Legacy BIOS (that provide only _CRS method) as well as modern BIOS (that provide both _CRS and _DSD). Also the use of "cd" appears to be fairly consistent across other users of this API (other MMC host controller drivers). Link: https://lkml.org/lkml/2018/9/25/1113 Signed-off-by: Rajat Jain Acked-by: Adrian Hunter --- v2: Fix the commit log to take care of Andy's comments. drivers/mmc/host/sdhci-pci-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 7bfd366d970d..e53333c695b3 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -1762,8 +1762,13 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( device_init_wakeup(&pdev->dev, true); if (slot->cd_idx >= 0) { - ret = mmc_gpiod_request_cd(host->mmc, NULL, slot->cd_idx, + ret = mmc_gpiod_request_cd(host->mmc, "cd", slot->cd_idx, slot->cd_override_level, 0, NULL); + if (ret && ret != -EPROBE_DEFER) + ret = mmc_gpiod_request_cd(host->mmc, NULL, + slot->cd_idx, + slot->cd_override_level, + 0, NULL); if (ret == -EPROBE_DEFER) goto remove;