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

2014-06-16 Thread Joerg Roedel 
Hi Laurent,

On Mon, May 26, 2014 at 12:08:37PM +0200, Laurent Pinchart wrote:
  Skipped this one because it didn't apply. The others are applied.
 
 Thank you. I'll rebase the patch on top of your tree as soon as you publish 
 the related branch and resubmit.

What happened to this patch? And how about the other iommu_domain
changes requested. Will you submit them for 3.17?


Joerg


___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

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

2014-05-26 Thread Joerg Roedel 
On Thu, May 15, 2014 at 12:40:43PM +0200, Laurent Pinchart wrote:
 Signed-off-by: Laurent Pinchart laurent.pinchart+rene...@ideasonboard.com
 ---
  drivers/iommu/ipmmu-vmsa.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
 index 49e00f7..49dbedd 100644
 --- a/drivers/iommu/ipmmu-vmsa.c
 +++ b/drivers/iommu/ipmmu-vmsa.c
 @@ -917,7 +917,8 @@ static int ipmmu_add_device(struct device *dev)
   SZ_1G, SZ_2G);
   if (IS_ERR(mapping)) {
   dev_err(mmu-dev, failed to create ARM IOMMU 
 mapping\n);
 - return PTR_ERR(mapping);
 + ret = PTR_ERR(mapping);
 + goto error;
   }
  
   mmu-mapping = mapping;
 @@ -933,6 +934,7 @@ static int ipmmu_add_device(struct device *dev)
   return 0;
  
  error:
 + arm_iommu_release_mapping(mmu-mapping);
   kfree(dev-archdata.iommu);
   dev-archdata.iommu = NULL;
   iommu_group_remove_device(dev);

Skipped this one because it didn't apply. The others are applied.

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

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

2014-05-26 Thread Laurent Pinchart 
Hi Joerg,

On Monday 26 May 2014 11:23:11 Joerg Roedel wrote:
 On Thu, May 15, 2014 at 12:40:43PM +0200, Laurent Pinchart wrote:
  Signed-off-by: Laurent Pinchart
  laurent.pinchart+rene...@ideasonboard.com
  ---
  
   drivers/iommu/ipmmu-vmsa.c | 4 +++-
   1 file changed, 3 insertions(+), 1 deletion(-)
  
  diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
  index 49e00f7..49dbedd 100644
  --- a/drivers/iommu/ipmmu-vmsa.c
  +++ b/drivers/iommu/ipmmu-vmsa.c
  @@ -917,7 +917,8 @@ static int ipmmu_add_device(struct device *dev)
  SZ_1G, SZ_2G);
  if (IS_ERR(mapping)) {
  dev_err(mmu-dev, failed to create ARM IOMMU 
  mapping\n);
  -   return PTR_ERR(mapping);
  +   ret = PTR_ERR(mapping);
  +   goto error;
  }
  
  mmu-mapping = mapping;
  @@ -933,6 +934,7 @@ static int ipmmu_add_device(struct device *dev)
  return 0;
   
   error:
  +   arm_iommu_release_mapping(mmu-mapping);
  kfree(dev-archdata.iommu);
  dev-archdata.iommu = NULL;
  iommu_group_remove_device(dev);
 
 Skipped this one because it didn't apply. The others are applied.

Thank you. I'll rebase the patch on top of your tree as soon as you publish 
the related branch and resubmit.

-- 
Regards,

Laurent Pinchart

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

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

2014-05-26 Thread Joerg Roedel 
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.

From 720b0cef715ab97b21b33e7f3c328e2863411cab Mon Sep 17 00:00:00 2001
From: Joerg Roedel jroe...@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 jroe...@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);
-- 
1.7.9.5


___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

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

2014-05-15 Thread Laurent Pinchart 
Signed-off-by: Laurent Pinchart laurent.pinchart+rene...@ideasonboard.com
---
 drivers/iommu/ipmmu-vmsa.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 49e00f7..49dbedd 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -917,7 +917,8 @@ static int ipmmu_add_device(struct device *dev)
SZ_1G, SZ_2G);
if (IS_ERR(mapping)) {
dev_err(mmu-dev, failed to create ARM IOMMU 
mapping\n);
-   return PTR_ERR(mapping);
+   ret = PTR_ERR(mapping);
+   goto error;
}
 
mmu-mapping = mapping;
@@ -933,6 +934,7 @@ static int ipmmu_add_device(struct device *dev)
return 0;
 
 error:
+   arm_iommu_release_mapping(mmu-mapping);
kfree(dev-archdata.iommu);
dev-archdata.iommu = NULL;
iommu_group_remove_device(dev);
-- 
1.8.5.5

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu