On 04/12/15 03:24, Wang Hongcheng wrote:
Because amd iommu and software iommu need this mask.For example,
if we use software iommu without this mask, we will
get 'Out of SW-IOMMU space' error, when calling swiotlb_map_page
function.

The commit title doesn't match the code, but either way this patch should now be unnecessary: 002edb6f6f2a ("dma-mapping: tidy up dma_parms default handling") resolves the problem at its source, and is already in 4.4-rc1.

(Incidentally, it was specifically the same PL330/SWIOTLB combination that led to that patch in the first place)

Robin.

Signed-off-by: Wan Zongshun <vincent....@amd.com>
Signed-off-by: Wang Hongcheng <annie.w...@amd.com>
---
  drivers/dma/pl330.c | 4 ++++
  1 file changed, 4 insertions(+)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 9d7af0d..fb46fdf 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2966,6 +2966,10 @@ pl330_probe(struct amba_device *adev, const struct 
amba_id *id)
        if (ret)
                dev_err(&adev->dev, "unable to set the seg size\n");

+       dev_info(&adev->dev, "set the seg boundary\n");
+       ret = dma_set_seg_boundary(&adev->dev, 0xffffffff);
+       if (ret)
+               dev_err(&adev->dev, "unable to set the seg boundary\n");

        dev_info(&adev->dev,
                 "Loaded driver for PL330 DMAC-%x\n", adev->periphid);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to