aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neil@brown.name>2018-02-06 12:22:48 +1100
committerFelix Fietkau <nbd@nbd.name>2018-04-05 19:48:47 +0200
commitf27336e11571a609a11bffad3eca0d7ac63135de (patch)
treefdf4d1e1290d2492fbe55f714796c9176ed08bbc
parent1c37cbbbecacbcd624f67ee7c18d76dcb478ba21 (diff)
downloadupstream-f27336e11571a609a11bffad3eca0d7ac63135de.tar.gz
upstream-f27336e11571a609a11bffad3eca0d7ac63135de.tar.bz2
upstream-f27336e11571a609a11bffad3eca0d7ac63135de.zip
ramips: mtk-mmc: don't advertise highmem support.
of_dma_configure() sets a default ->dma_mask of DMA_BIT_MASK(32), claiming devices can DMA from the full 32bit address space. The mtk-mmc driver does not support access to highmem pages, so it is really limited to the bottom 512M (actually 448M due to 64M of IO space). Setting ->dma_mask to NULL causes mmc_setup_queue() to fall-back to using BLK_BOUNCE_HIGH to tell the block layer to use a bounce-buffer for any highmem pages requiring IO. Signed-off-by: NeilBrown <neil@brown.name> Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c1
-rw-r--r--target/linux/ramips/files-4.9/drivers/mmc/host/mtk-mmc/sd.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c
index ebfdc065c1..3a146f646c 100644
--- a/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c
+++ b/target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c
@@ -2821,6 +2821,7 @@ static int msdc_drv_probe(struct platform_device *pdev)
host->dma.used_gpd = 0;
host->dma.used_bd = 0;
+ mmc_dev(mmc)->dma_mask = NULL;
/* using dma_alloc_coherent*/ /* todo: using 1, for all 4 slots */
host->dma.gpd = dma_alloc_coherent(NULL, MAX_GPD_NUM * sizeof(gpd_t), &host->dma.gpd_addr, GFP_KERNEL);
diff --git a/target/linux/ramips/files-4.9/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files-4.9/drivers/mmc/host/mtk-mmc/sd.c
index ebfdc065c1..3a146f646c 100644
--- a/target/linux/ramips/files-4.9/drivers/mmc/host/mtk-mmc/sd.c
+++ b/target/linux/ramips/files-4.9/drivers/mmc/host/mtk-mmc/sd.c
@@ -2821,6 +2821,7 @@ static int msdc_drv_probe(struct platform_device *pdev)
host->dma.used_gpd = 0;
host->dma.used_bd = 0;
+ mmc_dev(mmc)->dma_mask = NULL;
/* using dma_alloc_coherent*/ /* todo: using 1, for all 4 slots */
host->dma.gpd = dma_alloc_coherent(NULL, MAX_GPD_NUM * sizeof(gpd_t), &host->dma.gpd_addr, GFP_KERNEL);