mmc: core: Respect quirk_max_rate for non-UHS SDIO card

shawn1221 · storulf · commit a2a44f8da293 · 2024-12-10T11:18:45.000+01:00
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 &lt;shawn.lin@rock-chips.com&gt;
Message-ID: &lt;1732268242-72799-1-git-send-email-shawn.lin@rock-chips.com&gt;
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
@@ -458,6 +458,8 @@ static unsigned mmc_sdio_get_max_clock(struct mmc_card *card)
 	if (mmc_card_sd_combo(card))
 		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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -458,6 +458,8 @@ static unsigned mmc_sdio_get_max_clock(struct mmc_card *card)`
`458`	`458`	`if (mmc_card_sd_combo(card))`
`459`	`459`	`max_dtr = min(max_dtr, mmc_sd_get_max_clock(card));`
`460`	`460`
	`461`	`+ max_dtr = min_not_zero(max_dtr, card->quirk_max_rate);`
	`462`	`+`
`461`	`463`	`return max_dtr;`
`462`	`464`	`}`
`463`	`465`