From: NeilBrown Date: Tue, 6 Feb 2018 01:22:48 +0000 (+1100) Subject: ramips: mtk-mmc: don't advertise highmem support. X-Git-Tag: v18.06.0-rc1~465 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=f27336e11571a609a11bffad3eca0d7ac63135de 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 Signed-off-by: Felix Fietkau --- 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);