* [PATCH] sdhci-acpi: support deferred probe
@ 2016-12-26 2:28 Zhang Rui
2017-01-05 10:06 ` Adrian Hunter
2017-01-10 15:38 ` Ulf Hansson
0 siblings, 2 replies; 4+ messages in thread
From: Zhang Rui @ 2016-12-26 2:28 UTC (permalink / raw)
To: linux-mmc; +Cc: adrian.hunter, cja, darcari, Zhang Rui
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] sdhci-acpi: support deferred probe
2016-12-26 2:28 [PATCH] sdhci-acpi: support deferred probe Zhang Rui
@ 2017-01-05 10:06 ` Adrian Hunter
2017-01-10 15:38 ` Ulf Hansson
1 sibling, 0 replies; 4+ messages in thread
From: Adrian Hunter @ 2017-01-05 10:06 UTC (permalink / raw)
To: Zhang Rui, linux-mmc; +Cc: cja, darcari
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;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sdhci-acpi: support deferred probe
2016-12-26 2:28 [PATCH] sdhci-acpi: support deferred probe Zhang Rui
2017-01-05 10:06 ` Adrian Hunter
@ 2017-01-10 15:38 ` Ulf Hansson
2017-01-11 0:58 ` Zhang Rui
1 sibling, 1 reply; 4+ messages in thread
From: Ulf Hansson @ 2017-01-10 15:38 UTC (permalink / raw)
To: Zhang Rui; +Cc: linux-mmc, Adrian Hunter, cja, darcari
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sdhci-acpi: support deferred probe
2017-01-10 15:38 ` Ulf Hansson
@ 2017-01-11 0:58 ` Zhang Rui
0 siblings, 0 replies; 4+ messages in thread
From: Zhang Rui @ 2017-01-11 0:58 UTC (permalink / raw)
To: Ulf Hansson; +Cc: linux-mmc, Adrian Hunter, cja, darcari
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-11 0:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-26 2:28 [PATCH] sdhci-acpi: support deferred probe Zhang Rui
2017-01-05 10:06 ` Adrian Hunter
2017-01-10 15:38 ` Ulf Hansson
2017-01-11 0:58 ` Zhang Rui
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.