mmc: bcm2835: Take SWIOTLB memory size limitation into account

lategoodbye · storulf · commit d4dd9bccf485 · 2019-09-11T15:58:39.000+02:00
Make sure the sdhost driver doesn't use requests bigger than SWIOTLB
can handle.

Signed-off-by: Stefan Wahren &lt;wahrenst@gmx.net&gt;
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
@@ -1314,7 +1314,7 @@ static int bcm2835_add_host(struct bcm2835_host *host)
 	}
 
 	mmc->max_segs = 128;
-	mmc->max_req_size = 524288;
+	mmc->max_req_size = min_t(size_t, 524288, dma_max_mapping_size(dev));
 	mmc->max_seg_size = mmc->max_req_size;
 	mmc->max_blk_size = 1024;
 	mmc->max_blk_count =  65535;

Original file line number	Diff line number	Diff line change
`@@ -1314,7 +1314,7 @@ static int bcm2835_add_host(struct bcm2835_host *host)`
`1314`	`1314`	`}`
`1315`	`1315`
`1316`	`1316`	`mmc->max_segs = 128;`
`1317`		`- mmc->max_req_size = 524288;`
	`1317`	`+ mmc->max_req_size = min_t(size_t, 524288, dma_max_mapping_size(dev));`
`1318`	`1318`	`mmc->max_seg_size = mmc->max_req_size;`
`1319`	`1319`	`mmc->max_blk_size = 1024;`
`1320`	`1320`	`mmc->max_blk_count = 65535;`