]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: core: Respect quirk_max_rate for non-UHS SDIO card
authorShawn Lin <shawn.lin@rock-chips.com>
Fri, 22 Nov 2024 09:37:22 +0000 (17:37 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:50:18 +0000 (12:50 +0100)
[ 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@rock-chips.com>
Message-ID: <1732268242-72799-1-git-send-email-shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mmc/core/sdio.c

index eda2dbd965392df23fa44423aaa27e221001cc4e..a0cac8c87ef2f93a5ea07c6fda54191a41b38189 100644 (file)
@@ -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;
 }