[PATCH v2 1/5] mmc: rockchip_sdhci: Skip blocks read workaround on RK3399

Jonas Karlman jonas at kwiboo.se
Wed May 17 20:40:37 CEST 2023

The workaround to limit number of blocks to read in a single command
should only be applied to RK3568 and RK3588. Change to be more strict
when to apply the workaround.

Fixes: 2cc6cde647e2 ("mmc: rockchip_sdhci: Limit number of blocks read in a single command")
Suggested-by: Simon Glass <sjg at chromium.org>
Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Tested-by: Quentin Schulz <foss+uboot at 0leil.net> # RK3399 Puma, RK3588 Tiger
- Collect r-b and t-b tags

 drivers/mmc/rockchip_sdhci.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index 4f110976f4e8..8e4a158049a9 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -594,7 +594,9 @@ static int rockchip_sdhci_probe(struct udevice *dev)
 	 * triggers Data End Bit Error on RK3568 and RK3588. Limit to reading
 	 * max 4 blocks in one command when using PIO mode.
-	if (!(host->flags & USE_DMA))
+	if (!(host->flags & USE_DMA) &&
+	    (device_is_compatible(dev, "rockchip,rk3568-dwcmshc") ||
+	     device_is_compatible(dev, "rockchip,rk3588-dwcmshc")))
 		cfg->b_max = 4;
 	return sdhci_probe(dev);

More information about the U-Boot mailing list