From: Avri Altman <avri.altman@wdc.com>
Date: Sun, 6 Oct 2024 05:11:48 +0000 (+0300)
Subject: mmc: core: Enable SDUC
X-Git-Tag: v6.13-rc1~153^2~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=899404e1503461adde3890828f7ed18a3032ec59;p=thirdparty%2Flinux.git

mmc: core: Enable SDUC

Enable SDUC if the card responded to ACMD41 with HCS & HO2T bits set.

Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Avri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20241006051148.160278-11-avri.altman@wdc.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 33e806adcbf7b..918b86bf8bbbb 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -836,8 +836,11 @@ try_again:
 	 * block-addressed SDHC cards.
 	 */
 	err = mmc_send_if_cond(host, ocr);
-	if (!err)
+	if (!err) {
 		ocr |= SD_OCR_CCS;
+		/* Set HO2T as well - SDUC card won't respond otherwise */
+		ocr |= SD_OCR_2T;
+	}
 
 	/*
 	 * If the host supports one of UHS-I modes, request the card
@@ -1448,7 +1451,10 @@ retry:
 	}
 
 	if (!oldcard) {
-		err = mmc_sd_get_csd(card, false);
+		u32 sduc_arg = SD_OCR_CCS | SD_OCR_2T;
+		bool is_sduc = (rocr & sduc_arg) == sduc_arg;
+
+		err = mmc_sd_get_csd(card, is_sduc);
 		if (err)
 			goto free_card;