diff mbox series

[v2,4/6] mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO

Message ID e7936cff7fc24d187ef2680d3b4edb0ade58f293.1636564631.git.hns@goldelico.com
State New
Headers show
Series mmc: core: extend mmc_fixup_device and transplant ti,wl1251 quirks from to be retired omap_hsmmc | expand

Commit Message

H. Nikolaus Schaller Nov. 10, 2021, 5:17 p.m. UTC
From: Ulf Hansson <ulf.hansson@linaro.org>

The mmc core takes a specific path to support initializing of a
non-standard SDIO card. This is triggered by looking for the card-quirk,

In mmc_sdio_init_card() this gets rather messy, as it causes the code to
bail out earlier, compared to the usual path. This leads to that the OCR
doesn't get saved properly in card->ocr. Fortunately, only omap_hsmmc has
been using the MMC_QUIRK_NONSTD_SDIO and is dealing with the issue, by
assigning a hardcoded value (0x80) to card->ocr from an ->init_card() ops.

To make the behaviour consistent, let's instead rely on the core to save
the OCR in card->ocr during initialization.

Reported-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
 drivers/mmc/core/sdio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series


diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index cf8ee66990508..41164748723d2 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -709,6 +709,8 @@  static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
 		host->ops->init_card(host, card);
 	mmc_fixup_device(card, sdio_card_init_methods);
+	card->ocr = ocr_card;
 	 * If the host and card support UHS-I mode request the card
 	 * to switch to 1.8V signaling level.  No 1.8v signalling if
@@ -821,7 +823,7 @@  static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
 			goto mismatch;
-	card->ocr = ocr_card;
 	mmc_fixup_device(card, sdio_fixup_methods);
 	if (card->type == MMC_TYPE_SD_COMBO) {