Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: meson-gx: limit segments to 1 when dram-access-quirk is needed

The actual max_segs computation leads to failure while using the broadcom
sdio brcmfmac/bcmsdh driver, since the driver tries to make usage of
scatter gather.

But with the dram-access-quirk we use a 1,5K SRAM bounce buffer, and the
max_segs current value of 3 leads to max transfers to 4,5k, which doesn't
work.

This patch sets max_segs to 1 to better describe the hardware limitation,
and fix the SDIO functionality with the brcmfmac/bcmsdh driver on Amlogic
G12A/G12B SoCs on boards like SEI510 or Khadas VIM3.

Reported-by: Art Nikpal <art@khadas.com>
Reported-by: Christian Hewitt <christianshewitt@gmail.com>
Fixes: acdc8e71d9bb ("mmc: meson-gx: add dram-access-quirk")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200608084458.32014-1-narmstrong@baylibre.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Neil Armstrong and committed by
Ulf Hansson
27a5e7d3 b3a9e3b9

+4 -2
+4 -2
drivers/mmc/host/meson-gx-mmc.c
··· 1146 1146 1147 1147 mmc->caps |= MMC_CAP_CMD23; 1148 1148 if (host->dram_access_quirk) { 1149 + /* Limit segments to 1 due to low available sram memory */ 1150 + mmc->max_segs = 1; 1149 1151 /* Limit to the available sram memory */ 1150 - mmc->max_segs = SD_EMMC_SRAM_DATA_BUF_LEN / mmc->max_blk_size; 1151 - mmc->max_blk_count = mmc->max_segs; 1152 + mmc->max_blk_count = SD_EMMC_SRAM_DATA_BUF_LEN / 1153 + mmc->max_blk_size; 1152 1154 } else { 1153 1155 mmc->max_blk_count = CMD_CFG_LENGTH_MASK; 1154 1156 mmc->max_segs = SD_EMMC_DESC_BUF_LEN /