Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751894AbdC0Cnr (ORCPT ); Sun, 26 Mar 2017 22:43:47 -0400 Received: from mga09.intel.com ([134.134.136.24]:13681 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751811AbdC0Cni (ORCPT ); Sun, 26 Mar 2017 22:43:38 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,229,1486454400"; d="scan'208";a="70815248" Message-ID: <1490582423.2587.4.camel@intel.com> Subject: Re: [PATCH 4.10 012/167] mmc: sdhci-acpi: support deferred probe From: Zhang Rui To: Andrey Utkin , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Jonas Aaberg , Adrian Hunter , Ulf Hansson Date: Mon, 27 Mar 2017 10:40:23 +0800 In-Reply-To: <20170326112619.GA4209@dell-m4800.Home> References: <20170310083956.767605269@linuxfoundation.org> <20170310083957.651880524@linuxfoundation.org> <20170326112619.GA4209@dell-m4800.Home> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2-0ubuntu3 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2067 Lines: 64 On Sun, 2017-03-26 at 12:26 +0100, Andrey Utkin wrote: > On Fri, Mar 10, 2017 at 10:07:35AM +0100, Greg Kroah-Hartman wrote: > > > > 4.10-stable review patch.  If anyone has any objections, please let > > me know. > > > > ------------------ > > > > From: Zhang Rui > > > > commit e28d6f048799acb0014491e6b74e580d84bd7916 upstream. > > > > With commit 67bf5156edc4 ("gpio / ACPI: fix returned error from > > acpi_dev_gpio_irq_get()"), mmc_gpiod_request_cd() returns > > -EPROBE_DEFER if > > GPIO is not ready when sdhci-acpi driver is probed, and sdhci-acpi > > driver > > should be probed again later in this case. > > > > This fixes an order issue when both GPIO and sdhci-acpi drivers are > > built > > as modules. > > > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=177101 > > Tested-by: Jonas Aaberg > > Signed-off-by: Zhang Rui > > Acked-by: Adrian Hunter > > Signed-off-by: Ulf Hansson > > Signed-off-by: Greg Kroah-Hartman > > > > --- > >  drivers/mmc/host/sdhci-acpi.c |    5 ++++- > >  1 file changed, 4 insertions(+), 1 deletion(-) > > > > --- a/drivers/mmc/host/sdhci-acpi.c > > +++ b/drivers/mmc/host/sdhci-acpi.c > > @@ -467,7 +467,10 @@ static int sdhci_acpi_probe(struct platf > >   if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) { > >   bool v = sdhci_acpi_flag(c, > > SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL); > >   > > - if (mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0, > > NULL)) { > > + err = mmc_gpiod_request_cd(host->mmc, NULL, 0, v, > > 0, NULL); > > + if (err) { > > + if (err == -EPROBE_DEFER) > > + goto err_free; > >   dev_warn(dev, "failed to setup card detect > > gpio\n"); > >   c->use_runtime_pm = false; > >   } > > > > > Regression reported: https://bugzilla.kernel.org/show_bug.cgi?id=1948 > 71 > > Reverting this patch is said to fix the issue for 4.10.2. thanks for raising the issue. Let's see check why it breaks in the bugzilla report. thanks, rui