mmc: bcm2835-sdhost Observe SWIOTLB memory limit

pelwell · pelwell · commit a20d400dff3d · 2025-01-10T16:55:39.000Z
Make sure the sdhost driver doesn't use requests bigger than SWIOTLB can handle. Copied from [1]. Link: #6589 Signed-off-by: Phil Elwell <phil@raspberrypi.com> [1] d4dd9bc ("mmc: bcm2835: Take SWIOTLB memory size limitation into account")
diff --git a/drivers/mmc/host/bcm2835-sdhost.c b/drivers/mmc/host/bcm2835-sdhost.c
@@ -1971,7 +1971,7 @@ static int bcm2835_sdhost_add_host(struct platform_device *pdev)
 	}
 
 	mmc->max_segs = 128;
-	mmc->max_req_size = 524288;
+	mmc->max_req_size = min_t(size_t, 524288, dma_max_mapping_size(&pdev->dev));
 	mmc->max_seg_size = mmc->max_req_size;
 	mmc->max_blk_size = 512;
 	mmc->max_blk_count =  65535;

Original file line number	Diff line number	Diff line change
`@@ -1971,7 +1971,7 @@ static int bcm2835_sdhost_add_host(struct platform_device *pdev)`
`1971`	`1971`	`}`
`1972`	`1972`
`1973`	`1973`	`mmc->max_segs = 128;`
`1974`		`- mmc->max_req_size = 524288;`
	`1974`	`+ mmc->max_req_size = min_t(size_t, 524288, dma_max_mapping_size(&pdev->dev));`
`1975`	`1975`	`mmc->max_seg_size = mmc->max_req_size;`
`1976`	`1976`	`mmc->max_blk_size = 512;`
`1977`	`1977`	`mmc->max_blk_count = 65535;`