[PATCH AUTOSEL 5.15 02/14] mmc: core: Respect quirk_max_rate for non-UHS SDIO card

From: Sasha Levin
Date: Sun Jan 26 2025 - 10:50:27 EST


From: Shawn Lin <shawn.lin@xxxxxxxxxxxxxx>

[ Upstream commit a2a44f8da29352f76c99c6904ee652911b8dc7dd ]

The card-quirk was added to limit the clock-rate for a card with UHS-mode
support, although let's respect the quirk for non-UHS mode too, to make the
behaviour consistent.

Signed-off-by: Shawn Lin <shawn.lin@xxxxxxxxxxxxxx>
Message-ID: <1732268242-72799-1-git-send-email-shawn.lin@xxxxxxxxxxxxxx>
Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
drivers/mmc/core/sdio.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index eda2dbd965392..a0cac8c87ef2f 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -443,6 +443,8 @@ static unsigned mmc_sdio_get_max_clock(struct mmc_card *card)
if (card->type == MMC_TYPE_SD_COMBO)
max_dtr = min(max_dtr, mmc_sd_get_max_clock(card));

+ max_dtr = min_not_zero(max_dtr, card->quirk_max_rate);
+
return max_dtr;
}

--
2.39.5