Re: [PATCH v2 02/10] iommu/ipmmu-vmsa: Cleanup failures of ARM mapping creation or attachment

Laurent Pinchart
2014-05-26T11:35:04Z

Hi Joerg,

On Monday 26 May 2014 13:31:17 Joerg Roedel wrote:
> On Mon, May 26, 2014 at 12:08:37PM +0200, Laurent Pinchart wrote:
> > Thank you. I'll rebase the patch on top of your tree as soon as you
> > publish the related branch and resubmit.
>
> I also put this patch on-top to fix a compile error.

That looks good to me, thank you.

> From 720b0cef715ab97b21b33e7f3c328e2863411cab Mon Sep 17 00:00:00 2001
> From: Joerg Roedel <jroedel@suse.de>
> Date: Mon, 26 May 2014 13:07:01 +0200
> Subject: [PATCH] arm/ipmmu-vmsa: Fix compile error
>
> The function arm_iommu_create_mapping lost the order
> parameter. Remove it from this IOMMU driver too to make it
> build.
>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
> drivers/iommu/ipmmu-vmsa.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
> index 95b819a..53cde08 100644
> --- a/drivers/iommu/ipmmu-vmsa.c
> +++ b/drivers/iommu/ipmmu-vmsa.c
> @@ -1087,7 +1087,7 @@ static int ipmmu_add_device(struct device *dev)
> struct dma_iommu_mapping *mapping;
>
> mapping = arm_iommu_create_mapping(&platform_bus_type,
> - SZ_1G, SZ_2G, 0);
> + SZ_1G, SZ_2G);
> if (IS_ERR(mapping)) {
> dev_err(mmu->dev, "failed to create ARM IOMMU mapping\n");
> return PTR_ERR(mapping);

--
Regards,

Laurent Pinchart