summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/rock5b-rk3588_defconfig1
-rw-r--r--drivers/mmc/rockchip_sdhci.c8
2 files changed, 9 insertions, 0 deletions
diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
index 3fcc6a26bb5..d3136ac850f 100644
--- a/configs/rock5b-rk3588_defconfig
+++ b/configs/rock5b-rk3588_defconfig
@@ -58,6 +58,7 @@ CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
+# CONFIG_SPL_MMC_SDHCI_SDMA is not set
CONFIG_MMC_SDHCI_ROCKCHIP=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index 2857dcc9ec4..4f110976f4e 100644
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/drivers/mmc/rockchip_sdhci.c
@@ -589,6 +589,14 @@ static int rockchip_sdhci_probe(struct udevice *dev)
if (ret)
return ret;
+ /*
+ * Reading more than 4 blocks with a single CMD18 command in PIO mode
+ * 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))
+ cfg->b_max = 4;
+
return sdhci_probe(dev);
}