diff mbox

sdhci-acpi: support deferred probe

Message ID 1482719296-4783-1-git-send-email-rui.zhang@intel.com
State New
Headers show

Commit Message

Zhang Rui Dec. 26, 2016, 2:28 a.m. UTC
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 <cja@gmx.net>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 drivers/mmc/host/sdhci-acpi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Adrian Hunter Jan. 5, 2017, 10:06 a.m. UTC | #1
On 26/12/16 04:28, Zhang Rui wrote:

Subject should be mmc: sdhci-acpi: ...

> 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.

Commit message should be formatted as follows:

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 <cja@gmx.net>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/mmc/host/sdhci-acpi.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
> index 160f695..5440323 100644
> --- a/drivers/mmc/host/sdhci-acpi.c
> +++ b/drivers/mmc/host/sdhci-acpi.c
> @@ -466,7 +466,10 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
>  	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;
>  		}
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson Jan. 10, 2017, 3:38 p.m. UTC | #2
On 26 December 2016 at 03:28, Zhang Rui <rui.zhang@intel.com> wrote:
> 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 <cja@gmx.net>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>

Seems like both a fixes tag and a stable tag would we useful.

Please re-spin and make also the changes that Adrian proposed to the change log.

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci-acpi.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
> index 160f695..5440323 100644
> --- a/drivers/mmc/host/sdhci-acpi.c
> +++ b/drivers/mmc/host/sdhci-acpi.c
> @@ -466,7 +466,10 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
>         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;
>                 }
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Zhang Rui Jan. 11, 2017, 12:58 a.m. UTC | #3
On Tue, 2017-01-10 at 16:38 +0100, Ulf Hansson wrote:
> On 26 December 2016 at 03:28, Zhang Rui <rui.zhang@intel.com> wrote:
> > 
> > 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 <cja@gmx.net>
> > Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> Seems like both a fixes tag and a stable tag would we useful.
> 
The order issue always exists.
And commit 67bf5156edc4 just makes it possible to fix it in this way.
I can cc stable 4.9 as it depends on 67bf5156edc4, but I don't think
this needs a fixes tag.

thanks,
rui
> Please re-spin and make also the changes that Adrian proposed to the
> change log.
> 
> Kind regards
> Uffe
> 
> > 
> > ---
> >  drivers/mmc/host/sdhci-acpi.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/mmc/host/sdhci-acpi.c
> > b/drivers/mmc/host/sdhci-acpi.c
> > index 160f695..5440323 100644
> > --- a/drivers/mmc/host/sdhci-acpi.c
> > +++ b/drivers/mmc/host/sdhci-acpi.c
> > @@ -466,7 +466,10 @@ static int sdhci_acpi_probe(struct
> > platform_device *pdev)
> >         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;
> >                 }
> > --
> > 2.7.4
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-
> > mmc" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 160f695..5440323 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -466,7 +466,10 @@  static int sdhci_acpi_probe(struct platform_device *pdev)
 	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;
 		}