path: root/drivers/mmc
diff options
authorNeil Armstrong <>2021-04-26 19:55:59 +0200
committerUlf Hansson <>2021-05-10 14:29:39 +0200
commit9b81354d7ebc1fd17f666a168dcabf27dae290bd (patch)
tree0236eae1ea67378247912a6777c3352129660253 /drivers/mmc
parentcabb1bb60e88ccaaa122ba01862403cd44e8e8f8 (diff)
mmc: meson-gx: also check SD_IO_RW_EXTENDED for scatterlist size alignment
The brcmfmac driver can generate a scatterlist from a skb with each packets not aligned to the block size. This is not supported by the Amlogic Descriptor dma engine where each descriptor must match a multiple of the block size. The sg list is valid, since the sum of the sg buffers is a multiple of the block size, but we must discard those when in SD_IO_RW_EXTENDED mode since SDIO block mode can be used under the hood even with data->blocks == 1. Those transfers are very rare, thus can be replaced by a bounce buffer without real performance loss. Fixes: 7412dee9f1fd ("mmc: meson-gx: replace WARN_ONCE with dev_warn_once about scatterlist size alignment in block mode") Cc: Reported-by: Christian Hewitt <> Signed-off-by: Neil Armstrong <> Link: Signed-off-by: Ulf Hansson <>
Diffstat (limited to 'drivers/mmc')
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 1c61f0f24c09..016a6106151a 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -236,7 +236,8 @@ static void meson_mmc_get_transfer_mode(struct mmc_host *mmc,
if (host->dram_access_quirk)
- if (data->blocks > 1) {
+ /* SD_IO_RW_EXTENDED (CMD53) can also use block mode under the hood */
+ if (data->blocks > 1 || mrq->cmd->opcode == SD_IO_RW_EXTENDED) {
* In block mode DMA descriptor format, "length" field indicates
* number of blocks and there is no way to pass DMA size that