mmc: spi: Fix card detection during probe

neuschaefer · storulf · commit c9bd505dbd9d · 2019-02-25T15:40:36.000+01:00
When using the mmc_spi driver with a card-detect pin, I noticed that the
card was not detected immediately after probe, but only after it was
unplugged and plugged back in (and the CD IRQ fired).

The call tree looks something like this:

mmc_spi_probe
  mmc_add_host
    mmc_start_host
      _mmc_detect_change
        mmc_schedule_delayed_work(&amp;host-&gt;detect, 0)
          mmc_rescan
            host-&gt;bus_ops-&gt;detect(host)
              mmc_detect
                _mmc_detect_card_removed
                  host-&gt;ops-&gt;get_cd(host)
                    mmc_gpio_get_cd -&gt; -ENOSYS (ctx-&gt;cd_gpio not set)
  mmc_gpiod_request_cd
    ctx-&gt;cd_gpio = desc

To fix this issue, call mmc_detect_change after the card-detect GPIO/IRQ
is registered.

Signed-off-by: Jonathan Neuschäfer &lt;j.neuschaefer@gmx.net&gt;
Reviewed-by: Linus Walleij &lt;linus.walleij@linaro.org&gt;
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
@@ -1450,6 +1450,7 @@ static int mmc_spi_probe(struct spi_device *spi)
 		mmc->caps &= ~MMC_CAP_NEEDS_POLL;
 		mmc_gpiod_request_cd_irq(mmc);
 	}
+	mmc_detect_change(mmc, 0);
 
 	/* Index 1 is write protect/read only */
 	status = mmc_gpiod_request_ro(mmc, NULL, 1, false, 0, NULL);

Original file line number	Diff line number	Diff line change
`@@ -1450,6 +1450,7 @@ static int mmc_spi_probe(struct spi_device *spi)`
`1450`	`1450`	`mmc->caps &= ~MMC_CAP_NEEDS_POLL;`
`1451`	`1451`	`mmc_gpiod_request_cd_irq(mmc);`
`1452`	`1452`	`}`
	`1453`	`+ mmc_detect_change(mmc, 0);`
`1453`	`1454`
`1454`	`1455`	`/* Index 1 is write protect/read only */`
`1455`	`1456`	`status = mmc_gpiod_request_ro(mmc, NULL, 1, false, 0, NULL);`