mmc: core: SPI mode remove cmd7

Rex-Chen-NXP · gregkh · commit e58bb2cab77b · 2025-10-19T16:37:32.000+02:00
commit fec40f4 upstream. SPI mode doesn't support cmd7, so remove it in mmc_sdio_alive() and confirm if sdio is active by checking CCCR register value is available or not. Signed-off-by: Rex Chen <rex.chen_1@nxp.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250728082230.1037917-2-rex.chen_1@nxp.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
@@ -945,7 +945,11 @@ static void mmc_sdio_remove(struct mmc_host *host)
  */
 static int mmc_sdio_alive(struct mmc_host *host)
 {
-	return mmc_select_card(host->card);
+	if (!mmc_host_is_spi(host))
+		return mmc_select_card(host->card);
+	else
+		return mmc_io_rw_direct(host->card, 0, 0, SDIO_CCCR_CCCR, 0,
+					NULL);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,11 @@ static void mmc_sdio_remove(struct mmc_host *host)`
`945`	`945`	`*/`
`946`	`946`	`static int mmc_sdio_alive(struct mmc_host *host)`
`947`	`947`	`{`
`948`		`- return mmc_select_card(host->card);`
	`948`	`+ if (!mmc_host_is_spi(host))`
	`949`	`+ return mmc_select_card(host->card);`
	`950`	`+ else`
	`951`	`+ return mmc_io_rw_direct(host->card, 0, 0, SDIO_CCCR_CCCR, 0,`
	`952`	`+ NULL);`
`949`	`953`	`}`
`950`	`954`
`951`	`955`	`/*`