Fix warning when running with CONFIG_DMA_API_DEBUG_SG=y by allocating a device_dma_parameters structure and filling in the max segment size. The size used is the result of a discussion with Renesas hardware engineers and unfortunately not found in the datasheet.
renesas_sdhi_internal_dmac ee140000.sd: DMA-API: mapping sg segment longer than device claims to support [len=126976] [max=65536A] Signed-off-by: Niklas Söderlund <[email protected]> Reported-by: Geert Uytterhoeven <[email protected]> --- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 225af5389599108a..13a286e2a247042d 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -292,15 +292,38 @@ static const struct soc_device_attribute gen3_soc_whitelist[] = { static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev) { const struct soc_device_attribute *soc = soc_device_match(gen3_soc_whitelist); + struct device *dev = &pdev->dev; if (!soc) return -ENODEV; global_flags |= (unsigned long)soc->data; + if (!dev->dma_parms) { + dev->dma_parms = kzalloc(sizeof(*dev->dma_parms), GFP_KERNEL); + if (!dev->dma_parms) + return -ENOMEM; + } + + if (dma_set_max_seg_size(dev, 0xffffffff)) + dev_warn(dev, "Unable to set seg size\n"); + return renesas_sdhi_probe(pdev, &renesas_sdhi_internal_dmac_dma_ops); } +static int renesas_sdhi_internal_dmac_remove(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + int ret; + + ret = renesas_sdhi_remove(pdev); + + kfree(dev->dma_parms); + dev->dma_parms = NULL; + + return ret; +} + static const struct dev_pm_ops renesas_sdhi_internal_dmac_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) @@ -316,7 +339,7 @@ static struct platform_driver renesas_internal_dmac_sdhi_driver = { .of_match_table = renesas_sdhi_internal_dmac_of_match, }, .probe = renesas_sdhi_internal_dmac_probe, - .remove = renesas_sdhi_remove, + .remove = renesas_sdhi_internal_dmac_remove, }; module_platform_driver(renesas_internal_dmac_sdhi_driver); -- 2.18.0
