Re: IOVA allocation dependency between firmware buffer and remaining buffers

2020-09-24 Thread Shaik Ameer Basha
Hi Robin and Marek,


On Thu, Sep 24, 2020 at 4:36 PM Robin Murphy  wrote:
>
> On 2020-09-24 11:47, Marek Szyprowski wrote:
> > Hi Robin,
> >
> > On 24.09.2020 12:40, Robin Murphy wrote:
> >> On 2020-09-24 11:16, Thierry Reding wrote:
> >>> On Thu, Sep 24, 2020 at 10:46:46AM +0200, Marek Szyprowski wrote:
>  On 24.09.2020 10:28, Joerg Roedel wrote:
> > On Wed, Sep 23, 2020 at 08:48:26AM +0200, Marek Szyprowski wrote:
> >> It allows to remap given buffer at the specific IOVA address,
> >> although
> >> it doesn't guarantee that those specific addresses won't be later
> >> used
> >> by the IOVA allocator. Probably it would make sense to add an API for
> >> generic IOMMU-DMA framework to mark the given IOVA range as
> >> reserved/unused to protect them.
> > There is an API for that, the IOMMU driver can return IOVA reserved
> > regions per device and the IOMMU core code will take care of mapping
> > these regions and reserving them in the IOVA allocator, so that
> > DMA-IOMMU code will not use it for allocations.
> >
> > Have a look at the iommu_ops->get_resv_regions() and
> > iommu_ops->put_resv_regions().
> 
>  I know about the reserved regions IOMMU API, but the main problem here,
>  in case of Exynos, is that those reserved regions won't be created by
>  the IOMMU driver but by the IOMMU client device. It is just a result
>  how
>  the media drivers manages their IOVA space. They simply have to load
>  firmware at the IOVA address lower than the any address of the used
>  buffers.
> >>>
> >>> I've been working on adding a way to automatically add direct mappings
> >>> using reserved-memory regions parsed from device tree, see:
> >>>
> >>> https://lore.kernel.org/lkml/2020090413.691933-1-thierry.red...@gmail.com/
> >>>
> >>> Perhaps this can be of use? With that you should be able to add a
> >>> reserved-memory region somewhere in the lower range that you need for
> >>> firmware images and have that automatically added as a direct mapping
> >>> so that it won't be reused later on for dynamic allocations.
> >>
> >> It can't easily be a *direct* mapping though - if the driver has to
> >> use the DMA masks to ensure that everything stays within the
> >> addressable range, then (as far as I'm aware) there's no physical
> >> memory that low down to equal the DMA addresses.
> >>
> >> TBH I'm not convinced that this is a sufficiently common concern to
> >> justify new APIs, or even to try to make overly generic. I think just
> >> implementing a new DMA attribute to say "please allocate/map this
> >> particular request at the lowest DMA address possible" would be good
> >> enough. Such a thing could also serve PCI drivers that actually care
> >> about SAC/DAC to give us more of a chance of removing the "try a
> >> 32-bit mask first" trick from everyone's hotpath...
> >
> > Hmm, I like the idea of such DMA attribute! It should make things really
> > simple, especially in the drivers. Thanks for the great idea! I will try
> > to implement it then instead of the workarounds I've proposed in
> > s5p-mfc/exynos4-is drivers.
>
> Right, I think it's fair to draw a line and say that anyone who wants a
> *specific* address needs to manage their own IOMMU domain.
>
> In the backend I suspect it's going to be cleanest to implement a
> dedicated iova_alloc_low() (or similar) function in the IOVA API that
> sidesteps all of the existing allocation paths and goes straight to the
> rbtree.

This is the place we started with..

But our solution was to provide an API which limits the allocation
range per device (dynamically) based on the driver request..
Something like,
limit_iova_alloc_range(dev, low_iova, high_iova); /* via helpers */

When multiple devices use the same IOVA space, how we can handle api's
like " iova_alloc_low()" ?
And providing APIs like " limit_iova_alloc_range()" may cater similar
future requirements from drivers instead of worrying about
high/low/mid etc.

Again, flexibility should be there with user drivers to request the
range they want at any point of time...

Please let us know your inputs.

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


Re: IOVA allocation dependency between firmware buffer and remaining buffers

2020-04-24 Thread Shaik Ameer Basha
On Fri, Apr 24, 2020 at 8:59 PM Robin Murphy  wrote:
>
> On 2020-04-24 4:04 pm, Ajay kumar wrote:
> > Can someone check this?
> >
> > On Mon, Apr 20, 2020 at 9:24 PM Ajay kumar  wrote:
> >>
> >> Hi All,
> >>
> >> I have an IOMMU master which has limitations as mentioned below:
> >> 1) The IOMMU master internally executes a firmware, and the firmware memory
> >> is allocated by the same master driver.
> >> The firmware buffer address should be of the lowest range than other 
> >> address
> >> allocated by the device, or in other words, all the remaining buffer 
> >> addresses
> >> should always be in a higher range than the firmware address.
> >> 2) None of the buffer addresses should go beyond 0xC000_
>
> That particular constraint could (and perhaps should) be expressed as a
> DMA mask/limit for the device, but if you have specific requirements to

Yes Robin. We do use 0xC000_ address to set the DMA mask in our driver.

> place buffers at particular addresses then you might be better off
> managing your own IOMMU domain like some other (mostly DRM) drivers do.

If you remember any of such drivers can you please point the driver path ?

> The DMA APIs don't offer any guarantees about what addresses you'll get
> other than that they won't exceed the appropriate mask.

True, we have gone through most of the APIs and didn't find any way to match our
requirements with the existing DMA APIs

>
> >> example:
> >> If firmware buffer address is buf_fw = 0x8000_5000;
> >> All other addresses given to the device should be greater than
> >> (0x8000_5000 + firmware size) and less than 0xC000_
>
> Out of curiosity, how do you control that in the no-IOMMU or IOMMU
> passthrough cases?

We manage the no-IOMMU or pass through cases using the reserved-memory.

>
> Robin.
>
> >> Currently, this is being handled with one of the below hacks:
> >> 1) By keeping dma_mask in lower range while allocating firmware buffer,
> >> and then increasing the dma_mask to higher range for other buffers.
> >> 2) By reserving IOVA for firmware at the lowest range and creating direct 
> >> mappings for the same.
> >>
> >> I want to know if there is a better way this can be handled with current 
> >> framework,
> >> or if anybody is facing similar problems with their devices,
> >> please share how it is taken care.
> >>
> >> I also think there should be some way the masters can specify the IOVA
> >> range they want to limit to for current allocation.
> >> Something like a new iommu_ops callback like below:
> >> limit_iova_alloc_range(dev, iova_start, iova_end)
> >>
> >> And, in my driver, the sequence will be:
> >> limit_iova_alloc_range(dev, 0x_, 0x1000_); /* via helpers */
> >> alloc( ) firmware buffer using DMA API
> >> limit_iova_alloc_range(dev, 0x1000_, 0xC000_); /* via helpers */
> >> alloc( ) other buffers using DMA API
> >>

Just want to understand more from you, on the new iommu_ops we suggested.
Shouldn't device have that flexibility to allocate IOVA as per it's requirement?
If you see our device as example, we need to have control on the
allocated IOVA region
based on where device is using this buffer.

If we have these callbacks in place, then the low level IOMMU driver
can implement and
manage such requests when needed.

If this can't be taken forward for some right reasons, then we will
definitely try to understand
on how to manage the IOMMU domain from our driver as per your suggestion

- Shaik.

> >> Thanks,
> >> Ajay Kumar
___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu


[PATCH] documentation/iommu: Add note on existing DT binding status

2014-05-13 Thread Shaik Ameer Basha
The current dt binding for Exynos System MMU can be changed, if found
incompatible with the support for Generic IOMMU Binding.
This patch adds a note to the binding documentation stating the same.

Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 .../devicetree/bindings/iommu/samsung,sysmmu.txt   |5 +
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt 
b/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
index 15b2a2b..6fa4c73 100644
--- a/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
+++ b/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
@@ -27,6 +27,11 @@ The drivers must consider how to handle those System MMUs. 
One of the idea is
 to implement child devices or sub-devices which are the client devices of the
 System MMU.
 
+Note:
+The current DT binding for the Exynos System MMU is incomplete.
+The following properties can be removed or changed, if found incompatible with
+the Generic IOMMU Binding support for attaching devices to the IOMMU.
+
 Required properties:
 - compatible: Should be samsung,exynos-sysmmu
 - reg: A tuple of base address and size of System MMU registers.
-- 
1.7.9.5

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


Re: [PATCH v13 00/19] iommu/exynos: Fixes and Enhancements of System MMU driver with DT

2014-05-13 Thread Shaik Ameer Basha
On Tue, May 13, 2014 at 10:50 PM, Joerg Roedel j...@8bytes.org wrote:
 On Mon, May 12, 2014 at 11:44:45AM +0530, Shaik Ameer Basha wrote:
 Cho KyongHo (18):
   iommu/exynos: fix build errors
   iommu/exynos: change error handling when page table update is failed
   iommu/exynos: allocate lv2 page table from own slab
   iommu/exynos: fix L2TLB invalidation
   iommu/exynos: remove prefetch buffer setting
   iommu/exynos: add missing cache flush for removed page table entries
   iommu/exynos: always enable runtime PM
   iommu/exynos: remove dbgname from drvdata of a System MMU
   iommu/exynos: use managed device helper functions
   iommu/exynos: gating clocks of master H/W
   iommu/exynos: remove custom fault handler
   iommu/exynos: change rwlock to spinlock
   iommu/exynos: use exynos-iommu specific typedef
   iommu/exynos: enhanced error messages
   documentation: iommu: add binding document of Exynos System MMU
   iommu/exynos: support for device tree
   iommu/exynos: turn on useful configuration options
   iommu/exynos: apply workaround of caching fault page table entries

  .../devicetree/bindings/iommu/samsung,sysmmu.txt   |   65 ++
  drivers/iommu/exynos-iommu.c   | 1035 
 
  2 files changed, 677 insertions(+), 423 deletions(-)
  create mode 100644 
 Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt

 Applied, thanks. Please send another patch to update the documentation
 as requested by Arnd.

Hi Joerg,

Thanks for applying the series.
I posted one patch addressing 'Arnd' comments. Please apply it on top
of this series.
-- documentation/iommu: Add note on existing DT binding status

Regards,
Shaik




 Joerg


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


[PATCH v13 03/19] iommu/exynos: allocate lv2 page table from own slab

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Since kmalloc() does not guarantee that the allignment of 1KiB when it
allocates 1KiB, it is required to allocate lv2 page table from own
slab that guarantees alignment of 1KiB

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   34 --
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index aec7fd7..4ff4b0b 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -99,6 +99,8 @@
 #define REG_PB1_SADDR  0x054
 #define REG_PB1_EADDR  0x058
 
+static struct kmem_cache *lv2table_kmem_cache;
+
 static unsigned long *section_entry(unsigned long *pgtable, unsigned long iova)
 {
return pgtable + lv1ent_offset(iova);
@@ -637,7 +639,8 @@ static void exynos_iommu_domain_destroy(struct iommu_domain 
*domain)
 
for (i = 0; i  NUM_LV1ENTRIES; i++)
if (lv1ent_page(priv-pgtable + i))
-   kfree(phys_to_virt(lv2table_base(priv-pgtable + i)));
+   kmem_cache_free(lv2table_kmem_cache,
+   phys_to_virt(lv2table_base(priv-pgtable + i)));
 
free_pages((unsigned long)priv-pgtable, 2);
free_pages((unsigned long)priv-lv2entcnt, 1);
@@ -736,7 +739,7 @@ static unsigned long *alloc_lv2entry(unsigned long *sent, 
unsigned long iova,
if (lv1ent_fault(sent)) {
unsigned long *pent;
 
-   pent = kzalloc(LV2TABLE_SIZE, GFP_ATOMIC);
+   pent = kmem_cache_zalloc(lv2table_kmem_cache, GFP_ATOMIC);
BUG_ON((unsigned long)pent  (LV2TABLE_SIZE - 1));
if (!pent)
return ERR_PTR(-ENOMEM);
@@ -766,8 +769,7 @@ static int lv1set_section(unsigned long *sent, unsigned 
long iova,
return -EADDRINUSE;
}
 
-   kfree(page_entry(sent, 0));
-
+   kmem_cache_free(lv2table_kmem_cache, page_entry(sent, 0));
*pgcnt = 0;
}
 
@@ -970,11 +972,31 @@ static int __init exynos_iommu_init(void)
 {
int ret;
 
+   lv2table_kmem_cache = kmem_cache_create(exynos-iommu-lv2table,
+   LV2TABLE_SIZE, LV2TABLE_SIZE, 0, NULL);
+   if (!lv2table_kmem_cache) {
+   pr_err(%s: Failed to create kmem cache\n, __func__);
+   return -ENOMEM;
+   }
+
ret = platform_driver_register(exynos_sysmmu_driver);
+   if (ret) {
+   pr_err(%s: Failed to register driver\n, __func__);
+   goto err_reg_driver;
+   }
 
-   if (ret == 0)
-   bus_set_iommu(platform_bus_type, exynos_iommu_ops);
+   ret = bus_set_iommu(platform_bus_type, exynos_iommu_ops);
+   if (ret) {
+   pr_err(%s: Failed to register exynos-iommu driver.\n,
+   __func__);
+   goto err_set_iommu;
+   }
 
+   return 0;
+err_set_iommu:
+   platform_driver_unregister(exynos_sysmmu_driver);
+err_reg_driver:
+   kmem_cache_destroy(lv2table_kmem_cache);
return ret;
 }
 subsys_initcall(exynos_iommu_init);
-- 
1.7.9.5

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


[PATCH v13 01/19] iommu/exynos: fix build errors

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Commit 25e9d28d92 (ARM: EXYNOS: remove system mmu initialization from
exynos tree) removed arch/arm/mach-exynos/mach/sysmmu.h header without
removing remaining use of it from exynos-iommu driver, thus causing a
compilation error.

This patch fixes the error by removing respective include line
from exynos-iommu.c.

Use of __pa and __va macro is changed to virt_to_phys and phys_to_virt
which are recommended in driver code. printk formatting of physical
address is also fixed to %pa.

Also System MMU driver is changed to control only a single instance
of System MMU at a time. Since a single instance of System MMU has only
a single clock descriptor for its clock gating, single address range
for control registers, there is no need to obtain two or more clock
descriptors and ioremaped region.

CC: Tomasz Figa t.f...@samsung.com
Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |  255 ++
 1 file changed, 85 insertions(+), 170 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 0740189..8d7c3f9 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -29,8 +29,6 @@
 #include asm/cacheflush.h
 #include asm/pgtable.h
 
-#include mach/sysmmu.h
-
 /* We does not consider super section mapping (16MB) */
 #define SECT_ORDER 20
 #define LPAGE_ORDER 16
@@ -108,7 +106,8 @@ static unsigned long *section_entry(unsigned long *pgtable, 
unsigned long iova)
 
 static unsigned long *page_entry(unsigned long *sent, unsigned long iova)
 {
-   return (unsigned long *)__va(lv2table_base(sent)) + lv2ent_offset(iova);
+   return (unsigned long *)phys_to_virt(
+   lv2table_base(sent)) + lv2ent_offset(iova);
 }
 
 enum exynos_sysmmu_inttype {
@@ -132,7 +131,7 @@ enum exynos_sysmmu_inttype {
  * translated. This is 0 if @itype is SYSMMU_BUSERROR.
  */
 typedef int (*sysmmu_fault_handler_t)(enum exynos_sysmmu_inttype itype,
-   unsigned long pgtable_base, unsigned long fault_addr);
+   phys_addr_t pgtable_base, unsigned long fault_addr);
 
 static unsigned short fault_reg_offset[SYSMMU_FAULTS_NUM] = {
REG_PAGE_FAULT_ADDR,
@@ -170,14 +169,13 @@ struct sysmmu_drvdata {
struct device *sysmmu;  /* System MMU's device descriptor */
struct device *dev; /* Owner of system MMU */
char *dbgname;
-   int nsfrs;
-   void __iomem **sfrbases;
-   struct clk *clk[2];
+   void __iomem *sfrbase;
+   struct clk *clk;
int activations;
rwlock_t lock;
struct iommu_domain *domain;
sysmmu_fault_handler_t fault_handler;
-   unsigned long pgtable;
+   phys_addr_t pgtable;
 };
 
 static bool set_sysmmu_active(struct sysmmu_drvdata *data)
@@ -266,17 +264,17 @@ void exynos_sysmmu_set_fault_handler(struct device *dev,
 }
 
 static int default_fault_handler(enum exynos_sysmmu_inttype itype,
-unsigned long pgtable_base, unsigned long fault_addr)
+   phys_addr_t pgtable_base, unsigned long fault_addr)
 {
unsigned long *ent;
 
if ((itype = SYSMMU_FAULTS_NUM) || (itype  SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN;
 
-   pr_err(%s occurred at 0x%lx(Page table base: 0x%lx)\n,
-   sysmmu_fault_name[itype], fault_addr, pgtable_base);
+   pr_err(%s occurred at 0x%lx(Page table base: %pa)\n,
+   sysmmu_fault_name[itype], fault_addr, pgtable_base);
 
-   ent = section_entry(__va(pgtable_base), fault_addr);
+   ent = section_entry(phys_to_virt(pgtable_base), fault_addr);
pr_err(\tLv1 entry: 0x%lx\n, *ent);
 
if (lv1ent_page(ent)) {
@@ -295,56 +293,39 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void 
*dev_id)
 {
/* SYSMMU is in blocked when interrupt occurred. */
struct sysmmu_drvdata *data = dev_id;
-   struct resource *irqres;
-   struct platform_device *pdev;
enum exynos_sysmmu_inttype itype;
unsigned long addr = -1;
-
-   int i, ret = -ENOSYS;
+   int ret = -ENOSYS;
 
read_lock(data-lock);
 
WARN_ON(!is_sysmmu_active(data));
 
-   pdev = to_platform_device(data-sysmmu);
-   for (i = 0; i  (pdev-num_resources / 2); i++) {
-   irqres = platform_get_resource(pdev, IORESOURCE_IRQ, i);
-   if (irqres  ((int)irqres-start == irq))
-   break;
-   }
-
-   if (i == pdev-num_resources) {
+   itype = (enum exynos_sysmmu_inttype)
+   __ffs(__raw_readl(data-sfrbase + REG_INT_STATUS));
+   if (WARN_ON(!((itype = 0)  (itype  SYSMMU_FAULT_UNKNOWN
itype = SYSMMU_FAULT_UNKNOWN;
-   } else {
-   itype = (enum exynos_sysmmu_inttype

[PATCH v13 04/19] iommu/exynos: fix L2TLB invalidation

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

L2TLB is 8-way set-associative TLB with 512 entries. The number of
sets is 64.
A single 4KB(small page) translation information is cached
only to a set whose index is the same with the lower 6 bits of the page
frame number.
A single 64KB(large page) translation information can be
cached to any 16 sets whose top two bits of their indices are the same
with the bit [5:4] of the page frame number.
A single 1MB(section) or larger translation information can be cached to
any set in the TLB.

It is required to invalidate entire sets that may cache the target
translation information to guarantee that the L2TLB has no stale data.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   32 +++-
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 4ff4b0b..06fc70e 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -226,9 +226,14 @@ static void __sysmmu_tlb_invalidate(void __iomem *sfrbase)
 }
 
 static void __sysmmu_tlb_invalidate_entry(void __iomem *sfrbase,
-   unsigned long iova)
+   unsigned long iova, unsigned int num_inv)
 {
-   __raw_writel((iova  SPAGE_MASK) | 1, sfrbase + REG_MMU_FLUSH_ENTRY);
+   unsigned int i;
+   for (i = 0; i  num_inv; i++) {
+   __raw_writel((iova  SPAGE_MASK) | 1,
+   sfrbase + REG_MMU_FLUSH_ENTRY);
+   iova += SPAGE_SIZE;
+   }
 }
 
 static void __sysmmu_set_ptbase(void __iomem *sfrbase,
@@ -452,7 +457,8 @@ static bool exynos_sysmmu_disable(struct device *dev)
return disabled;
 }
 
-static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova)
+static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova,
+   size_t size)
 {
unsigned long flags;
struct sysmmu_drvdata *data = dev_get_drvdata(dev-archdata.iommu);
@@ -460,9 +466,25 @@ static void sysmmu_tlb_invalidate_entry(struct device 
*dev, unsigned long iova)
read_lock_irqsave(data-lock, flags);
 
if (is_sysmmu_active(data)) {
+   unsigned int maj;
+   unsigned int num_inv = 1;
+   maj = __raw_readl(data-sfrbase + REG_MMU_VERSION);
+   /*
+* L2TLB invalidation required
+* 4KB page: 1 invalidation
+* 64KB page: 16 invalidation
+* 1MB page: 64 invalidation
+* because it is set-associative TLB
+* with 8-way and 64 sets.
+* 1MB page can be cached in one of all sets.
+* 64KB page can be one of 16 consecutive sets.
+*/
+   if ((maj  28) == 2) /* major version number */
+   num_inv = min_t(unsigned int, size / PAGE_SIZE, 64);
+
if (sysmmu_block(data-sfrbase)) {
__sysmmu_tlb_invalidate_entry(
-   data-sfrbase, iova);
+   data-sfrbase, iova, num_inv);
sysmmu_unblock(data-sfrbase);
}
} else {
@@ -915,7 +937,7 @@ done:
 
spin_lock_irqsave(priv-lock, flags);
list_for_each_entry(data, priv-clients, node)
-   sysmmu_tlb_invalidate_entry(data-dev, iova);
+   sysmmu_tlb_invalidate_entry(data-dev, iova, size);
spin_unlock_irqrestore(priv-lock, flags);
 
return size;
-- 
1.7.9.5

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


[PATCH v13 08/19] iommu/exynos: remove dbgname from drvdata of a System MMU

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch removes dbgname member from sysmmu_drvdata structure.
Kernel message for debugging already has the name of a single
System MMU node. It also removes some compilation warnings.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   32 +---
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index ef771a2..be7a7b9 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -170,7 +170,6 @@ struct sysmmu_drvdata {
struct list_head node; /* entry of exynos_iommu_domain.clients */
struct device *sysmmu;  /* System MMU's device descriptor */
struct device *dev; /* Owner of system MMU */
-   char *dbgname;
void __iomem *sfrbase;
struct clk *clk;
int activations;
@@ -321,8 +320,8 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
if (!ret  (itype != SYSMMU_FAULT_UNKNOWN))
__raw_writel(1  itype, data-sfrbase + REG_INT_CLEAR);
else
-   dev_dbg(data-sysmmu, (%s) %s is not handled.\n,
-   data-dbgname, sysmmu_fault_name[itype]);
+   dev_dbg(data-sysmmu, %s is not handled.\n,
+   sysmmu_fault_name[itype]);
 
if (itype != SYSMMU_FAULT_UNKNOWN)
sysmmu_unblock(data-sfrbase);
@@ -354,10 +353,10 @@ finish:
write_unlock_irqrestore(data-lock, flags);
 
if (disabled)
-   dev_dbg(data-sysmmu, (%s) Disabled\n, data-dbgname);
+   dev_dbg(data-sysmmu, Disabled\n);
else
-   dev_dbg(data-sysmmu, (%s) %d times left to be disabled\n,
-   data-dbgname, data-activations);
+   dev_dbg(data-sysmmu, %d times left to be disabled\n,
+   data-activations);
 
return disabled;
 }
@@ -384,7 +383,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata 
*data,
ret = 1;
}
 
-   dev_dbg(data-sysmmu, (%s) Already enabled\n, data-dbgname);
+   dev_dbg(data-sysmmu, Already enabled\n);
goto finish;
}
 
@@ -399,7 +398,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata 
*data,
 
data-domain = domain;
 
-   dev_dbg(data-sysmmu, (%s) Enabled\n, data-dbgname);
+   dev_dbg(data-sysmmu, Enabled\n);
 finish:
write_unlock_irqrestore(data-lock, flags);
 
@@ -415,16 +414,15 @@ int exynos_sysmmu_enable(struct device *dev, unsigned 
long pgtable)
 
ret = pm_runtime_get_sync(data-sysmmu);
if (ret  0) {
-   dev_dbg(data-sysmmu, (%s) Failed to enable\n, data-dbgname);
+   dev_dbg(data-sysmmu, Failed to enable\n);
return ret;
}
 
ret = __exynos_sysmmu_enable(data, pgtable, NULL);
if (WARN_ON(ret  0)) {
pm_runtime_put(data-sysmmu);
-   dev_err(data-sysmmu,
-   (%s) Already enabled with page table %#x\n,
-   data-dbgname, data-pgtable);
+   dev_err(data-sysmmu, Already enabled with page table %#x\n,
+   data-pgtable);
} else {
data-dev = dev;
}
@@ -474,9 +472,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, 
unsigned long iova,
sysmmu_unblock(data-sfrbase);
}
} else {
-   dev_dbg(data-sysmmu,
-   (%s) Disabled. Skipping invalidating TLB.\n,
-   data-dbgname);
+   dev_dbg(data-sysmmu, Disabled. Skipping invalidating TLB.\n);
}
 
read_unlock_irqrestore(data-lock, flags);
@@ -495,9 +491,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev)
sysmmu_unblock(data-sfrbase);
}
} else {
-   dev_dbg(data-sysmmu,
-   (%s) Disabled. Skipping invalidating TLB.\n,
-   data-dbgname);
+   dev_dbg(data-sysmmu, Disabled. Skipping invalidating TLB.\n);
}
 
read_unlock_irqrestore(data-lock, flags);
@@ -560,7 +554,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
 
pm_runtime_enable(dev);
 
-   dev_dbg(dev, (%s) Initialized\n, data-dbgname);
+   dev_dbg(dev, Initialized\n);
return 0;
 err_irq:
free_irq(platform_get_irq(pdev, 0), data);
-- 
1.7.9.5

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


[PATCH v13 17/19] iommu/exynos: support for device tree

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This commit adds device tree support for System MMU.

Also, system mmu handling is improved. Previously, an IOMMU domain is
bound to a System MMU which is not correct. This patch binds an IOMMU
domain with the master device of a System MMU.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |  283 +++---
 1 file changed, 158 insertions(+), 125 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 7188b47..b937490 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -114,6 +114,8 @@ static u32 lv2ent_offset(sysmmu_iova_t iova)
 #define REG_PB1_SADDR  0x054
 #define REG_PB1_EADDR  0x058
 
+#define has_sysmmu(dev)(dev-archdata.iommu != NULL)
+
 static struct kmem_cache *lv2table_kmem_cache;
 
 static sysmmu_pte_t *section_entry(sysmmu_pte_t *pgtable, sysmmu_iova_t iova)
@@ -163,6 +165,16 @@ static char *sysmmu_fault_name[SYSMMU_FAULTS_NUM] = {
UNKNOWN FAULT
 };
 
+/* attached to dev.archdata.iommu of the master device */
+struct exynos_iommu_owner {
+   struct list_head client; /* entry of exynos_iommu_domain.clients */
+   struct device *dev;
+   struct device *sysmmu;
+   struct iommu_domain *domain;
+   void *vmm_data; /* IO virtual memory manager's data */
+   spinlock_t lock;/* Lock to preserve consistency of System MMU */
+};
+
 struct exynos_iommu_domain {
struct list_head clients; /* list of sysmmu_drvdata.node */
sysmmu_pte_t *pgtable; /* lv1 page table, 16KB */
@@ -172,9 +184,8 @@ struct exynos_iommu_domain {
 };
 
 struct sysmmu_drvdata {
-   struct list_head node; /* entry of exynos_iommu_domain.clients */
struct device *sysmmu;  /* System MMU's device descriptor */
-   struct device *dev; /* Owner of system MMU */
+   struct device *master;  /* Owner of system MMU */
void __iomem *sfrbase;
struct clk *clk;
struct clk *clk_master;
@@ -243,7 +254,6 @@ static void __sysmmu_tlb_invalidate_entry(void __iomem 
*sfrbase,
 static void __sysmmu_set_ptbase(void __iomem *sfrbase,
   phys_addr_t pgd)
 {
-   __raw_writel(0x1, sfrbase + REG_MMU_CFG); /* 16KB LV1, LRU */
__raw_writel(pgd, sfrbase + REG_PT_BASE_ADDR);
 
__sysmmu_tlb_invalidate(sfrbase);
@@ -305,7 +315,7 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
itype, base, addr);
if (data-domain)
ret = report_iommu_fault(data-domain,
-   data-dev, addr, itype);
+   data-master, addr, itype);
}
 
/* fault is not recovered by fault handler */
@@ -323,120 +333,152 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void 
*dev_id)
return IRQ_HANDLED;
 }
 
-static bool __exynos_sysmmu_disable(struct sysmmu_drvdata *data)
+static void __sysmmu_disable_nocount(struct sysmmu_drvdata *data)
 {
-   unsigned long flags;
-   bool disabled = false;
-
-   spin_lock_irqsave(data-lock, flags);
-
-   if (!set_sysmmu_inactive(data))
-   goto finish;
-
if (!IS_ERR(data-clk_master))
clk_enable(data-clk_master);
 
__raw_writel(CTRL_DISABLE, data-sfrbase + REG_MMU_CTRL);
+   __raw_writel(0, data-sfrbase + REG_MMU_CFG);
 
clk_disable(data-clk);
if (!IS_ERR(data-clk_master))
clk_disable(data-clk_master);
-
-   disabled = true;
-   data-pgtable = 0;
-   data-domain = NULL;
-finish:
-   spin_unlock_irqrestore(data-lock, flags);
-
-   if (disabled)
-   dev_dbg(data-sysmmu, Disabled\n);
-   else
-   dev_dbg(data-sysmmu, %d times left to be disabled\n,
-   data-activations);
-
-   return disabled;
 }
 
-/* __exynos_sysmmu_enable: Enables System MMU
- *
- * returns -error if an error occurred and System MMU is not enabled,
- * 0 if the System MMU has been just enabled and 1 if System MMU was already
- * enabled before.
- */
-static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data,
-   phys_addr_t pgtable, struct iommu_domain *domain)
+static bool __sysmmu_disable(struct sysmmu_drvdata *data)
 {
-   int ret = 0;
+   bool disabled;
unsigned long flags;
 
spin_lock_irqsave(data-lock, flags);
 
-   if (!set_sysmmu_active(data)) {
-   if (WARN_ON(pgtable != data-pgtable)) {
-   ret = -EBUSY;
-   set_sysmmu_inactive(data);
-   } else {
-   ret = 1;
-   }
+   disabled = set_sysmmu_inactive(data);
+
+   if (disabled) {
+   data

[PATCH v13 14/19] iommu/exynos: add devices attached to the System MMU to an IOMMU group

2014-05-12 Thread Shaik Ameer Basha
From: Antonios Motakis a.mota...@virtualopensystems.com

Patch written by Antonios Motakis a.mota...@virtualopensystems.com:

IOMMU groups are expected by certain users of the IOMMU API,
e.g. VFIO. Since each device is behind its own System MMU, we
can allocate a new IOMMU group for each device.

Reviewed-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Antonios Motakis a.mota...@virtualopensystems.com
Signed-off-by: Shaik Ameeer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   28 
 1 file changed, 28 insertions(+)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 3291619..d18dc37 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -964,6 +964,32 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct 
iommu_domain *domain,
return phys;
 }
 
+static int exynos_iommu_add_device(struct device *dev)
+{
+   struct iommu_group *group;
+   int ret;
+
+   group = iommu_group_get(dev);
+
+   if (!group) {
+   group = iommu_group_alloc();
+   if (IS_ERR(group)) {
+   dev_err(dev, Failed to allocate IOMMU group\n);
+   return PTR_ERR(group);
+   }
+   }
+
+   ret = iommu_group_add_device(group, dev);
+   iommu_group_put(group);
+
+   return ret;
+}
+
+static void exynos_iommu_remove_device(struct device *dev)
+{
+   iommu_group_remove_device(dev);
+}
+
 static struct iommu_ops exynos_iommu_ops = {
.domain_init = exynos_iommu_domain_init,
.domain_destroy = exynos_iommu_domain_destroy,
@@ -972,6 +998,8 @@ static struct iommu_ops exynos_iommu_ops = {
.map = exynos_iommu_map,
.unmap = exynos_iommu_unmap,
.iova_to_phys = exynos_iommu_iova_to_phys,
+   .add_device = exynos_iommu_add_device,
+   .remove_device = exynos_iommu_remove_device,
.pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
 };
 
-- 
1.7.9.5

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


[PATCH v13 13/19] iommu/exynos: use exynos-iommu specific typedef

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This commit introduces sysmmu_pte_t for page table entries and
sysmmu_iova_t vor I/O virtual address that is manipulated by
exynos-iommu driver. The purpose of the typedef is to remove
dependencies to the driver code from the change of CPU architecture
from 32 bit to 64 bit.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |  101 --
 1 file changed, 59 insertions(+), 42 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index d89ad5f..3291619 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -29,6 +29,9 @@
 #include asm/cacheflush.h
 #include asm/pgtable.h
 
+typedef u32 sysmmu_iova_t;
+typedef u32 sysmmu_pte_t;
+
 /* We does not consider super section mapping (16MB) */
 #define SECT_ORDER 20
 #define LPAGE_ORDER 16
@@ -50,20 +53,32 @@
 #define lv2ent_small(pent) ((*(pent)  2) == 2)
 #define lv2ent_large(pent) ((*(pent)  3) == 1)
 
+static u32 sysmmu_page_offset(sysmmu_iova_t iova, u32 size)
+{
+   return iova  (size - 1);
+}
+
 #define section_phys(sent) (*(sent)  SECT_MASK)
-#define section_offs(iova) ((iova)  0xF)
+#define section_offs(iova) sysmmu_page_offset((iova), SECT_SIZE)
 #define lpage_phys(pent) (*(pent)  LPAGE_MASK)
-#define lpage_offs(iova) ((iova)  0x)
+#define lpage_offs(iova) sysmmu_page_offset((iova), LPAGE_SIZE)
 #define spage_phys(pent) (*(pent)  SPAGE_MASK)
-#define spage_offs(iova) ((iova)  0xFFF)
-
-#define lv1ent_offset(iova) ((iova)  SECT_ORDER)
-#define lv2ent_offset(iova) (((iova)  0xFF000)  SPAGE_ORDER)
+#define spage_offs(iova) sysmmu_page_offset((iova), SPAGE_SIZE)
 
 #define NUM_LV1ENTRIES 4096
-#define NUM_LV2ENTRIES 256
+#define NUM_LV2ENTRIES (SECT_SIZE / SPAGE_SIZE)
 
-#define LV2TABLE_SIZE (NUM_LV2ENTRIES * sizeof(long))
+static u32 lv1ent_offset(sysmmu_iova_t iova)
+{
+   return iova  SECT_ORDER;
+}
+
+static u32 lv2ent_offset(sysmmu_iova_t iova)
+{
+   return (iova  SPAGE_ORDER)  (NUM_LV2ENTRIES - 1);
+}
+
+#define LV2TABLE_SIZE (NUM_LV2ENTRIES * sizeof(sysmmu_pte_t))
 
 #define SPAGES_PER_LPAGE (LPAGE_SIZE / SPAGE_SIZE)
 
@@ -101,14 +116,14 @@
 
 static struct kmem_cache *lv2table_kmem_cache;
 
-static unsigned long *section_entry(unsigned long *pgtable, unsigned long iova)
+static sysmmu_pte_t *section_entry(sysmmu_pte_t *pgtable, sysmmu_iova_t iova)
 {
return pgtable + lv1ent_offset(iova);
 }
 
-static unsigned long *page_entry(unsigned long *sent, unsigned long iova)
+static sysmmu_pte_t *page_entry(sysmmu_pte_t *sent, sysmmu_iova_t iova)
 {
-   return (unsigned long *)phys_to_virt(
+   return (sysmmu_pte_t *)phys_to_virt(
lv2table_base(sent)) + lv2ent_offset(iova);
 }
 
@@ -150,7 +165,7 @@ static char *sysmmu_fault_name[SYSMMU_FAULTS_NUM] = {
 
 struct exynos_iommu_domain {
struct list_head clients; /* list of sysmmu_drvdata.node */
-   unsigned long *pgtable; /* lv1 page table, 16KB */
+   sysmmu_pte_t *pgtable; /* lv1 page table, 16KB */
short *lv2entcnt; /* free lv2 entry counter for each section */
spinlock_t lock; /* lock for this structure */
spinlock_t pgtablelock; /* lock for modifying page table @ pgtable */
@@ -215,7 +230,7 @@ static void __sysmmu_tlb_invalidate(void __iomem *sfrbase)
 }
 
 static void __sysmmu_tlb_invalidate_entry(void __iomem *sfrbase,
-   unsigned long iova, unsigned int num_inv)
+   sysmmu_iova_t iova, unsigned int num_inv)
 {
unsigned int i;
for (i = 0; i  num_inv; i++) {
@@ -226,7 +241,7 @@ static void __sysmmu_tlb_invalidate_entry(void __iomem 
*sfrbase,
 }
 
 static void __sysmmu_set_ptbase(void __iomem *sfrbase,
-  unsigned long pgd)
+  phys_addr_t pgd)
 {
__raw_writel(0x1, sfrbase + REG_MMU_CFG); /* 16KB LV1, LRU */
__raw_writel(pgd, sfrbase + REG_PT_BASE_ADDR);
@@ -236,22 +251,22 @@ static void __sysmmu_set_ptbase(void __iomem *sfrbase,
 
 static void show_fault_information(const char *name,
enum exynos_sysmmu_inttype itype,
-   phys_addr_t pgtable_base, unsigned long fault_addr)
+   phys_addr_t pgtable_base, sysmmu_iova_t fault_addr)
 {
-   unsigned long *ent;
+   sysmmu_pte_t *ent;
 
if ((itype = SYSMMU_FAULTS_NUM) || (itype  SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN;
 
-   pr_err(%s occurred at %#lx by %s(Page table base: %pa)\n,
+   pr_err(%s occurred at %#x by %s(Page table base: %pa)\n,
sysmmu_fault_name[itype], fault_addr, name, pgtable_base);
 
ent = section_entry(phys_to_virt(pgtable_base), fault_addr);
-   pr_err(\tLv1 entry: 0x%lx\n, *ent);
+   pr_err(\tLv1 entry: %#x\n, *ent

[PATCH v13 16/19] documentation: iommu: add binding document of Exynos System MMU

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch adds a description of the device tree binding for the
Samsung Exynos System MMU.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 .../devicetree/bindings/iommu/samsung,sysmmu.txt   |   65 
 1 file changed, 65 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt

diff --git a/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt 
b/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
new file mode 100644
index 000..15b2a2b
--- /dev/null
+++ b/Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
@@ -0,0 +1,65 @@
+Samsung Exynos IOMMU H/W, System MMU (System Memory Management Unit)
+
+Samsung's Exynos architecture contains System MMUs that enables scattered
+physical memory chunks visible as a contiguous region to DMA-capable peripheral
+devices like MFC, FIMC, FIMD, GScaler, FIMC-IS and so forth.
+
+System MMU is an IOMMU and supports identical translation table format to
+ARMv7 translation tables with minimum set of page properties including access
+permissions, shareability and security protection. In addition, System MMU has
+another capabilities like L2 TLB or block-fetch buffers to minimize translation
+latency.
+
+System MMUs are in many to one relation with peripheral devices, i.e. single
+peripheral device might have multiple System MMUs (usually one for each bus
+master), but one System MMU can handle transactions from only one peripheral
+device. The relation between a System MMU and the peripheral device needs to be
+defined in device node of the peripheral device.
+
+MFC in all Exynos SoCs and FIMD, M2M Scalers and G2D in Exynos5420 has 2 System
+MMUs.
+* MFC has one System MMU on its left and right bus.
+* FIMD in Exynos5420 has one System MMU for window 0 and 4, the other system 
MMU
+  for window 1, 2 and 3.
+* M2M Scalers and G2D in Exynos5420 has one System MMU on the read channel and
+  the other System MMU on the write channel.
+The drivers must consider how to handle those System MMUs. One of the idea is
+to implement child devices or sub-devices which are the client devices of the
+System MMU.
+
+Required properties:
+- compatible: Should be samsung,exynos-sysmmu
+- reg: A tuple of base address and size of System MMU registers.
+- interrupt-parent: The phandle of the interrupt controller of System MMU
+- interrupts: An interrupt specifier for interrupt signal of System MMU,
+ according to the format defined by a particular interrupt
+ controller.
+- clock-names: Should be sysmmu if the System MMU is needed to gate its 
clock.
+  Optional master if the clock to the System MMU is gated by
+  another gate clock other than sysmmu.
+  Exynos4 SoCs, there needs no master clock.
+  Exynos5 SoCs, some System MMUs must have master clocks.
+- clocks: Required if the System MMU is needed to gate its clock.
+- samsung,power-domain: Required if the System MMU is needed to gate its power.
+ Please refer to the following document:
+ Documentation/devicetree/bindings/arm/exynos/power_domain.txt
+
+Examples:
+   gsc_0: gsc@13e0 {
+   compatible = samsung,exynos5-gsc;
+   reg = 0x13e0 0x1000;
+   interrupts = 0 85 0;
+   samsung,power-domain = pd_gsc;
+   clocks = clock CLK_GSCL0;
+   clock-names = gscl;
+   };
+
+   sysmmu_gsc0: sysmmu@13E8 {
+   compatible = samsung,exynos-sysmmu;
+   reg = 0x13E8 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 2 0;
+   clock-names = sysmmu, master;
+   clocks = clock CLK_SMMU_GSCL0, clock CLK_GSCL0;
+   samsung,power-domain = pd_gsc;
+   };
-- 
1.7.9.5

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


[PATCH v13 11/19] iommu/exynos: remove custom fault handler

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This commit removes custom fault handler. The device drivers that
need to register fault handler can register
with iommu_set_fault_handler().

CC: Grant Grundler grund...@chromium.org
Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   80 +-
 1 file changed, 24 insertions(+), 56 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 5af5c5c..c1be65f 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -125,16 +125,6 @@ enum exynos_sysmmu_inttype {
SYSMMU_FAULTS_NUM
 };
 
-/*
- * @itype: type of fault.
- * @pgtable_base: the physical address of page table base. This is 0 if @itype
- *is SYSMMU_BUSERROR.
- * @fault_addr: the device (virtual) address that the System MMU tried to
- * translated. This is 0 if @itype is SYSMMU_BUSERROR.
- */
-typedef int (*sysmmu_fault_handler_t)(enum exynos_sysmmu_inttype itype,
-   phys_addr_t pgtable_base, unsigned long fault_addr);
-
 static unsigned short fault_reg_offset[SYSMMU_FAULTS_NUM] = {
REG_PAGE_FAULT_ADDR,
REG_AR_FAULT_ADDR,
@@ -176,7 +166,6 @@ struct sysmmu_drvdata {
int activations;
rwlock_t lock;
struct iommu_domain *domain;
-   sysmmu_fault_handler_t fault_handler;
phys_addr_t pgtable;
 };
 
@@ -245,34 +234,17 @@ static void __sysmmu_set_ptbase(void __iomem *sfrbase,
__sysmmu_tlb_invalidate(sfrbase);
 }
 
-static void __set_fault_handler(struct sysmmu_drvdata *data,
-   sysmmu_fault_handler_t handler)
-{
-   unsigned long flags;
-
-   write_lock_irqsave(data-lock, flags);
-   data-fault_handler = handler;
-   write_unlock_irqrestore(data-lock, flags);
-}
-
-void exynos_sysmmu_set_fault_handler(struct device *dev,
-   sysmmu_fault_handler_t handler)
-{
-   struct sysmmu_drvdata *data = dev_get_drvdata(dev-archdata.iommu);
-
-   __set_fault_handler(data, handler);
-}
-
-static int default_fault_handler(enum exynos_sysmmu_inttype itype,
-   phys_addr_t pgtable_base, unsigned long fault_addr)
+static void show_fault_information(const char *name,
+   enum exynos_sysmmu_inttype itype,
+   phys_addr_t pgtable_base, unsigned long fault_addr)
 {
unsigned long *ent;
 
if ((itype = SYSMMU_FAULTS_NUM) || (itype  SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN;
 
-   pr_err(%s occurred at 0x%lx(Page table base: %pa)\n,
-   sysmmu_fault_name[itype], fault_addr, pgtable_base);
+   pr_err(%s occurred at %#lx by %s(Page table base: %pa)\n,
+   sysmmu_fault_name[itype], fault_addr, name, pgtable_base);
 
ent = section_entry(phys_to_virt(pgtable_base), fault_addr);
pr_err(\tLv1 entry: 0x%lx\n, *ent);
@@ -281,12 +253,6 @@ static int default_fault_handler(enum 
exynos_sysmmu_inttype itype,
ent = page_entry(ent, fault_addr);
pr_err(\t Lv2 entry: 0x%lx\n, *ent);
}
-
-   pr_err(Generating Kernel OOPS... because it is unrecoverable.\n);
-
-   BUG();
-
-   return 0;
 }
 
 static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
@@ -310,24 +276,28 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void 
*dev_id)
else
addr = __raw_readl(data-sfrbase + fault_reg_offset[itype]);
 
-   if (data-domain)
-   ret = report_iommu_fault(data-domain, data-dev, addr, itype);
-
-   if ((ret == -ENOSYS)  data-fault_handler) {
-   unsigned long base = data-pgtable;
-   if (itype != SYSMMU_FAULT_UNKNOWN)
-   base = __raw_readl(data-sfrbase + REG_PT_BASE_ADDR);
-   ret = data-fault_handler(itype, base, addr);
+   if (itype == SYSMMU_FAULT_UNKNOWN) {
+   pr_err(%s: Fault is not occurred by System MMU '%s'!\n,
+   __func__, dev_name(data-sysmmu));
+   pr_err(%s: Please check if IRQ is correctly configured.\n,
+   __func__);
+   BUG();
+   } else {
+   unsigned long base =
+   __raw_readl(data-sfrbase + REG_PT_BASE_ADDR);
+   show_fault_information(dev_name(data-sysmmu),
+   itype, base, addr);
+   if (data-domain)
+   ret = report_iommu_fault(data-domain,
+   data-dev, addr, itype);
}
 
-   if (!ret  (itype != SYSMMU_FAULT_UNKNOWN))
-   __raw_writel(1  itype, data-sfrbase + REG_INT_CLEAR);
-   else
-   dev_dbg(data-sysmmu, %s is not handled.\n,
-   sysmmu_fault_name[itype

[PATCH v13 00/19] iommu/exynos: Fixes and Enhancements of System MMU driver with DT

2014-05-12 Thread Shaik Ameer Basha
This is the subset of previous v12 series and includes only the fixes and
enhancements, leaving out the private DT bindings as discussed in the below 
thread.
-- http://www.gossamer-threads.com/lists/linux/kernel/1918178

This patch series includes,
1] fixes for exynos-iommu driver build break
2] includes several bug fixes and enhancements for the exynos-iommu driver
3] code to handle multiple exynos sysmmu versions
4] adding support for device tree
Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt

Change log:
v13:
- Rebased to the latest 3.15-rc4 master branch
  git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master (3.15-rc4)
- This patch series is the subset of the previous patch series
v12: iommu/exynos: Fixes and Enhancements of System MMU driver with dt
Changes incude:
- Removed dt bindings and code specific to mmu-masters property
- Dropped patch 18/31 from previous patch series as suggested by 'Tomasz Figa'.
- Fixes buid break issue in patch 01/19 by merging the following patches
  from the previous series
iommu/exynos: do not include removed header
iommu/exynos: fix address handling
iommu/exynos: handle one instance of sysmmu with a device descriptor
- Shuffled the patches to bring all the fixes and enhancement to the start
  of the patch series

v12:
- Rebased to the latest 3.15-rc2 master branch
  git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master (3.15-rc2)
- Addressed v11 review comments from
'Sachin Kamat', 'Tomasz Figa' and 'Shaik Ameer Basha'
- Uses macro names instead of magic numbers for clock description in DT
- Moved DT binding document to seperate patch
- dtsi changes are separated into multiple patches
- patch description of some patches are updated according to the review comments
- removed the macros which hides the clock operations
- review comments related to compatible strings will be fixed in followup 
patches

v11:
- Rebased on the latest works on clock, arm/samsung, iommu branches
- Change the property to link System MMU and its master H/W
  'iommu' in the master's node - 'mmu-masters' in the System MMU's node
- Changed compatible string:
  samsung,sysmmu-v1
  samsung,sysmmu-v2
  samsung,sysmmu-v3.1
  samsung,sysmmu-v3.2
  samsung,sysmmu-v3.3
- Change the implementation of retrieving System MMU version - simpler
- Check NULL pointer before call to clk_enable() and clk_disable()
- Allow a single master to link to multiple System MMUs.
  (fimc-is, fimd/g2d/Scaler in Exynos5420)
- Workarounds of known problems of System MMU
- Code enhancements:
  * Compilable for 64-bit
  * Enhanced error messages

v10:
- Rebased on the following branches
  git.linaro.org/git-ro/people/mturquette/linux.git/clk-next
  git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git/for-next
  git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git/next
  git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master (3.12-rc3)
- Set parent clock to all System MMU clocks.
- Add clock and DT descriptos for Exynos5420
- Modified error handling in exynos_iommu_init()
- Split iommu/exynos: support for device tree patch into the following 6 
patches
  iommu/exynos: handle only one instance of System MMU
  iommu/exynos: always enable runtime PM
  iommu/exynos: always use a single clock descriptor
  iommu/exynos: remove dbgname from drvdata of a System MMU
  iommu/exynos: use managed driver helper functions
  iommu/exynos: support for device tree
- Remove 'interrupt-names' and 'status' properties from DT
- Change n:1 relationship between master:System MMU into 1:1 relationship.
- Removed custom fault handler and print the status of System MMU
  whenever System MMU fault is occurred.
- Post Antonios Motakis's commit together:
  iommu/exynos: add devices attached to the System MMU to an IOMMU group

v9:
- Rebased on the following branches
  git.linaro.org/git-ro/people/mturquette/linux.git/clk-next
  git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git/samsung-next
  git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master (3.11-rc4)
- Split add bus notifier for registering System MMU into 5 patches
- Call clk_prepare() that was missing in v8.
- Fixed base address of sysmmu_tv in exynos4210.dtsi
- BUG_ON() instead of return -EADDRINUSE when trying mapping on an mapped area
- Moved camif_top to 317 in drivers/clk/samsung/clk-exynos5250.c
- Removed 'iommu' property from 'codec'(mfc) node
- Does not make 'master' clock to be the parent of 'sysmmu' clock.
   'master' clock is enabled before accessing control registers of System MMU
   and disabled after the access.

v8:
- Reordered patch list: moved change rwloc to spinlock to the last.
- Fixed remained bug in fix page table maintenance.
- Always return 0 from exynos_iommu_attach_device().
- Removed prefetch buffer setting when System MMU is enabled
  due to the restriction of prefetch buffers:
  A prefetch buffer must not hit from more than one DMA

[PATCH v13 05/19] iommu/exynos: remove prefetch buffer setting

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Prefetch buffer is a cache of System MMU 3.x and caches a block of
page table entries to make effect of larger page with small pages.
However, how to control prefetch buffers and the specifications of
prefetch buffers different from minor versions of System MMU v3.
Prefetch buffers must be controled with care because there are some
restrictions in H/W design.

The interface and implementation to initiate prefetch buffers will
be prepared later.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   14 --
 1 file changed, 14 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 06fc70e..4fc31fc 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -245,13 +245,6 @@ static void __sysmmu_set_ptbase(void __iomem *sfrbase,
__sysmmu_tlb_invalidate(sfrbase);
 }
 
-static void __sysmmu_set_prefbuf(void __iomem *sfrbase, unsigned long base,
-   unsigned long size, int idx)
-{
-   __raw_writel(base, sfrbase + REG_PB0_SADDR + idx * 8);
-   __raw_writel(size - 1 + base,  sfrbase + REG_PB0_EADDR + idx * 8);
-}
-
 static void __set_fault_handler(struct sysmmu_drvdata *data,
sysmmu_fault_handler_t handler)
 {
@@ -401,13 +394,6 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata 
*data,
data-pgtable = pgtable;
 
__sysmmu_set_ptbase(data-sfrbase, pgtable);
-   if ((readl(data-sfrbase + REG_MMU_VERSION)  28) == 3) {
-   /* System MMU version is 3.x */
-   __raw_writel((1  12) | (2  28),
-   data-sfrbase + REG_MMU_CFG);
-   __sysmmu_set_prefbuf(data-sfrbase, 0, -1, 0);
-   __sysmmu_set_prefbuf(data-sfrbase, 0, -1, 1);
-   }
 
__raw_writel(CTRL_ENABLE, data-sfrbase + REG_MMU_CTRL);
 
-- 
1.7.9.5

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


[PATCH v13 07/19] iommu/exynos: always enable runtime PM

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Checking if the probing device has a parent device was just to discover
if the probing device is involved in a power domain when the power
domain controlled by Samsung's custom implementation.
Since generic IO power domain is applied, it is required to remove
the condition to see if the probing device has a parent device.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 6915235..ef771a2 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -558,8 +558,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
 
platform_set_drvdata(pdev, data);
 
-   if (dev-parent)
-   pm_runtime_enable(dev);
+   pm_runtime_enable(dev);
 
dev_dbg(dev, (%s) Initialized\n, data-dbgname);
return 0;
-- 
1.7.9.5

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


[PATCH v13 15/19] iommu/exynos: enhanced error messages

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Some redundant error message is removed and some error messages
are changed to error level from debug level.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   23 +--
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index d18dc37..7188b47 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -525,7 +525,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
 
irq = platform_get_irq(pdev, 0);
if (irq = 0) {
-   dev_dbg(dev, Unable to find IRQ resource\n);
+   dev_err(dev, Unable to find IRQ resource\n);
return irq;
}
 
@@ -787,10 +787,8 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t 
paddr, size_t size,
short *pgcnt)
 {
if (size == SPAGE_SIZE) {
-   if (!lv2ent_fault(pent)) {
-   WARN(1, Trying mapping on 4KiB where mapping exists);
+   if (WARN_ON(!lv2ent_fault(pent)))
return -EADDRINUSE;
-   }
 
*pent = mk_lv2ent_spage(paddr);
pgtable_flush(pent, pent + 1);
@@ -798,9 +796,7 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t 
paddr, size_t size,
} else { /* size == LPAGE_SIZE */
int i;
for (i = 0; i  SPAGES_PER_LPAGE; i++, pent++) {
-   if (!lv2ent_fault(pent)) {
-   WARN(1,
-   Trying mapping on 64KiB where mapping exists);
+   if (WARN_ON(!lv2ent_fault(pent))) {
if (i  0)
memset(pent - i, 0, sizeof(*pent) * i);
return -EADDRINUSE;
@@ -847,8 +843,8 @@ static int exynos_iommu_map(struct iommu_domain *domain, 
unsigned long l_iova,
}
 
if (ret)
-   pr_debug(%s: Failed to map iova %#x/%#zx bytes\n,
-   __func__, iova, size);
+   pr_err(%s: Failed(%d) to map %#zx bytes @ %#x\n,
+   __func__, ret, size, iova);
 
spin_unlock_irqrestore(priv-pgtablelock, flags);
 
@@ -872,7 +868,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
ent = section_entry(priv-pgtable, iova);
 
if (lv1ent_section(ent)) {
-   if (size  SECT_SIZE) {
+   if (WARN_ON(size  SECT_SIZE)) {
err_pgsize = SECT_SIZE;
goto err;
}
@@ -907,7 +903,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
}
 
/* lv1ent_large(ent) == true here */
-   if (size  LPAGE_SIZE) {
+   if (WARN_ON(size  LPAGE_SIZE)) {
err_pgsize = LPAGE_SIZE;
goto err;
}
@@ -929,9 +925,8 @@ done:
 err:
spin_unlock_irqrestore(priv-pgtablelock, flags);
 
-   WARN(1,
-   %s: Failed due to size(%#zx) @ %#x is smaller than page size %#zx\n,
-   __func__, size, iova, err_pgsize);
+   pr_err(%s: Failed: size(%#zx) @ %#x is smaller than page size %#zx\n,
+   __func__, size, iova, err_pgsize);
 
return 0;
 }
-- 
1.7.9.5

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


[PATCH v13 02/19] iommu/exynos: change error handling when page table update is failed

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch changes not to panic on any error when updating page table.
Instead prints error messages with callstack.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   58 --
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 8d7c3f9..aec7fd7 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -728,13 +728,18 @@ finish:
 static unsigned long *alloc_lv2entry(unsigned long *sent, unsigned long iova,
short *pgcounter)
 {
+   if (lv1ent_section(sent)) {
+   WARN(1, Trying mapping on %#08lx mapped with 1MiB page, iova);
+   return ERR_PTR(-EADDRINUSE);
+   }
+
if (lv1ent_fault(sent)) {
unsigned long *pent;
 
pent = kzalloc(LV2TABLE_SIZE, GFP_ATOMIC);
BUG_ON((unsigned long)pent  (LV2TABLE_SIZE - 1));
if (!pent)
-   return NULL;
+   return ERR_PTR(-ENOMEM);
 
*sent = mk_lv1ent_page(virt_to_phys(pent));
*pgcounter = NUM_LV2ENTRIES;
@@ -745,14 +750,21 @@ static unsigned long *alloc_lv2entry(unsigned long *sent, 
unsigned long iova,
return page_entry(sent, iova);
 }
 
-static int lv1set_section(unsigned long *sent, phys_addr_t paddr, short *pgcnt)
+static int lv1set_section(unsigned long *sent, unsigned long iova,
+ phys_addr_t paddr, short *pgcnt)
 {
-   if (lv1ent_section(sent))
+   if (lv1ent_section(sent)) {
+   WARN(1, Trying mapping on 1MiB@%#08lx that is mapped,
+   iova);
return -EADDRINUSE;
+   }
 
if (lv1ent_page(sent)) {
-   if (*pgcnt != NUM_LV2ENTRIES)
+   if (*pgcnt != NUM_LV2ENTRIES) {
+   WARN(1, Trying mapping on 1MiB@%#08lx that is mapped,
+   iova);
return -EADDRINUSE;
+   }
 
kfree(page_entry(sent, 0));
 
@@ -770,8 +782,10 @@ static int lv2set_page(unsigned long *pent, phys_addr_t 
paddr, size_t size,
short *pgcnt)
 {
if (size == SPAGE_SIZE) {
-   if (!lv2ent_fault(pent))
+   if (!lv2ent_fault(pent)) {
+   WARN(1, Trying mapping on 4KiB where mapping exists);
return -EADDRINUSE;
+   }
 
*pent = mk_lv2ent_spage(paddr);
pgtable_flush(pent, pent + 1);
@@ -780,7 +794,10 @@ static int lv2set_page(unsigned long *pent, phys_addr_t 
paddr, size_t size,
int i;
for (i = 0; i  SPAGES_PER_LPAGE; i++, pent++) {
if (!lv2ent_fault(pent)) {
-   memset(pent, 0, sizeof(*pent) * i);
+   WARN(1,
+   Trying mapping on 64KiB where mapping exists);
+   if (i  0)
+   memset(pent - i, 0, sizeof(*pent) * i);
return -EADDRINUSE;
}
 
@@ -808,7 +825,7 @@ static int exynos_iommu_map(struct iommu_domain *domain, 
unsigned long iova,
entry = section_entry(priv-pgtable, iova);
 
if (size == SECT_SIZE) {
-   ret = lv1set_section(entry, paddr,
+   ret = lv1set_section(entry, iova, paddr,
priv-lv2entcnt[lv1ent_offset(iova)]);
} else {
unsigned long *pent;
@@ -816,17 +833,16 @@ static int exynos_iommu_map(struct iommu_domain *domain, 
unsigned long iova,
pent = alloc_lv2entry(entry, iova,
priv-lv2entcnt[lv1ent_offset(iova)]);
 
-   if (!pent)
-   ret = -ENOMEM;
+   if (IS_ERR(pent))
+   ret = PTR_ERR(pent);
else
ret = lv2set_page(pent, paddr, size,
priv-lv2entcnt[lv1ent_offset(iova)]);
}
 
-   if (ret) {
+   if (ret)
pr_debug(%s: Failed to map iova 0x%lx/0x%x bytes\n,
__func__, iova, size);
-   }
 
spin_unlock_irqrestore(priv-pgtablelock, flags);
 
@@ -840,6 +856,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
struct sysmmu_drvdata *data;
unsigned long flags;
unsigned long *ent;
+   size_t err_pgsize;
 
BUG_ON(priv-pgtable == NULL);
 
@@ -848,7 +865,10 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
ent

[PATCH v13 10/19] iommu/exynos: gating clocks of master H/W

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch gates clocks of master H/W as well as clocks of System MMU
if master clocks are specified.

Some Exynos SoCs (i.e. GScalers in Exynos5250) have dependencies in
the gating clocks of master H/W and its System MMU. If a H/W is the
case, accessing control registers of System MMU is prohibited unless
both of the gating clocks of System MMU and its master H/W.

CC: Tomasz Figa t.f...@samsung.com
Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   40 ++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index c86e374..5af5c5c 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -172,6 +172,7 @@ struct sysmmu_drvdata {
struct device *dev; /* Owner of system MMU */
void __iomem *sfrbase;
struct clk *clk;
+   struct clk *clk_master;
int activations;
rwlock_t lock;
struct iommu_domain *domain;
@@ -300,6 +301,8 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
 
WARN_ON(!is_sysmmu_active(data));
 
+   if (!IS_ERR(data-clk_master))
+   clk_enable(data-clk_master);
itype = (enum exynos_sysmmu_inttype)
__ffs(__raw_readl(data-sfrbase + REG_INT_STATUS));
if (WARN_ON(!((itype = 0)  (itype  SYSMMU_FAULT_UNKNOWN
@@ -326,6 +329,9 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
if (itype != SYSMMU_FAULT_UNKNOWN)
sysmmu_unblock(data-sfrbase);
 
+   if (!IS_ERR(data-clk_master))
+   clk_disable(data-clk_master);
+
read_unlock(data-lock);
 
return IRQ_HANDLED;
@@ -341,9 +347,14 @@ static bool __exynos_sysmmu_disable(struct sysmmu_drvdata 
*data)
if (!set_sysmmu_inactive(data))
goto finish;
 
+   if (!IS_ERR(data-clk_master))
+   clk_enable(data-clk_master);
+
__raw_writel(CTRL_DISABLE, data-sfrbase + REG_MMU_CTRL);
 
clk_disable(data-clk);
+   if (!IS_ERR(data-clk_master))
+   clk_disable(data-clk_master);
 
disabled = true;
data-pgtable = 0;
@@ -386,14 +397,19 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata 
*data,
goto finish;
}
 
-   clk_enable(data-clk);
-
data-pgtable = pgtable;
 
+   if (!IS_ERR(data-clk_master))
+   clk_enable(data-clk_master);
+   clk_enable(data-clk);
+
__sysmmu_set_ptbase(data-sfrbase, pgtable);
 
__raw_writel(CTRL_ENABLE, data-sfrbase + REG_MMU_CTRL);
 
+   if (!IS_ERR(data-clk_master))
+   clk_disable(data-clk_master);
+
data-domain = domain;
 
dev_dbg(data-sysmmu, Enabled\n);
@@ -450,6 +466,10 @@ static void sysmmu_tlb_invalidate_entry(struct device 
*dev, unsigned long iova,
if (is_sysmmu_active(data)) {
unsigned int maj;
unsigned int num_inv = 1;
+
+   if (!IS_ERR(data-clk_master))
+   clk_enable(data-clk_master);
+
maj = __raw_readl(data-sfrbase + REG_MMU_VERSION);
/*
 * L2TLB invalidation required
@@ -469,6 +489,8 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, 
unsigned long iova,
data-sfrbase, iova, num_inv);
sysmmu_unblock(data-sfrbase);
}
+   if (!IS_ERR(data-clk_master))
+   clk_disable(data-clk_master);
} else {
dev_dbg(data-sysmmu, Disabled. Skipping invalidating TLB.\n);
}
@@ -484,10 +506,14 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev)
read_lock_irqsave(data-lock, flags);
 
if (is_sysmmu_active(data)) {
+   if (!IS_ERR(data-clk_master))
+   clk_enable(data-clk_master);
if (sysmmu_block(data-sfrbase)) {
__sysmmu_tlb_invalidate(data-sfrbase);
sysmmu_unblock(data-sfrbase);
}
+   if (!IS_ERR(data-clk_master))
+   clk_disable(data-clk_master);
} else {
dev_dbg(data-sysmmu, Disabled. Skipping invalidating TLB.\n);
}
@@ -536,6 +562,16 @@ static int exynos_sysmmu_probe(struct platform_device 
*pdev)
}
}
 
+   data-clk_master = devm_clk_get(dev, master);
+   if (!IS_ERR(data-clk_master)) {
+   ret = clk_prepare(data-clk_master);
+   if (ret) {
+   clk_unprepare(data-clk);
+   dev_err(dev, Failed to prepare master's clk\n);
+   return ret;
+   }
+   }
+
data-sysmmu = dev;
rwlock_init(data-lock

[PATCH v13 12/19] iommu/exynos: change rwlock to spinlock

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Since acquiring read_lock is not more frequent than write_lock, it is
not beneficial to use rwlock, this commit changes rwlock to spinlock.

Reviewed-by: Grant Grundler grund...@chromium.org
Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index c1be65f..d89ad5f 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -164,7 +164,7 @@ struct sysmmu_drvdata {
struct clk *clk;
struct clk *clk_master;
int activations;
-   rwlock_t lock;
+   spinlock_t lock;
struct iommu_domain *domain;
phys_addr_t pgtable;
 };
@@ -263,12 +263,13 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void 
*dev_id)
unsigned long addr = -1;
int ret = -ENOSYS;
 
-   read_lock(data-lock);
-
WARN_ON(!is_sysmmu_active(data));
 
+   spin_lock(data-lock);
+
if (!IS_ERR(data-clk_master))
clk_enable(data-clk_master);
+
itype = (enum exynos_sysmmu_inttype)
__ffs(__raw_readl(data-sfrbase + REG_INT_STATUS));
if (WARN_ON(!((itype = 0)  (itype  SYSMMU_FAULT_UNKNOWN
@@ -302,7 +303,7 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
if (!IS_ERR(data-clk_master))
clk_disable(data-clk_master);
 
-   read_unlock(data-lock);
+   spin_unlock(data-lock);
 
return IRQ_HANDLED;
 }
@@ -312,7 +313,7 @@ static bool __exynos_sysmmu_disable(struct sysmmu_drvdata 
*data)
unsigned long flags;
bool disabled = false;
 
-   write_lock_irqsave(data-lock, flags);
+   spin_lock_irqsave(data-lock, flags);
 
if (!set_sysmmu_inactive(data))
goto finish;
@@ -330,7 +331,7 @@ static bool __exynos_sysmmu_disable(struct sysmmu_drvdata 
*data)
data-pgtable = 0;
data-domain = NULL;
 finish:
-   write_unlock_irqrestore(data-lock, flags);
+   spin_unlock_irqrestore(data-lock, flags);
 
if (disabled)
dev_dbg(data-sysmmu, Disabled\n);
@@ -353,7 +354,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata 
*data,
int ret = 0;
unsigned long flags;
 
-   write_lock_irqsave(data-lock, flags);
+   spin_lock_irqsave(data-lock, flags);
 
if (!set_sysmmu_active(data)) {
if (WARN_ON(pgtable != data-pgtable)) {
@@ -384,7 +385,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata 
*data,
 
dev_dbg(data-sysmmu, Enabled\n);
 finish:
-   write_unlock_irqrestore(data-lock, flags);
+   spin_unlock_irqrestore(data-lock, flags);
 
return ret;
 }
@@ -431,7 +432,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, 
unsigned long iova,
unsigned long flags;
struct sysmmu_drvdata *data = dev_get_drvdata(dev-archdata.iommu);
 
-   read_lock_irqsave(data-lock, flags);
+   spin_lock_irqsave(data-lock, flags);
 
if (is_sysmmu_active(data)) {
unsigned int maj;
@@ -465,7 +466,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, 
unsigned long iova,
dev_dbg(data-sysmmu, Disabled. Skipping invalidating TLB.\n);
}
 
-   read_unlock_irqrestore(data-lock, flags);
+   spin_unlock_irqrestore(data-lock, flags);
 }
 
 void exynos_sysmmu_tlb_invalidate(struct device *dev)
@@ -473,7 +474,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev)
unsigned long flags;
struct sysmmu_drvdata *data = dev_get_drvdata(dev-archdata.iommu);
 
-   read_lock_irqsave(data-lock, flags);
+   spin_lock_irqsave(data-lock, flags);
 
if (is_sysmmu_active(data)) {
if (!IS_ERR(data-clk_master))
@@ -488,7 +489,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev)
dev_dbg(data-sysmmu, Disabled. Skipping invalidating TLB.\n);
}
 
-   read_unlock_irqrestore(data-lock, flags);
+   spin_unlock_irqrestore(data-lock, flags);
 }
 
 static int exynos_sysmmu_probe(struct platform_device *pdev)
@@ -543,7 +544,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
}
 
data-sysmmu = dev;
-   rwlock_init(data-lock);
+   spin_lock_init(data-lock);
INIT_LIST_HEAD(data-node);
 
platform_set_drvdata(pdev, data);
-- 
1.7.9.5

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


[PATCH v13 06/19] iommu/exynos: add missing cache flush for removed page table entries

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This commit adds cache flush for removed small and large page entries
in exynos_iommu_unmap(). Missing cache flush of removed page table
entries can cause missing page fault interrupt when a master IP
accesses an unmapped area.

Reviewed-by: Tomasz Figa t.f...@samsung.com
Tested-by: Grant Grundler grund...@chromium.org
Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 4fc31fc..6915235 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -904,6 +904,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
if (lv2ent_small(ent)) {
*ent = 0;
size = SPAGE_SIZE;
+   pgtable_flush(ent, ent + 1);
priv-lv2entcnt[lv1ent_offset(iova)] += 1;
goto done;
}
@@ -915,6 +916,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
}
 
memset(ent, 0, sizeof(*ent) * SPAGES_PER_LPAGE);
+   pgtable_flush(ent, ent + SPAGES_PER_LPAGE);
 
size = LPAGE_SIZE;
priv-lv2entcnt[lv1ent_offset(iova)] += SPAGES_PER_LPAGE;
-- 
1.7.9.5

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


[PATCH v13 19/19] iommu/exynos: apply workaround of caching fault page table entries

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch contains 2 workaround for the System MMU v3.x.

System MMU v3.2 and v3.3 has FLPD cache that caches first level page
table entries to reduce page table walking latency. However, the
FLPD cache is filled with a first level page table entry even though
it is not accessed by a master H/W because System MMU v3.3
speculatively prefetches page table entries that may be accessed
in the near future by the master H/W.
The prefetched FLPD cache entries are not invalidated by iommu_unmap()
because iommu_unmap() only unmaps and invalidates the page table
entries that is mapped.

Because exynos-iommu driver discards a second level page table when
it needs to be replaced with another second level page table or
a first level page table entry with 1MB mapping, It is required to
invalidate FLPD cache that may contain the first level page table
entry that points to the second level page table.

Another workaround of System MMU v3.3 is initializing the first level
page table entries with the second level page table which is filled
with all zeros. This prevents System MMU prefetches 'fault' first
level page table entry which may lead page fault on access to 16MiB
wide.

System MMU 3.x fetches consecutive page table entries by a page
table walking to maximize bus utilization and to minimize TLB miss
panelty.
Unfortunately, functional problem is raised with the fetching behavior
because it fetches 'fault' page table entries that specifies no
translation information and that a valid translation information will
be written to in the near future. The logic in the System MMU generates
page fault with the cached fault entries that is no longer coherent
with the page table which is updated.

There is another workaround that must be implemented by I/O virtual
memory manager: any two consecutive I/O virtual memory area must have
a hole between the two that is larger than or equal to 128KiB.
Also, next I/O virtual memory area must be started from the next
128KiB boundary.

0128K   256K   384K 512K
|-|---|-||
|area1|.hole...|--- area2 -

The constraint is depicted above.
The size is selected by the calculation followed:
 - System MMU can fetch consecutive 64 page table entries at once
   64 * 4KiB = 256KiB. This is the size between 128K ~ 384K of the
   above picture. This style of fetching is 'block fetch'. It fetches
   the page table entries predefined consecutive page table entries
   including the entry that is the reason of the page table walking.
 - System MMU can prefetch upto consecutive 32 page table entries.
   This is the size between 256K ~ 384K.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |  163 +-
 1 file changed, 146 insertions(+), 17 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 26fb4d7..82aecd0 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -45,8 +45,12 @@ typedef u32 sysmmu_pte_t;
 #define LPAGE_MASK (~(LPAGE_SIZE - 1))
 #define SPAGE_MASK (~(SPAGE_SIZE - 1))
 
-#define lv1ent_fault(sent) (((*(sent)  3) == 0) || ((*(sent)  3) == 3))
-#define lv1ent_page(sent) ((*(sent)  3) == 1)
+#define lv1ent_fault(sent) ((*(sent) == ZERO_LV2LINK) || \
+  ((*(sent)  3) == 0) || ((*(sent)  3) == 3))
+#define lv1ent_zero(sent) (*(sent) == ZERO_LV2LINK)
+#define lv1ent_page_zero(sent) ((*(sent)  3) == 1)
+#define lv1ent_page(sent) ((*(sent) != ZERO_LV2LINK)  \
+ ((*(sent)  3) == 1))
 #define lv1ent_section(sent) ((*(sent)  3) == 2)
 
 #define lv2ent_fault(pent) ((*(pent)  3) == 0)
@@ -130,6 +134,8 @@ static u32 lv2ent_offset(sysmmu_iova_t iova)
 #define has_sysmmu(dev)(dev-archdata.iommu != NULL)
 
 static struct kmem_cache *lv2table_kmem_cache;
+static sysmmu_pte_t *zero_lv2_table;
+#define ZERO_LV2LINK mk_lv1ent_page(virt_to_phys(zero_lv2_table))
 
 static sysmmu_pte_t *section_entry(sysmmu_pte_t *pgtable, sysmmu_iova_t iova)
 {
@@ -515,6 +521,32 @@ static bool exynos_sysmmu_disable(struct device *dev)
return disabled;
 }
 
+static void __sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
+ sysmmu_iova_t iova)
+{
+   if (__raw_sysmmu_version(data) == MAKE_MMU_VER(3, 3))
+   __raw_writel(iova | 0x1, data-sfrbase + REG_MMU_FLUSH_ENTRY);
+}
+
+static void sysmmu_tlb_invalidate_flpdcache(struct device *dev,
+   sysmmu_iova_t iova)
+{
+   unsigned long flags;
+   struct exynos_iommu_owner *owner = dev-archdata.iommu;
+   struct sysmmu_drvdata *data = dev_get_drvdata(owner-sysmmu);
+
+   if (!IS_ERR(data-clk_master))
+   clk_enable

[PATCH v13 18/19] iommu/exynos: turn on useful configuration options

2014-05-12 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This turns on FLPD_CACHE, ACGEN and SYSSEL.

FLPD_CACHE is a cache of 1st level page table entries that contains
the address of a 2nd level page table to reduce latency of page table
walking.

ACGEN is architectural clock gating that gates clocks by System MMU
itself if it is not active. Note that ACGEN is different from clock
gating by the CPU. ACGEN just gates clocks to the internal logic of
System MMU while clock gating by the CPU gates clocks to the System
MMU.

SYSSEL selects System MMU version in some Exynos SoCs. Some Exynos
SoCs have an option to select System MMU versions exclusively because
the SoCs adopts new System MMU version experimentally.

This also always selects LRU as TLB replacement policy. Selecting TLB
replacement policy is deprecated from System MMU 3.2. TLB in System
MMU 3.3 has single TLB replacement policy, LRU. The bit of MMU_CFG
selecting TLB replacement policy is remained as reserved.

QoS value of page table walking is set to 15 (highst value). System
MMU 3.3 can inherit QoS value of page table walking from its master
H/W's transaction. This new feature is enabled by default and QoS
value written to MMU_CFG is ignored.

This patch also adds simplifies the sysmmu version checking by
introducing some macros.

Signed-off-by: Cho KyongHo pullip@samsung.com
Signed-off-by: Shaik Ameer Basha shaik.am...@samsung.com
---
 drivers/iommu/exynos-iommu.c |   38 ++
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index b937490..26fb4d7 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -93,6 +93,13 @@ static u32 lv2ent_offset(sysmmu_iova_t iova)
 #define CTRL_BLOCK 0x7
 #define CTRL_DISABLE   0x0
 
+#define CFG_LRU0x1
+#define CFG_QOS(n) ((n  0xF)  7)
+#define CFG_MASK   0x0150 /* Selecting bit 0-15, 20, 22 and 24 */
+#define CFG_ACGEN  (1  24) /* System MMU 3.3 only */
+#define CFG_SYSSEL (1  22) /* System MMU 3.2 only */
+#define CFG_FLPDCACHE  (1  20) /* System MMU 3.2+ only */
+
 #define REG_MMU_CTRL   0x000
 #define REG_MMU_CFG0x004
 #define REG_MMU_STATUS 0x008
@@ -109,6 +116,12 @@ static u32 lv2ent_offset(sysmmu_iova_t iova)
 
 #define REG_MMU_VERSION0x034
 
+#define MMU_MAJ_VER(val)   ((val)  7)
+#define MMU_MIN_VER(val)   ((val)  0x7F)
+#define MMU_RAW_VER(reg)   (((reg)  21)  ((1  11) - 1)) /* 11 bits */
+
+#define MAKE_MMU_VER(maj, min) maj)  0xF)  7) | ((min)  0x7F))
+
 #define REG_PB0_SADDR  0x04C
 #define REG_PB0_EADDR  0x050
 #define REG_PB1_SADDR  0x054
@@ -219,6 +232,11 @@ static void sysmmu_unblock(void __iomem *sfrbase)
__raw_writel(CTRL_ENABLE, sfrbase + REG_MMU_CTRL);
 }
 
+static unsigned int __raw_sysmmu_version(struct sysmmu_drvdata *data)
+{
+   return MMU_RAW_VER(__raw_readl(data-sfrbase + REG_MMU_VERSION));
+}
+
 static bool sysmmu_block(void __iomem *sfrbase)
 {
int i = 120;
@@ -374,7 +392,21 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data)
 
 static void __sysmmu_init_config(struct sysmmu_drvdata *data)
 {
-   unsigned int cfg = 0;
+   unsigned int cfg = CFG_LRU | CFG_QOS(15);
+   unsigned int ver;
+
+   ver = __raw_sysmmu_version(data);
+   if (MMU_MAJ_VER(ver) == 3) {
+   if (MMU_MIN_VER(ver) = 2) {
+   cfg |= CFG_FLPDCACHE;
+   if (MMU_MIN_VER(ver) == 3) {
+   cfg |= CFG_ACGEN;
+   cfg = ~CFG_LRU;
+   } else {
+   cfg |= CFG_SYSSEL;
+   }
+   }
+   }
 
__raw_writel(cfg, data-sfrbase + REG_MMU_CFG);
 }
@@ -494,13 +526,11 @@ static void sysmmu_tlb_invalidate_entry(struct device 
*dev, sysmmu_iova_t iova,
 
spin_lock_irqsave(data-lock, flags);
if (is_sysmmu_active(data)) {
-   unsigned int maj;
unsigned int num_inv = 1;
 
if (!IS_ERR(data-clk_master))
clk_enable(data-clk_master);
 
-   maj = __raw_readl(data-sfrbase + REG_MMU_VERSION);
/*
 * L2TLB invalidation required
 * 4KB page: 1 invalidation
@@ -511,7 +541,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, 
sysmmu_iova_t iova,
 * 1MB page can be cached in one of all sets.
 * 64KB page can be one of 16 consecutive sets.
 */
-   if ((maj  28) == 2) /* major version number */
+   if (MMU_MAJ_VER(__raw_sysmmu_version(data)) == 2)
num_inv = min_t(unsigned int, size / PAGE_SIZE, 64);
 
if (sysmmu_block(data-sfrbase)) {
-- 
1.7.9.5

___
iommu mailing

Re: [PATCH v12 00/31] iommu/exynos: Fixes and Enhancements of System MMU driver with DT

2014-04-30 Thread Shaik Ameer Basha
On Mon, Apr 28, 2014 at 2:04 PM, Arnd Bergmann a...@arndb.de wrote:
 On Sunday 27 April 2014 13:07:32 Shaik Ameer Basha wrote:
 The current exynos-iommu(System MMU) driver does not work autonomously
 since it is lack of support for power management of peripheral blocks.
 For example, MFC device driver must ensure that its System MMU is disabled
 before MFC block is power-down not to invalidate IOTLB in the System MMU
 when I/O memory mapping is changed. Because a System MMU resides in the
 same H/W block, access to control registers of System MMU while the H/W
 block is turned off must be prohibited.

 This set of changes solves the above problem with setting each System MMUs
 as the parent of the device which owns the System MMU to receive the
 information when the device is turned off or turned on.

 Another big change to the driver is the support for devicetree.
 The bindings for System MMU is described in
 Documentation/devicetree/bindings/arm/samsung/system-mmu.txt

 Sorry I've been absent from the review so far. Most of the patches
 seem entirely reasonable to me, but I'm worried about the DT binding
 aspect. We are going to see more systems shipping with IOMMUs now,
 and we are seeing an increasing number of submissions for 64-bit
 systems. We really have to work out what the DT representation for
 IOMMUs should look like in general before adding another ad-hod
 implementation that is private to one driver.


I have one question.

This series is going on for quite a long time and most of the patches here
doesn't depend on dt bindings. As Exynos IOMMU h/w is introducing new versions
very frequently, maintaining and reviewing all these patches again and
again is quite a hard job.

If it is acceptable, I can post one more series with the subset of
above patches,
which doesn't depend on dt-bindings. As all the patches which doesn't depend on
DT bindings are already tested,  I hope merging these subset of patches may help
in reducing the rework and review effort every time.

Once we finalize the generic DT bindings for the IOMMU devices, the driver
can be updated with the proposed DT bindings in mind.

Regards,
Shaik



 Arnd
 --
 To unsubscribe from this list: send the line unsubscribe linux-samsung-soc 
 in
 the body of a message to majord...@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu


[PATCH v12 03/31] iommu/exynos: change error handling when page table update is failed

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch changes not to panic on any error when updating page table.
Instead prints error messages with callstack.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   58 --
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 34e4273..84fc3b4 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -811,13 +811,18 @@ finish:
 static unsigned long *alloc_lv2entry(unsigned long *sent, unsigned long iova,
short *pgcounter)
 {
+   if (lv1ent_section(sent)) {
+   WARN(1, Trying mapping on %#08lx mapped with 1MiB page, iova);
+   return ERR_PTR(-EADDRINUSE);
+   }
+
if (lv1ent_fault(sent)) {
unsigned long *pent;
 
pent = kzalloc(LV2TABLE_SIZE, GFP_ATOMIC);
BUG_ON((unsigned long)pent  (LV2TABLE_SIZE - 1));
if (!pent)
-   return NULL;
+   return ERR_PTR(-ENOMEM);
 
*sent = mk_lv1ent_page(__pa(pent));
*pgcounter = NUM_LV2ENTRIES;
@@ -828,14 +833,21 @@ static unsigned long *alloc_lv2entry(unsigned long *sent, 
unsigned long iova,
return page_entry(sent, iova);
 }
 
-static int lv1set_section(unsigned long *sent, phys_addr_t paddr, short *pgcnt)
+static int lv1set_section(unsigned long *sent, unsigned long iova,
+ phys_addr_t paddr, short *pgcnt)
 {
-   if (lv1ent_section(sent))
+   if (lv1ent_section(sent)) {
+   WARN(1, Trying mapping on 1MiB@%#08lx that is mapped,
+   iova);
return -EADDRINUSE;
+   }
 
if (lv1ent_page(sent)) {
-   if (*pgcnt != NUM_LV2ENTRIES)
+   if (*pgcnt != NUM_LV2ENTRIES) {
+   WARN(1, Trying mapping on 1MiB@%#08lx that is mapped,
+   iova);
return -EADDRINUSE;
+   }
 
kfree(page_entry(sent, 0));
 
@@ -853,8 +865,10 @@ static int lv2set_page(unsigned long *pent, phys_addr_t 
paddr, size_t size,
short *pgcnt)
 {
if (size == SPAGE_SIZE) {
-   if (!lv2ent_fault(pent))
+   if (!lv2ent_fault(pent)) {
+   WARN(1, Trying mapping on 4KiB where mapping exists);
return -EADDRINUSE;
+   }
 
*pent = mk_lv2ent_spage(paddr);
pgtable_flush(pent, pent + 1);
@@ -863,7 +877,10 @@ static int lv2set_page(unsigned long *pent, phys_addr_t 
paddr, size_t size,
int i;
for (i = 0; i  SPAGES_PER_LPAGE; i++, pent++) {
if (!lv2ent_fault(pent)) {
-   memset(pent, 0, sizeof(*pent) * i);
+   WARN(1,
+   Trying mapping on 64KiB where mapping exists);
+   if (i  0)
+   memset(pent - i, 0, sizeof(*pent) * i);
return -EADDRINUSE;
}
 
@@ -891,7 +908,7 @@ static int exynos_iommu_map(struct iommu_domain *domain, 
unsigned long iova,
entry = section_entry(priv-pgtable, iova);
 
if (size == SECT_SIZE) {
-   ret = lv1set_section(entry, paddr,
+   ret = lv1set_section(entry, iova, paddr,
priv-lv2entcnt[lv1ent_offset(iova)]);
} else {
unsigned long *pent;
@@ -899,17 +916,16 @@ static int exynos_iommu_map(struct iommu_domain *domain, 
unsigned long iova,
pent = alloc_lv2entry(entry, iova,
priv-lv2entcnt[lv1ent_offset(iova)]);
 
-   if (!pent)
-   ret = -ENOMEM;
+   if (IS_ERR(pent))
+   ret = PTR_ERR(pent);
else
ret = lv2set_page(pent, paddr, size,
priv-lv2entcnt[lv1ent_offset(iova)]);
}
 
-   if (ret) {
+   if (ret)
pr_debug(%s: Failed to map iova 0x%lx/0x%x bytes\n,
__func__, iova, size);
-   }
 
spin_unlock_irqrestore(priv-pgtablelock, flags);
 
@@ -923,6 +939,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
struct sysmmu_drvdata *data;
unsigned long flags;
unsigned long *ent;
+   size_t err_pgsize;
 
BUG_ON(priv-pgtable == NULL);
 
@@ -931,7 +948,10 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
ent = section_entry(priv-pgtable, iova);
 
if (lv1ent_section(ent)) 

[PATCH v12 02/31] iommu/exynos: add missing cache flush for removed page table entries

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This commit adds cache flush for removed small and large page entries
in exynos_iommu_unmap(). Missing cache flush of removed page table
entries can cause missing page fault interrupt when a master IP
accesses an unmapped area.

Reviewed-by: Tomasz Figa t.f...@samsung.com
Tested-by: Grant Grundler grund...@chromium.org
Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 46f0ca1..34e4273 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -957,6 +957,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
if (lv2ent_small(ent)) {
*ent = 0;
size = SPAGE_SIZE;
+   pgtable_flush(ent, ent + 1);
priv-lv2entcnt[lv1ent_offset(iova)] += 1;
goto done;
}
@@ -965,6 +966,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
BUG_ON(size  LPAGE_SIZE);
 
memset(ent, 0, sizeof(*ent) * SPAGES_PER_LPAGE);
+   pgtable_flush(ent, ent + SPAGES_PER_LPAGE);
 
size = LPAGE_SIZE;
priv-lv2entcnt[lv1ent_offset(iova)] += SPAGES_PER_LPAGE;
-- 
1.7.9.5

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


[PATCH v12 04/31] iommu/exynos: fix L2TLB invalidation

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

L2TLB is 8-way set-associative TLB with 512 entries. The number of
sets is 64.
A single 4KB(small page) translation information is cached
only to a set whose index is the same with the lower 6 bits of the page
frame number.
A single 64KB(large page) translation information can be
cached to any 16 sets whose top two bits of their indices are the same
with the bit [5:4] of the page frame number.
A single 1MB(section) or larger translation information can be cached to
any set in the TLB.

It is required to invalidate entire sets that may cache the target
translation information to guarantee that the L2TLB has no stale data.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   31 ++-
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 84fc3b4..7ce44a8 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -224,9 +224,14 @@ static void __sysmmu_tlb_invalidate(void __iomem *sfrbase)
 }
 
 static void __sysmmu_tlb_invalidate_entry(void __iomem *sfrbase,
-   unsigned long iova)
+   unsigned long iova, unsigned int num_inv)
 {
-   __raw_writel((iova  SPAGE_MASK) | 1, sfrbase + REG_MMU_FLUSH_ENTRY);
+   unsigned int i;
+   for (i = 0; i  num_inv; i++) {
+   __raw_writel((iova  SPAGE_MASK) | 1,
+   sfrbase + REG_MMU_FLUSH_ENTRY);
+   iova += SPAGE_SIZE;
+   }
 }
 
 static void __sysmmu_set_ptbase(void __iomem *sfrbase,
@@ -476,7 +481,8 @@ static bool exynos_sysmmu_disable(struct device *dev)
return disabled;
 }
 
-static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova)
+static void sysmmu_tlb_invalidate_entry(struct device *dev, unsigned long iova,
+   size_t size)
 {
unsigned long flags;
struct sysmmu_drvdata *data = dev_get_drvdata(dev-archdata.iommu);
@@ -486,9 +492,24 @@ static void sysmmu_tlb_invalidate_entry(struct device 
*dev, unsigned long iova)
if (is_sysmmu_active(data)) {
int i;
for (i = 0; i  data-nsfrs; i++) {
+   unsigned int maj;
+   unsigned int num_inv = 1;
+   maj = __raw_readl(data-sfrbases[i] + REG_MMU_VERSION);
+   /*
+* L2TLB invalidation required
+* 4KB page: 1 invalidation
+* 64KB page: 16 invalidation
+* 1MB page: 64 invalidation
+* because it is set-associative TLB
+* with 8-way and 64 sets.
+* 1MB page can be cached in one of all sets.
+* 64KB page can be one of 16 consecutive sets.
+*/
+   if ((maj  28) == 2) /* major version number */
+   num_inv = min_t(unsigned int, size / PAGE_SIZE, 
64);
if (sysmmu_block(data-sfrbases[i])) {
__sysmmu_tlb_invalidate_entry(
-   data-sfrbases[i], iova);
+   data-sfrbases[i], iova, num_inv);
sysmmu_unblock(data-sfrbases[i]);
}
}
@@ -998,7 +1019,7 @@ done:
 
spin_lock_irqsave(priv-lock, flags);
list_for_each_entry(data, priv-clients, node)
-   sysmmu_tlb_invalidate_entry(data-dev, iova);
+   sysmmu_tlb_invalidate_entry(data-dev, iova, size);
spin_unlock_irqrestore(priv-lock, flags);
 
return size;
-- 
1.7.9.5

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


[PATCH v12 00/31] iommu/exynos: Fixes and Enhancements of System MMU driver with DT

2014-04-27 Thread Shaik Ameer Basha
The current exynos-iommu(System MMU) driver does not work autonomously
since it is lack of support for power management of peripheral blocks.
For example, MFC device driver must ensure that its System MMU is disabled
before MFC block is power-down not to invalidate IOTLB in the System MMU
when I/O memory mapping is changed. Because a System MMU resides in the
same H/W block, access to control registers of System MMU while the H/W
block is turned off must be prohibited.

This set of changes solves the above problem with setting each System MMUs
as the parent of the device which owns the System MMU to receive the
information when the device is turned off or turned on.

Another big change to the driver is the support for devicetree.
The bindings for System MMU is described in
Documentation/devicetree/bindings/arm/samsung/system-mmu.txt

In addition, this patchset also includes several bug fixes and enhancements
of the current driver.

Change log:
v12:
- Rebased to the latest 3.15-rc2 master branch
  git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master (3.15-rc2)
- Addressed v11 review comments from
'Sachin Kamat', 'Tomasz Figa' and 'Shaik Ameer Basha'
- Uses macro names instead of magic numbers for clock description in DT
- Moved DT binding document to seperate patch
- dtsi changes are separated into multiple patches
- patch description of some patches are updated according to the review comments
- removed the macros which hides the clock operations
- review comments related to compatible strings will be fixed in followup 
patches

v11:
- Rebased on the latest works on clock, arm/samsung, iommu branches
- Change the property to link System MMU and its master H/W
  'iommu' in the master's node - 'mmu-masters' in the System MMU's node
- Changed compatible string:
  samsung,sysmmu-v1
  samsung,sysmmu-v2
  samsung,sysmmu-v3.1
  samsung,sysmmu-v3.2
  samsung,sysmmu-v3.3
- Change the implementation of retrieving System MMU version - simpler
- Check NULL pointer before call to clk_enable() and clk_disable()
- Allow a single master to link to multiple System MMUs.
  (fimc-is, fimd/g2d/Scaler in Exynos5420)
- Workarounds of known problems of System MMU
- Code enhancements:
  * Compilable for 64-bit
  * Enhanced error messages

v10:
- Rebased on the following branches
  git.linaro.org/git-ro/people/mturquette/linux.git/clk-next
  git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git/for-next
  git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git/next
  git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master (3.12-rc3)
- Set parent clock to all System MMU clocks.
- Add clock and DT descriptos for Exynos5420
- Modified error handling in exynos_iommu_init()
- Split iommu/exynos: support for device tree patch into the following 6 
patches
  iommu/exynos: handle only one instance of System MMU
  iommu/exynos: always enable runtime PM
  iommu/exynos: always use a single clock descriptor
  iommu/exynos: remove dbgname from drvdata of a System MMU
  iommu/exynos: use managed driver helper functions
  iommu/exynos: support for device tree
- Remove 'interrupt-names' and 'status' properties from DT
- Change n:1 relationship between master:System MMU into 1:1 relationship.
- Removed custom fault handler and print the status of System MMU
  whenever System MMU fault is occurred.
- Post Antonios Motakis's commit together:
  iommu/exynos: add devices attached to the System MMU to an IOMMU group

v9:
- Rebased on the following branches
  git.linaro.org/git-ro/people/mturquette/linux.git/clk-next
  git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git/samsung-next
  git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master (3.11-rc4)
- Split add bus notifier for registering System MMU into 5 patches
- Call clk_prepare() that was missing in v8.
- Fixed base address of sysmmu_tv in exynos4210.dtsi
- BUG_ON() instead of return -EADDRINUSE when trying mapping on an mapped area
- Moved camif_top to 317 in drivers/clk/samsung/clk-exynos5250.c
- Removed 'iommu' property from 'codec'(mfc) node
- Does not make 'master' clock to be the parent of 'sysmmu' clock.
   'master' clock is enabled before accessing control registers of System MMU
   and disabled after the access.

v8:
- Reordered patch list: moved change rwloc to spinlock to the last.
- Fixed remained bug in fix page table maintenance.
- Always return 0 from exynos_iommu_attach_device().
- Removed prefetch buffer setting when System MMU is enabled
  due to the restriction of prefetch buffers:
  A prefetch buffer must not hit from more than one DMA.
  For instance with GScalers, if a single prefetch buffer is initialized
  with 0x0 ~ 0x and a GScaler works on source buffer at 0x1000
  and target buffer @ 0x2000, the System MMU may be got deadlock.
  Clients must initialize prefetch buffers with custom function defined
  in exynos-iommu drivers whenever they need to enable prefetch buffers.
- The clock of System

[PATCH v12 01/31] iommu/exynos: do not include removed header

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Commit 25e9d28d92 (ARM: EXYNOS: remove system mmu initialization from
exynos tree) removed arch/arm/mach-exynos/mach/sysmmu.h header without
removing remaining use of it from exynos-iommu driver, thus causing a
compilation error.

This patch fixes the error by removing respective include line
from exynos-iommu.c.

CC: Tomasz Figa t.f...@samsung.com
Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 0740189..46f0ca1 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -29,8 +29,6 @@
 #include asm/cacheflush.h
 #include asm/pgtable.h
 
-#include mach/sysmmu.h
-
 /* We does not consider super section mapping (16MB) */
 #define SECT_ORDER 20
 #define LPAGE_ORDER 16
-- 
1.7.9.5

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


[PATCH v12 07/31] iommu/exynos: always enable runtime PM

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Checking if the probing device has a parent device was just to discover
if the probing device is involved in a power domain when the power
domain controlled by Samsung's custom implementation.
Since generic IO power domain is applied, it is required to remove
the condition to see if the probing device has a parent device.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index c7f831c..d466076 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -631,8 +631,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
 
__set_fault_handler(data, default_fault_handler);
 
-   if (dev-parent)
-   pm_runtime_enable(dev);
+   pm_runtime_enable(dev);
 
dev_dbg(dev, (%s) Initialized\n, data-dbgname);
return 0;
-- 
1.7.9.5

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


[PATCH v12 08/31] iommu/exynos: handle one instance of sysmmu with a device descriptor

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

System MMU driver is changed to control only a single instance of
System MMU at a time. Since a single instance of System MMU has only
a single clock descriptor for its clock gating, single address range
for control registers, there is no need to obtain two or more clock
descriptors and ioremaped region.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |  223 ++
 1 file changed, 71 insertions(+), 152 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index d466076..a15216f 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -170,9 +170,8 @@ struct sysmmu_drvdata {
struct device *sysmmu;  /* System MMU's device descriptor */
struct device *dev; /* Owner of system MMU */
char *dbgname;
-   int nsfrs;
-   void __iomem **sfrbases;
-   struct clk *clk[2];
+   void __iomem *sfrbase;
+   struct clk *clk;
int activations;
rwlock_t lock;
struct iommu_domain *domain;
@@ -293,56 +292,39 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void 
*dev_id)
 {
/* SYSMMU is in blocked when interrupt occurred. */
struct sysmmu_drvdata *data = dev_id;
-   struct resource *irqres;
-   struct platform_device *pdev;
enum exynos_sysmmu_inttype itype;
unsigned long addr = -1;
-
-   int i, ret = -ENOSYS;
+   int ret = -ENOSYS;
 
read_lock(data-lock);
 
WARN_ON(!is_sysmmu_active(data));
 
-   pdev = to_platform_device(data-sysmmu);
-   for (i = 0; i  (pdev-num_resources / 2); i++) {
-   irqres = platform_get_resource(pdev, IORESOURCE_IRQ, i);
-   if (irqres  ((int)irqres-start == irq))
-   break;
-   }
-
-   if (i == pdev-num_resources) {
+   itype = (enum exynos_sysmmu_inttype)
+   __ffs(__raw_readl(data-sfrbase + REG_INT_STATUS));
+   if (WARN_ON(!((itype = 0)  (itype  SYSMMU_FAULT_UNKNOWN
itype = SYSMMU_FAULT_UNKNOWN;
-   } else {
-   itype = (enum exynos_sysmmu_inttype)
-   __ffs(__raw_readl(data-sfrbases[i] + REG_INT_STATUS));
-   if (WARN_ON(!((itype = 0)  (itype  SYSMMU_FAULT_UNKNOWN
-   itype = SYSMMU_FAULT_UNKNOWN;
-   else
-   addr = __raw_readl(
-   data-sfrbases[i] + fault_reg_offset[itype]);
-   }
+   else
+   addr = __raw_readl(data-sfrbase + fault_reg_offset[itype]);
 
if (data-domain)
-   ret = report_iommu_fault(data-domain, data-dev,
-   addr, itype);
+   ret = report_iommu_fault(data-domain, data-dev, addr, itype);
 
if ((ret == -ENOSYS)  data-fault_handler) {
unsigned long base = data-pgtable;
if (itype != SYSMMU_FAULT_UNKNOWN)
-   base = __raw_readl(
-   data-sfrbases[i] + REG_PT_BASE_ADDR);
+   base = __raw_readl(data-sfrbase + REG_PT_BASE_ADDR);
ret = data-fault_handler(itype, base, addr);
}
 
if (!ret  (itype != SYSMMU_FAULT_UNKNOWN))
-   __raw_writel(1  itype, data-sfrbases[i] + REG_INT_CLEAR);
+   __raw_writel(1  itype, data-sfrbase + REG_INT_CLEAR);
else
dev_dbg(data-sysmmu, (%s) %s is not handled.\n,
data-dbgname, sysmmu_fault_name[itype]);
 
if (itype != SYSMMU_FAULT_UNKNOWN)
-   sysmmu_unblock(data-sfrbases[i]);
+   sysmmu_unblock(data-sfrbase);
 
read_unlock(data-lock);
 
@@ -353,20 +335,16 @@ static bool __exynos_sysmmu_disable(struct sysmmu_drvdata 
*data)
 {
unsigned long flags;
bool disabled = false;
-   int i;
 
write_lock_irqsave(data-lock, flags);
 
if (!set_sysmmu_inactive(data))
goto finish;
 
-   for (i = 0; i  data-nsfrs; i++)
-   __raw_writel(CTRL_DISABLE, data-sfrbases[i] + REG_MMU_CTRL);
+   __raw_writel(CTRL_DISABLE, data-sfrbase + REG_MMU_CTRL);
 
-   if (data-clk[1])
-   clk_disable(data-clk[1]);
-   if (data-clk[0])
-   clk_disable(data-clk[0]);
+   if (!IS_ERR(data-clk))
+   clk_disable(data-clk);
 
disabled = true;
data-pgtable = 0;
@@ -392,7 +370,7 @@ finish:
 static int __exynos_sysmmu_enable(struct sysmmu_drvdata *data,
unsigned long pgtable, struct iommu_domain *domain)
 {
-   int i, ret = 0;
+   int ret = 0;
unsigned long flags;
 
write_lock_irqsave(data-lock, flags);
@@ -409,17 +387,14 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata 
*data,
goto finish;
}
 
-   if (data-clk[0])

[PATCH v12 06/31] iommu/exynos: allocate lv2 page table from own slab

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Since kmalloc() does not guarantee that the allignment of 1KiB when it
allocates 1KiB, it is required to allocate lv2 page table from own
slab that guarantees alignment of 1KiB

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   34 --
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 7556177..c7f831c 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -99,6 +99,8 @@
 #define REG_PB1_SADDR  0x054
 #define REG_PB1_EADDR  0x058
 
+static struct kmem_cache *lv2table_kmem_cache;
+
 static unsigned long *section_entry(unsigned long *pgtable, unsigned long iova)
 {
return pgtable + lv1ent_offset(iova);
@@ -725,7 +727,8 @@ static void exynos_iommu_domain_destroy(struct iommu_domain 
*domain)
 
for (i = 0; i  NUM_LV1ENTRIES; i++)
if (lv1ent_page(priv-pgtable + i))
-   kfree(__va(lv2table_base(priv-pgtable + i)));
+   kmem_cache_free(lv2table_kmem_cache,
+   __va(lv2table_base(priv-pgtable + i)));
 
free_pages((unsigned long)priv-pgtable, 2);
free_pages((unsigned long)priv-lv2entcnt, 1);
@@ -824,7 +827,7 @@ static unsigned long *alloc_lv2entry(unsigned long *sent, 
unsigned long iova,
if (lv1ent_fault(sent)) {
unsigned long *pent;
 
-   pent = kzalloc(LV2TABLE_SIZE, GFP_ATOMIC);
+   pent = kmem_cache_zalloc(lv2table_kmem_cache, GFP_ATOMIC);
BUG_ON((unsigned long)pent  (LV2TABLE_SIZE - 1));
if (!pent)
return ERR_PTR(-ENOMEM);
@@ -854,8 +857,7 @@ static int lv1set_section(unsigned long *sent, unsigned 
long iova,
return -EADDRINUSE;
}
 
-   kfree(page_entry(sent, 0));
-
+   kmem_cache_free(lv2table_kmem_cache, page_entry(sent, 0));
*pgcnt = 0;
}
 
@@ -1060,11 +1062,31 @@ static int __init exynos_iommu_init(void)
 {
int ret;
 
+   lv2table_kmem_cache = kmem_cache_create(exynos-iommu-lv2table,
+   LV2TABLE_SIZE, LV2TABLE_SIZE, 0, NULL);
+   if (!lv2table_kmem_cache) {
+   pr_err(%s: Failed to create kmem cache\n, __func__);
+   return -ENOMEM;
+   }
+
ret = platform_driver_register(exynos_sysmmu_driver);
+   if (ret) {
+   pr_err(%s: Failed to register driver\n, __func__);
+   goto err_reg_driver;
+   }
 
-   if (ret == 0)
-   bus_set_iommu(platform_bus_type, exynos_iommu_ops);
+   ret = bus_set_iommu(platform_bus_type, exynos_iommu_ops);
+   if (ret) {
+   pr_err(%s: Failed to register exynos-iommu driver.\n,
+   __func__);
+   goto err_set_iommu;
+   }
 
+   return 0;
+err_set_iommu:
+   platform_driver_unregister(exynos_sysmmu_driver);
+err_reg_driver:
+   kmem_cache_destroy(lv2table_kmem_cache);
return ret;
 }
 subsys_initcall(exynos_iommu_init);
-- 
1.7.9.5

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


[PATCH v12 19/31] iommu/exynos: change rwlock to spinlock

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Since acquiring read_lock is not more frequent than write_lock, it is
not beneficial to use rwlock, this commit changes rwlock to spinlock.

Reviewed-by: Grant Grundler grund...@chromium.org
Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   39 ---
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index c2e6365..c9076e1 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -200,7 +200,7 @@ struct sysmmu_drvdata {
struct clk *clk;
struct clk *clk_master;
int activations;
-   rwlock_t lock;
+   spinlock_t lock;
struct iommu_domain *domain;
bool powered_on;
bool suspended;
@@ -323,12 +323,13 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void 
*dev_id)
unsigned long addr = -1;
int ret = -ENOSYS;
 
-   read_lock(data-lock);
-
WARN_ON(!is_sysmmu_active(data));
 
+   spin_lock(data-lock);
+
if (!IS_ERR(data-clk_master))
clk_enable(data-clk_master);
+
itype = (enum exynos_sysmmu_inttype)
__ffs(__raw_readl(data-sfrbase + REG_INT_STATUS));
if (WARN_ON(!((itype = 0)  (itype  SYSMMU_FAULT_UNKNOWN
@@ -362,7 +363,7 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
if (!IS_ERR(data-clk_master))
clk_disable(data-clk_master);
 
-   read_unlock(data-lock);
+   spin_unlock(data-lock);
 
return IRQ_HANDLED;
 }
@@ -385,7 +386,7 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data)
bool disabled;
unsigned long flags;
 
-   write_lock_irqsave(data-lock, flags);
+   spin_lock_irqsave(data-lock, flags);
 
disabled = set_sysmmu_inactive(data);
 
@@ -402,7 +403,7 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data)
data-activations);
}
 
-   write_unlock_irqrestore(data-lock, flags);
+   spin_unlock_irqrestore(data-lock, flags);
 
return disabled;
 }
@@ -452,7 +453,7 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data,
int ret = 0;
unsigned long flags;
 
-   write_lock_irqsave(data-lock, flags);
+   spin_lock_irqsave(data-lock, flags);
if (set_sysmmu_active(data)) {
data-pgtable = pgtable;
data-domain = domain;
@@ -470,7 +471,7 @@ static int __sysmmu_enable(struct sysmmu_drvdata *data,
if (WARN_ON(ret  0))
set_sysmmu_inactive(data); /* decrement count */
 
-   write_unlock_irqrestore(data-lock, flags);
+   spin_unlock_irqrestore(data-lock, flags);
 
return ret;
 }
@@ -557,7 +558,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, 
unsigned long iova,
 
for_each_sysmmu_list(dev, list) {
struct sysmmu_drvdata *data = dev_get_drvdata(list-sysmmu);
-   read_lock(data-lock);
+   spin_lock(data-lock);
if (is_sysmmu_active(data)  data-powered_on) {
unsigned int num_inv = 1;
 
@@ -592,7 +593,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, 
unsigned long iova,
iova);
}
 
-   read_unlock(data-lock);
+   spin_unlock(data-lock);
}
 
spin_unlock_irqrestore(owner-lock, flags);
@@ -608,7 +609,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev)
 
for_each_sysmmu_list(dev, list) {
struct sysmmu_drvdata *data = dev_get_drvdata(list-sysmmu);
-   read_lock(data-lock);
+   spin_lock(data-lock);
if (is_sysmmu_active(data)  data-powered_on) {
if (!IS_ERR(data-clk_master))
clk_enable(data-clk_master);
@@ -621,7 +622,7 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev)
} else {
dev_dbg(dev, disabled. Skipping TLB invalidation\n);
}
-   read_unlock(data-lock);
+   spin_unlock(data-lock);
}
 
spin_unlock_irqrestore(owner-lock, flags);
@@ -813,7 +814,7 @@ static int __init exynos_sysmmu_probe(struct 
platform_device *pdev)
if (!ret) {
data-powered_on = !pm_runtime_enabled(dev);
data-sysmmu = dev;
-   rwlock_init(data-lock);
+   spin_lock_init(data-lock);
 
platform_set_drvdata(pdev, data);
}
@@ -1264,12 +1265,12 @@ static int sysmmu_pm_genpd_suspend(struct device *dev)
for_each_sysmmu_list(dev, list) {
struct sysmmu_drvdata *data = dev_get_drvdata(list-sysmmu);
unsigned long flags;
-   write_lock_irqsave(data-lock, flags);
+   spin_lock_irqsave(data-lock, 

[PATCH v12 16/31] iommu/exynos: turn on useful configuration options

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This turns on FLPD_CACHE, ACGEN and SYSSEL.

FLPD_CACHE is a cache of 1st level page table entries that contains
the address of a 2nd level page table to reduce latency of page table
walking.

ACGEN is architectural clock gating that gates clocks by System MMU
itself if it is not active. Note that ACGEN is different from clock
gating by the CPU. ACGEN just gates clocks to the internal logic of
System MMU while clock gating by the CPU gates clocks to the System
MMU.

SYSSEL selects System MMU version in some Exynos SoCs. Some Exynos
SoCs have an option to select System MMU versions exclusively because
the SoCs adopts new System MMU version experimentally.

This also always selects LRU as TLB replacement policy. Selecting TLB
replacement policy is deprecated from System MMU 3.2. TLB in System
MMU 3.3 has single TLB replacement policy, LRU. The bit of MMU_CFG
selecting TLB replacement policy is remained as reserved.

QoS value of page table walking is set to 15 (highst value). System
MMU 3.3 can inherit QoS value of page table walking from its master
H/W's transaction. This new feature is enabled by default and QoS
value written to MMU_CFG is ignored.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   52 +-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 45c792c..810bcaf 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -81,6 +81,13 @@
 #define CTRL_BLOCK 0x7
 #define CTRL_DISABLE   0x0
 
+#define CFG_LRU0x1
+#define CFG_QOS(n) ((n  0xF)  7)
+#define CFG_MASK   0x0150 /* Selecting bit 0-15, 20, 22 and 24 */
+#define CFG_ACGEN  (1  24) /* System MMU 3.3 only */
+#define CFG_SYSSEL (1  22) /* System MMU 3.2 only */
+#define CFG_FLPDCACHE  (1  20) /* System MMU 3.2+ only */
+
 #define REG_MMU_CTRL   0x000
 #define REG_MMU_CFG0x004
 #define REG_MMU_STATUS 0x008
@@ -97,6 +104,12 @@
 
 #define REG_MMU_VERSION0x034
 
+#define MMU_MAJ_VER(val)   ((val)  7)
+#define MMU_MIN_VER(val)   ((val)  0x7F)
+#define MMU_RAW_VER(reg)   (((reg)  21)  ((1  11) - 1)) /* 11 bits */
+
+#define MAKE_MMU_VER(maj, min) maj)  0xF)  7) | ((min)  0x7F))
+
 #define REG_PB0_SADDR  0x04C
 #define REG_PB0_EADDR  0x050
 #define REG_PB1_SADDR  0x054
@@ -206,6 +219,29 @@ static void sysmmu_unblock(void __iomem *sfrbase)
__raw_writel(CTRL_ENABLE, sfrbase + REG_MMU_CTRL);
 }
 
+static unsigned int __raw_sysmmu_version(struct sysmmu_drvdata *data)
+{
+   return MMU_RAW_VER(__raw_readl(data-sfrbase + REG_MMU_VERSION));
+}
+
+static unsigned int __sysmmu_version(struct sysmmu_drvdata *data,
+unsigned int *minor)
+{
+   unsigned int ver = 0;
+
+   ver = __raw_sysmmu_version(data);
+   if (ver  MAKE_MMU_VER(3, 3)) {
+   dev_err(data-sysmmu, %s: version(%d.%d) is higher than 3.3\n,
+   __func__, MMU_MAJ_VER(ver), MMU_MIN_VER(ver));
+   BUG();
+   }
+
+   if (minor)
+   *minor = MMU_MIN_VER(ver);
+
+   return MMU_MAJ_VER(ver);
+}
+
 static bool sysmmu_block(void __iomem *sfrbase)
 {
int i = 120;
@@ -360,7 +396,21 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data)
 
 static void __sysmmu_init_config(struct sysmmu_drvdata *data)
 {
-   unsigned long cfg = 0;
+   unsigned long cfg = CFG_LRU | CFG_QOS(15);
+   int maj, min = 0;
+
+   maj = __sysmmu_version(data, min);
+   if (maj == 3) {
+   if (min = 2) {
+   cfg |= CFG_FLPDCACHE;
+   if (min == 3) {
+   cfg |= CFG_ACGEN;
+   cfg = ~CFG_LRU;
+   } else {
+   cfg |= CFG_SYSSEL;
+   }
+   }
+   }
 
__raw_writel(cfg, data-sfrbase + REG_MMU_CFG);
 }
-- 
1.7.9.5

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


[PATCH v12 21/31] iommu/exynos: fix address handling

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Use of __pa and __va macro is changed to virt_to_phys and phys_to_virt
which are recommended in driver code. printk formatting of physical
address is also fixed to %pa.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   33 +
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 5c7f4d2..08a7ce0 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -131,7 +131,8 @@ static unsigned long *section_entry(unsigned long *pgtable, 
unsigned long iova)
 
 static unsigned long *page_entry(unsigned long *sent, unsigned long iova)
 {
-   return (unsigned long *)__va(lv2table_base(sent)) + lv2ent_offset(iova);
+   return (unsigned long *)phys_to_virt(
+   lv2table_base(sent)) + lv2ent_offset(iova);
 }
 
 enum exynos_sysmmu_inttype {
@@ -204,7 +205,7 @@ struct sysmmu_drvdata {
struct iommu_domain *domain;
bool powered_on;
bool suspended;
-   unsigned long pgtable;
+   phys_addr_t pgtable;
 };
 
 static bool set_sysmmu_active(struct sysmmu_drvdata *data)
@@ -296,17 +297,17 @@ static void __sysmmu_set_ptbase(void __iomem *sfrbase,
 
 static void show_fault_information(const char *name,
enum exynos_sysmmu_inttype itype,
-   unsigned long pgtable_base, unsigned long fault_addr)
+   phys_addr_t pgtable_base, unsigned long fault_addr)
 {
unsigned long *ent;
 
if ((itype = SYSMMU_FAULTS_NUM) || (itype  SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN;
 
-   pr_err(%s occurred at 0x%lx by %s(Page table base: 0x%lx)\n,
-   sysmmu_fault_name[itype], fault_addr, name, pgtable_base);
+   pr_err(%s occurred at %#lx by %s(Page table base: %pa)\n,
+   sysmmu_fault_name[itype], fault_addr, name, pgtable_base);
 
-   ent = section_entry(__va(pgtable_base), fault_addr);
+   ent = section_entry(phys_to_virt(pgtable_base), fault_addr);
pr_err(\tLv1 entry: 0x%lx\n, *ent);
 
if (lv1ent_page(ent)) {
@@ -909,7 +910,7 @@ static void exynos_iommu_domain_destroy(struct iommu_domain 
*domain)
for (i = 0; i  NUM_LV1ENTRIES; i++)
if (lv1ent_page(priv-pgtable + i))
kmem_cache_free(lv2table_kmem_cache,
-   __va(lv2table_base(priv-pgtable + i)));
+   phys_to_virt(lv2table_base(priv-pgtable + i)));
 
free_pages((unsigned long)priv-pgtable, 2);
free_pages((unsigned long)priv-lv2entcnt, 1);
@@ -928,8 +929,7 @@ static int exynos_iommu_attach_device(struct iommu_domain 
*domain,
 
spin_lock_irqsave(priv-lock, flags);
 
-
-   ret = __exynos_sysmmu_enable(dev, __pa(priv-pgtable), domain);
+   ret = __exynos_sysmmu_enable(dev, pagetable, domain);
if (ret == 0) {
list_add_tail(owner-client, priv-clients);
owner-domain = domain;
@@ -937,13 +937,14 @@ static int exynos_iommu_attach_device(struct iommu_domain 
*domain,
 
spin_unlock_irqrestore(priv-lock, flags);
 
-   if (ret  0)
+   if (ret  0) {
dev_err(dev, %s: Failed to attach IOMMU with pgtable %pa\n,
-   __func__, pagetable);
-   else
-   dev_dbg(dev, %s: Attached IOMMU with pgtable %pa%s\n,
-   __func__, pagetable,
-   (ret == 0) ?  : , again);
+   __func__, pagetable);
+   return ret;
+   }
+
+   dev_dbg(dev, %s: Attached IOMMU with pgtable %pa %s\n,
+   __func__, pagetable, (ret == 0) ?  : , again);
 
return ret;
 }
@@ -993,7 +994,7 @@ static unsigned long *alloc_lv2entry(unsigned long *sent, 
unsigned long iova,
if (!pent)
return ERR_PTR(-ENOMEM);
 
-   *sent = mk_lv1ent_page(__pa(pent));
+   *sent = mk_lv1ent_page(virt_to_phys(pent));
*pgcounter = NUM_LV2ENTRIES;
pgtable_flush(pent, pent + NUM_LV2ENTRIES);
pgtable_flush(sent, sent + 1);
-- 
1.7.9.5

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


[PATCH v12 10/31] iommu/exynos: use managed device helper functions

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch uses managed device helper functions in the probe().

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   68 --
 1 file changed, 25 insertions(+), 43 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 1af2d23..0f1d3f0 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -342,8 +342,7 @@ static bool __exynos_sysmmu_disable(struct sysmmu_drvdata 
*data)
 
__raw_writel(CTRL_DISABLE, data-sfrbase + REG_MMU_CTRL);
 
-   if (!IS_ERR(data-clk))
-   clk_disable(data-clk);
+   clk_disable(data-clk);
 
disabled = true;
data-pgtable = 0;
@@ -386,8 +385,7 @@ static int __exynos_sysmmu_enable(struct sysmmu_drvdata 
*data,
goto finish;
}
 
-   if (!IS_ERR(data-clk))
-   clk_enable(data-clk);
+   clk_enable(data-clk);
 
data-pgtable = pgtable;
 
@@ -498,49 +496,43 @@ void exynos_sysmmu_tlb_invalidate(struct device *dev)
 
 static int exynos_sysmmu_probe(struct platform_device *pdev)
 {
-   int ret;
+   int irq, ret;
struct device *dev = pdev-dev;
struct sysmmu_drvdata *data;
struct resource *res;
 
-   data = kzalloc(sizeof(*data), GFP_KERNEL);
-   if (!data) {
-   dev_dbg(dev, Not enough memory\n);
-   ret = -ENOMEM;
-   goto err_alloc;
-   }
+   data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+   if (!data)
+   return -ENOMEM;
 
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-   if (!res) {
-   dev_dbg(dev, Unable to find IOMEM region\n);
-   ret = -ENOENT;
-   goto err_init;
-   }
+   data-sfrbase = devm_ioremap_resource(dev, res);
+   if (IS_ERR(data-sfrbase))
+   return PTR_ERR(data-sfrbase);
 
-   data-sfrbase = ioremap(res-start, resource_size(res));
-   if (!data-sfrbase) {
-   dev_dbg(dev, Unable to map IOMEM @ PA:%#x\n, res-start);
-   ret = -ENOENT;
-   goto err_res;
-   }
-
-   ret = platform_get_irq(pdev, 0);
-   if (ret = 0) {
+   irq = platform_get_irq(pdev, 0);
+   if (irq = 0) {
dev_dbg(dev, Unable to find IRQ resource\n);
-   goto err_irq;
+   return irq;
}
 
-   ret = request_irq(ret, exynos_sysmmu_irq, 0,
+   ret = devm_request_irq(dev, irq, exynos_sysmmu_irq, 0,
dev_name(dev), data);
if (ret) {
-   dev_dbg(dev, Unabled to register interrupt handler\n);
-   goto err_irq;
+   dev_err(dev, Unabled to register handler of irq %d\n, irq);
+   return ret;
}
 
-   if (dev_get_platdata(dev)) {
-   data-clk = clk_get(dev, sysmmu);
-   if (IS_ERR(data-clk))
-   dev_dbg(dev, No clock descriptor registered\n);
+   data-clk = devm_clk_get(dev, sysmmu);
+   if (IS_ERR(data-clk)) {
+   dev_err(dev, Failed to get clock!\n);
+   return PTR_ERR(data-clk);
+   } else  {
+   ret = clk_prepare(data-clk);
+   if (ret) {
+   dev_err(dev, Failed to prepare clk\n);
+   return ret;
+   }
}
 
data-sysmmu = dev;
@@ -553,17 +545,7 @@ static int exynos_sysmmu_probe(struct platform_device 
*pdev)
 
pm_runtime_enable(dev);
 
-   dev_dbg(dev, Initialized\n);
return 0;
-err_irq:
-   free_irq(platform_get_irq(pdev, 0), data);
-err_res:
-   iounmap(data-sfrbase);
-err_init:
-   kfree(data);
-err_alloc:
-   dev_err(dev, Failed to initialize\n);
-   return ret;
 }
 
 static struct platform_driver exynos_sysmmu_driver = {
-- 
1.7.9.5

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


[PATCH v12 14/31] iommu/exynos: remove custom fault handler

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This commit removes custom fault handler. The device drivers that
need to register fault handler can register
with iommu_set_fault_handler().

CC: Grant Grundler grund...@chromium.org
Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   80 +-
 1 file changed, 24 insertions(+), 56 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index ba477c4..b07b78b 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -125,16 +125,6 @@ enum exynos_sysmmu_inttype {
SYSMMU_FAULTS_NUM
 };
 
-/*
- * @itype: type of fault.
- * @pgtable_base: the physical address of page table base. This is 0 if @itype
- *is SYSMMU_BUSERROR.
- * @fault_addr: the device (virtual) address that the System MMU tried to
- * translated. This is 0 if @itype is SYSMMU_BUSERROR.
- */
-typedef int (*sysmmu_fault_handler_t)(enum exynos_sysmmu_inttype itype,
-   unsigned long pgtable_base, unsigned long fault_addr);
-
 static unsigned short fault_reg_offset[SYSMMU_FAULTS_NUM] = {
REG_PAGE_FAULT_ADDR,
REG_AR_FAULT_ADDR,
@@ -176,7 +166,6 @@ struct sysmmu_drvdata {
int activations;
rwlock_t lock;
struct iommu_domain *domain;
-   sysmmu_fault_handler_t fault_handler;
unsigned long pgtable;
 };
 
@@ -245,34 +234,17 @@ static void __sysmmu_set_ptbase(void __iomem *sfrbase,
__sysmmu_tlb_invalidate(sfrbase);
 }
 
-static void __set_fault_handler(struct sysmmu_drvdata *data,
-   sysmmu_fault_handler_t handler)
-{
-   unsigned long flags;
-
-   write_lock_irqsave(data-lock, flags);
-   data-fault_handler = handler;
-   write_unlock_irqrestore(data-lock, flags);
-}
-
-void exynos_sysmmu_set_fault_handler(struct device *dev,
-   sysmmu_fault_handler_t handler)
-{
-   struct sysmmu_drvdata *data = dev_get_drvdata(dev-archdata.iommu);
-
-   __set_fault_handler(data, handler);
-}
-
-static int default_fault_handler(enum exynos_sysmmu_inttype itype,
-unsigned long pgtable_base, unsigned long fault_addr)
+static void show_fault_information(const char *name,
+   enum exynos_sysmmu_inttype itype,
+   unsigned long pgtable_base, unsigned long fault_addr)
 {
unsigned long *ent;
 
if ((itype = SYSMMU_FAULTS_NUM) || (itype  SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN;
 
-   pr_err(%s occurred at 0x%lx(Page table base: 0x%lx)\n,
-   sysmmu_fault_name[itype], fault_addr, pgtable_base);
+   pr_err(%s occurred at 0x%lx by %s(Page table base: 0x%lx)\n,
+   sysmmu_fault_name[itype], fault_addr, name, pgtable_base);
 
ent = section_entry(__va(pgtable_base), fault_addr);
pr_err(\tLv1 entry: 0x%lx\n, *ent);
@@ -281,12 +253,6 @@ static int default_fault_handler(enum 
exynos_sysmmu_inttype itype,
ent = page_entry(ent, fault_addr);
pr_err(\t Lv2 entry: 0x%lx\n, *ent);
}
-
-   pr_err(Generating Kernel OOPS... because it is unrecoverable.\n);
-
-   BUG();
-
-   return 0;
 }
 
 static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
@@ -310,24 +276,28 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void 
*dev_id)
else
addr = __raw_readl(data-sfrbase + fault_reg_offset[itype]);
 
-   if (data-domain)
-   ret = report_iommu_fault(data-domain, data-dev, addr, itype);
-
-   if ((ret == -ENOSYS)  data-fault_handler) {
-   unsigned long base = data-pgtable;
-   if (itype != SYSMMU_FAULT_UNKNOWN)
-   base = __raw_readl(data-sfrbase + REG_PT_BASE_ADDR);
-   ret = data-fault_handler(itype, base, addr);
+   if (itype == SYSMMU_FAULT_UNKNOWN) {
+   pr_err(%s: Fault is not occurred by System MMU '%s'!\n,
+   __func__, dev_name(data-sysmmu));
+   pr_err(%s: Please check if IRQ is correctly configured.\n,
+   __func__);
+   BUG();
+   } else {
+   unsigned long base =
+   __raw_readl(data-sfrbase + REG_PT_BASE_ADDR);
+   show_fault_information(dev_name(data-sysmmu),
+   itype, base, addr);
+   if (data-domain)
+   ret = report_iommu_fault(data-domain,
+   data-dev, addr, itype);
}
 
-   if (!ret  (itype != SYSMMU_FAULT_UNKNOWN))
-   __raw_writel(1  itype, data-sfrbase + REG_INT_CLEAR);
-   else
-   dev_dbg(data-sysmmu, %s is not handled.\n,
-   sysmmu_fault_name[itype]);
+   /* fault is not recovered by fault handler */
+  

[PATCH v12 23/31] iommu/exynos: use simpler function to get MMU version

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This commit changes the function to get MMU version simpler.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   30 ++
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 00915f2..54011e5 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -252,24 +252,6 @@ static unsigned int __raw_sysmmu_version(struct 
sysmmu_drvdata *data)
return MMU_RAW_VER(__raw_readl(data-sfrbase + REG_MMU_VERSION));
 }
 
-static unsigned int __sysmmu_version(struct sysmmu_drvdata *data,
-unsigned int *minor)
-{
-   unsigned int ver = 0;
-
-   ver = __raw_sysmmu_version(data);
-   if (ver  MAKE_MMU_VER(3, 3)) {
-   dev_err(data-sysmmu, %s: version(%d.%d) is higher than 3.3\n,
-   __func__, MMU_MAJ_VER(ver), MMU_MIN_VER(ver));
-   BUG();
-   }
-
-   if (minor)
-   *minor = MMU_MIN_VER(ver);
-
-   return MMU_MAJ_VER(ver);
-}
-
 static bool sysmmu_block(void __iomem *sfrbase)
 {
int i = 120;
@@ -427,13 +409,13 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data)
 static void __sysmmu_init_config(struct sysmmu_drvdata *data)
 {
unsigned int cfg = CFG_LRU | CFG_QOS(15);
-   int maj, min = 0;
+   unsigned int ver;
 
-   maj = __sysmmu_version(data, min);
-   if (maj == 3) {
-   if (min = 2) {
+   ver = __raw_sysmmu_version(data);
+   if (MMU_MAJ_VER(ver) == 3) {
+   if (MMU_MIN_VER(ver) = 2) {
cfg |= CFG_FLPDCACHE;
-   if (min == 3) {
+   if (MMU_MIN_VER(ver) == 3) {
cfg |= CFG_ACGEN;
cfg = ~CFG_LRU;
} else {
@@ -591,7 +573,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, 
sysmmu_iova_t iova,
 * 1MB page can be cached in one of all sets.
 * 64KB page can be one of 16 consecutive sets.
 */
-   if (__sysmmu_version(data, NULL) == 2)
+   if (MMU_MAJ_VER(__raw_sysmmu_version(data)) == 2)
num_inv = min_t(unsigned int,
size / PAGE_SIZE, 64);
 
-- 
1.7.9.5

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


[PATCH v12 29/31] ARM: dts: add System MMU nodes of exynos4x12

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch adds System MMU nodes that are specifict to exynos4x12
series.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 arch/arm/boot/dts/exynos4x12.dtsi |   78 -
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/exynos4x12.dtsi 
b/arch/arm/boot/dts/exynos4x12.dtsi
index c4a9306..21cb164 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -119,7 +119,7 @@
interrupts = 0 72 0;
};
 
-   g2d@1080 {
+   g2d: g2d@1080 {
compatible = samsung,exynos4212-g2d;
reg = 0x1080 0x1000;
interrupts = 0 89 0;
@@ -243,4 +243,80 @@
clock-names = biu, ciu;
status = disabled;
};
+
+   sysmmu_g2d: sysmmu@10A4{
+   compatible = samsung,sysmmu-v1;
+   reg = 0x10A4 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 4 7;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_G2D;
+   mmu-masters = g2d;
+   };
+
+   sysmmu_fimc_isp: sysmmu@1226 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x1226 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 16 2;
+   samsung,power-domain = pd_isp;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_ISP;
+   mmu-masters = fimc_is;
+   };
+
+   sysmmu_fimc_drc: sysmmu@1227 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x1227 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 16 3;
+   samsung,power-domain = pd_isp;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_DRC;
+   mmu-masters = fimc_is;
+   };
+
+   sysmmu_fimc_fd: sysmmu@122A {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x122A 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 16 4;
+   samsung,power-domain = pd_isp;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_FD;
+   mmu-masters = fimc_is;
+   };
+
+   sysmmu_fimc_mcuctl: sysmmu@122B {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x122B 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 16 5;
+   samsung,power-domain = pd_isp;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_ISPCX;
+   mmu-masters = fimc_is;
+   };
+
+   sysmmu_fimc_lite0: sysmmu@123B {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x123B 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 16 0;
+   samsung,power-domain = pd_isp;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_LITE0;
+   mmu-masters = fimc_lite_0;
+   };
+
+   sysmmu_fimc_lite1: sysmmu@123C {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x123C 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 16 1;
+   samsung,power-domain = pd_isp;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_LITE1;
+   mmu-masters = fimc_lite_1;
+   };
 };
-- 
1.7.9.5

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


[PATCH v12 24/31] iommu/exynos: apply workaround of caching fault page table entries

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch contains 2 workaround for the System MMU v3.x.

System MMU v3.2 and v3.3 has FLPD cache that caches first level page
table entries to reduce page table walking latency. However, the
FLPD cache is filled with a first level page table entry even though
it is not accessed by a master H/W because System MMU v3.3
speculatively prefetches page table entries that may be accessed
in the near future by the master H/W.
The prefetched FLPD cache entries are not invalidated by iommu_unmap()
because iommu_unmap() only unmaps and invalidates the page table
entries that is mapped.

Because exynos-iommu driver discards a second level page table when
it needs to be replaced with another second level page table or
a first level page table entry with 1MB mapping, It is required to
invalidate FLPD cache that may contain the first level page table
entry that points to the second level page table.

Another workaround of System MMU v3.3 is initializing the first level
page table entries with the second level page table which is filled
with all zeros. This prevents System MMU prefetches 'fault' first
level page table entry which may lead page fault on access to 16MiB
wide.

System MMU 3.x fetches consecutive page table entries by a page
table walking to maximize bus utilization and to minimize TLB miss
panelty.
Unfortunately, functional problem is raised with the fetching behavior
because it fetches 'fault' page table entries that specifies no
translation information and that a valid translation information will
be written to in the near future. The logic in the System MMU generates
page fault with the cached fault entries that is no longer coherent
with the page table which is updated.

There is another workaround that must be implemented by I/O virtual
memory manager: any two consecutive I/O virtual memory area must have
a hole between the two that is larger than or equal to 128KiB.
Also, next I/O virtual memory area must be started from the next
128KiB boundary.

0128K   256K   384K 512K
|-|---|-||
|area1|.hole...|--- area2 -

The constraint is depicted above.
The size is selected by the calculation followed:
 - System MMU can fetch consecutive 64 page table entries at once
   64 * 4KiB = 256KiB. This is the size between 128K ~ 384K of the
   above picture. This style of fetching is 'block fetch'. It fetches
   the page table entries predefined consecutive page table entries
   including the entry that is the reason of the page table walking.
 - System MMU can prefetch upto consecutive 32 page table entries.
   This is the size between 256K ~ 384K.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |  166 +-
 1 file changed, 149 insertions(+), 17 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 54011e5..35b055e 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -49,8 +49,12 @@ typedef u32 sysmmu_pte_t;
 #define LPAGE_MASK (~(LPAGE_SIZE - 1))
 #define SPAGE_MASK (~(SPAGE_SIZE - 1))
 
-#define lv1ent_fault(sent) (((*(sent)  3) == 0) || ((*(sent)  3) == 3))
-#define lv1ent_page(sent) ((*(sent)  3) == 1)
+#define lv1ent_fault(sent) ((*(sent) == ZERO_LV2LINK) || \
+  ((*(sent)  3) == 0) || ((*(sent)  3) == 3))
+#define lv1ent_zero(sent) (*(sent) == ZERO_LV2LINK)
+#define lv1ent_page_zero(sent) ((*(sent)  3) == 1)
+#define lv1ent_page(sent) ((*(sent) != ZERO_LV2LINK)  \
+ ((*(sent)  3) == 1))
 #define lv1ent_section(sent) ((*(sent)  3) == 2)
 
 #define lv2ent_fault(pent) ((*(pent)  3) == 0)
@@ -138,6 +142,8 @@ static u32 lv2ent_offset(sysmmu_iova_t iova)
entry)
 
 static struct kmem_cache *lv2table_kmem_cache;
+static sysmmu_pte_t *zero_lv2_table;
+#define ZERO_LV2LINK mk_lv1ent_page(virt_to_phys(zero_lv2_table))
 
 static sysmmu_pte_t *section_entry(sysmmu_pte_t *pgtable, sysmmu_iova_t iova)
 {
@@ -545,6 +551,35 @@ static bool exynos_sysmmu_disable(struct device *dev)
return disabled;
 }
 
+static void __sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
+ sysmmu_iova_t iova)
+{
+   if (__raw_sysmmu_version(data) == MAKE_MMU_VER(3, 3))
+   __raw_writel(iova | 0x1, data-sfrbase + REG_MMU_FLUSH_ENTRY);
+}
+
+static void sysmmu_tlb_invalidate_flpdcache(struct device *dev,
+   sysmmu_iova_t iova)
+{
+   struct sysmmu_list_data *list;
+
+   for_each_sysmmu_list(dev, list) {
+   unsigned long flags;
+   struct sysmmu_drvdata *data = dev_get_drvdata(list-sysmmu);
+
+   if (!IS_ERR(data-clk_master))
+   clk_enable(data-clk_master);
+
+   

[PATCH v12 28/31] ARM: dts: add System MMU nodes of exynos4210

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This patch adds System MMUs that are specific to exynos4210.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 arch/arm/boot/dts/exynos4210.dtsi |   23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/exynos4210.dtsi 
b/arch/arm/boot/dts/exynos4210.dtsi
index cacf614..0b4ece1 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -114,7 +114,7 @@
status = disabled;
};
 
-   g2d@1280 {
+   g2d: g2d@1280 {
compatible = samsung,s5pv210-g2d;
reg = 0x1280 0x1000;
interrupts = 0 89 0;
@@ -153,4 +153,25 @@
samsung,lcd-wb;
};
};
+
+   sysmmu_g2d: sysmmu@12A2 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x12A2 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 4 7;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_G2D;
+   samsung,power-domain = pd_lcd0;
+   mmu-masters = g2d;
+   };
+
+   sysmmu_fimd1: sysmmu@1222 {
+   compatible = samsung,sysmmu-v1;
+   interrupt-parent = combiner;
+   reg = 0x1222 0x1000;
+   interrupts = 5 3;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_FIMD1;
+   samsung,power-domain = pd_lcd1;
+   };
 };
-- 
1.7.9.5

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


[PATCH v12 22/31] iommu/exynos: use exynos-iommu specific typedef

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This commit introduces sysmmu_pte_t for page table entries and
sysmmu_iova_t vor I/O virtual address that is manipulated by
exynos-iommu driver. The purpose of the typedef is to remove
dependencies to the driver code from the change of CPU architecture
from 32 bit to 64 bit.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |  117 --
 1 file changed, 67 insertions(+), 50 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 08a7ce0..00915f2 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -33,6 +33,9 @@
 #include asm/cacheflush.h
 #include asm/pgtable.h
 
+typedef u32 sysmmu_iova_t;
+typedef u32 sysmmu_pte_t;
+
 /* We does not consider super section mapping (16MB) */
 #define SECT_ORDER 20
 #define LPAGE_ORDER 16
@@ -54,20 +57,32 @@
 #define lv2ent_small(pent) ((*(pent)  2) == 2)
 #define lv2ent_large(pent) ((*(pent)  3) == 1)
 
+static u32 sysmmu_page_offset(sysmmu_iova_t iova, u32 size)
+{
+   return iova  (size - 1);
+}
+
 #define section_phys(sent) (*(sent)  SECT_MASK)
-#define section_offs(iova) ((iova)  0xF)
+#define section_offs(iova) sysmmu_page_offset((iova), SECT_SIZE)
 #define lpage_phys(pent) (*(pent)  LPAGE_MASK)
-#define lpage_offs(iova) ((iova)  0x)
+#define lpage_offs(iova) sysmmu_page_offset((iova), LPAGE_SIZE)
 #define spage_phys(pent) (*(pent)  SPAGE_MASK)
-#define spage_offs(iova) ((iova)  0xFFF)
-
-#define lv1ent_offset(iova) ((iova)  SECT_ORDER)
-#define lv2ent_offset(iova) (((iova)  0xFF000)  SPAGE_ORDER)
+#define spage_offs(iova) sysmmu_page_offset((iova), SPAGE_SIZE)
 
 #define NUM_LV1ENTRIES 4096
-#define NUM_LV2ENTRIES 256
+#define NUM_LV2ENTRIES (SECT_SIZE / SPAGE_SIZE)
 
-#define LV2TABLE_SIZE (NUM_LV2ENTRIES * sizeof(long))
+static u32 lv1ent_offset(sysmmu_iova_t iova)
+{
+   return iova  SECT_ORDER;
+}
+
+static u32 lv2ent_offset(sysmmu_iova_t iova)
+{
+   return (iova  SPAGE_ORDER)  (NUM_LV2ENTRIES - 1);
+}
+
+#define LV2TABLE_SIZE (NUM_LV2ENTRIES * sizeof(sysmmu_pte_t))
 
 #define SPAGES_PER_LPAGE (LPAGE_SIZE / SPAGE_SIZE)
 
@@ -124,14 +139,14 @@
 
 static struct kmem_cache *lv2table_kmem_cache;
 
-static unsigned long *section_entry(unsigned long *pgtable, unsigned long iova)
+static sysmmu_pte_t *section_entry(sysmmu_pte_t *pgtable, sysmmu_iova_t iova)
 {
return pgtable + lv1ent_offset(iova);
 }
 
-static unsigned long *page_entry(unsigned long *sent, unsigned long iova)
+static sysmmu_pte_t *page_entry(sysmmu_pte_t *sent, sysmmu_iova_t iova)
 {
-   return (unsigned long *)phys_to_virt(
+   return (sysmmu_pte_t *)phys_to_virt(
lv2table_base(sent)) + lv2ent_offset(iova);
 }
 
@@ -183,7 +198,7 @@ struct exynos_iommu_owner {
 
 struct exynos_iommu_domain {
struct list_head clients; /* list of sysmmu_drvdata.node */
-   unsigned long *pgtable; /* lv1 page table, 16KB */
+   sysmmu_pte_t *pgtable; /* lv1 page table, 16KB */
short *lv2entcnt; /* free lv2 entry counter for each section */
spinlock_t lock; /* lock for this structure */
spinlock_t pgtablelock; /* lock for modifying page table @ pgtable */
@@ -277,7 +292,7 @@ static void __sysmmu_tlb_invalidate(void __iomem *sfrbase)
 }
 
 static void __sysmmu_tlb_invalidate_entry(void __iomem *sfrbase,
-   unsigned long iova, unsigned int num_inv)
+   sysmmu_iova_t iova, unsigned int num_inv)
 {
unsigned int i;
for (i = 0; i  num_inv; i++) {
@@ -288,7 +303,7 @@ static void __sysmmu_tlb_invalidate_entry(void __iomem 
*sfrbase,
 }
 
 static void __sysmmu_set_ptbase(void __iomem *sfrbase,
-  unsigned long pgd)
+  phys_addr_t pgd)
 {
__raw_writel(pgd, sfrbase + REG_PT_BASE_ADDR);
 
@@ -297,22 +312,22 @@ static void __sysmmu_set_ptbase(void __iomem *sfrbase,
 
 static void show_fault_information(const char *name,
enum exynos_sysmmu_inttype itype,
-   phys_addr_t pgtable_base, unsigned long fault_addr)
+   phys_addr_t pgtable_base, sysmmu_iova_t fault_addr)
 {
-   unsigned long *ent;
+   sysmmu_pte_t *ent;
 
if ((itype = SYSMMU_FAULTS_NUM) || (itype  SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN;
 
-   pr_err(%s occurred at %#lx by %s(Page table base: %pa)\n,
+   pr_err(%s occurred at %#x by %s(Page table base: %pa)\n,
sysmmu_fault_name[itype], fault_addr, name, pgtable_base);
 
ent = section_entry(phys_to_virt(pgtable_base), fault_addr);
-   pr_err(\tLv1 entry: 0x%lx\n, *ent);
+   pr_err(\tLv1 entry: %#x\n, *ent);
 
if (lv1ent_page(ent)) {
ent = page_entry(ent, fault_addr);
-   pr_err(\t Lv2 entry: 0x%lx\n, *ent);
+   pr_err(\t Lv2 

[PATCH v12 25/31] iommu/exynos: enhanced error messages

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Some redundant error message is removed and some error messages
are changed to error level from debug level.

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/iommu/exynos-iommu.c |   23 +--
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 35b055e..4009eb2 100755
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1018,7 +1018,7 @@ static void exynos_iommu_detach_device(struct 
iommu_domain *domain,
dev_dbg(dev, %s: Detached IOMMU with pgtable %pa\n,
__func__, pagetable);
else
-   dev_dbg(dev, %s: No IOMMU is attached\n, __func__);
+   dev_err(dev, %s: No IOMMU is attached\n, __func__);
 }
 
 static sysmmu_pte_t *alloc_lv2entry(struct exynos_iommu_domain *priv,
@@ -1117,10 +1117,8 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t 
paddr, size_t size,
short *pgcnt)
 {
if (size == SPAGE_SIZE) {
-   if (!lv2ent_fault(pent)) {
-   WARN(1, Trying mapping on 4KiB where mapping exists);
+   if (WARN_ON(!lv2ent_fault(pent)))
return -EADDRINUSE;
-   }
 
*pent = mk_lv2ent_spage(paddr);
pgtable_flush(pent, pent + 1);
@@ -1128,9 +1126,7 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t 
paddr, size_t size,
} else { /* size == LPAGE_SIZE */
int i;
for (i = 0; i  SPAGES_PER_LPAGE; i++, pent++) {
-   if (!lv2ent_fault(pent)) {
-   WARN(1,
-   Trying mapping on 64KiB where mapping exists);
+   if (WARN_ON(!lv2ent_fault(pent))) {
if (i  0)
memset(pent - i, 0, sizeof(*pent) * i);
return -EADDRINUSE;
@@ -1203,8 +1199,8 @@ static int exynos_iommu_map(struct iommu_domain *domain, 
unsigned long l_iova,
}
 
if (ret)
-   pr_debug(%s: Failed to map iova %#x/%#zx bytes\n,
-   __func__, iova, size);
+   pr_err(%s: Failed(%d) to map %#zx bytes @ %#x\n,
+   __func__, ret, size, iova);
 
spin_unlock_irqrestore(priv-pgtablelock, flags);
 
@@ -1241,7 +1237,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
ent = section_entry(priv-pgtable, iova);
 
if (lv1ent_section(ent)) {
-   if (size  SECT_SIZE) {
+   if (WARN_ON(size  SECT_SIZE)) {
err_pgsize = SECT_SIZE;
goto err;
}
@@ -1276,7 +1272,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain 
*domain,
}
 
/* lv1ent_large(ent) == true here */
-   if (size  LPAGE_SIZE) {
+   if (WARN_ON(size  LPAGE_SIZE)) {
err_pgsize = LPAGE_SIZE;
goto err;
}
@@ -1295,9 +1291,8 @@ done:
 err:
spin_unlock_irqrestore(priv-pgtablelock, flags);
 
-   WARN(1,
-   %s: Failed due to size(%#zx) @ %#x is smaller than page size %#zx\n,
-   __func__, size, iova, err_pgsize);
+   pr_err(%s: Failed: size(%#zx) @ %#x is smaller than page size %#zx\n,
+   __func__, size, iova, err_pgsize);
 
return 0;
 }
-- 
1.7.9.5

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


[PATCH v12 30/31] ARM: dts: add System MMU nodes of exynos5250

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 arch/arm/boot/dts/exynos5250.dtsi |  270 -
 1 file changed, 267 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250.dtsi 
b/arch/arm/boot/dts/exynos5250.dtsi
index 3742331..eebd397 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -82,6 +82,16 @@
reg = 0x10044040 0x20;
};
 
+   pd_isp: isp-power-domain@0x10044020 {
+   compatible = samsung,exynos4210-pd;
+   reg = 0x10044020 0x20;
+   };
+
+   pd_disp1: disp1-power-domain@0x100440A0 {
+   compatible = samsung,exynos4210-pd;
+   reg = 0x100440A0 0x20;
+   };
+
clock: clock-controller@1001 {
compatible = samsung,exynos5250-clock;
reg = 0x1001 0x3;
@@ -192,7 +202,7 @@
clock-names = fimg2d;
};
 
-   codec@1100 {
+   mfc: codec@1100 {
compatible = samsung,mfc-v6;
reg = 0x1100 0x1;
interrupts = 0 96 0;
@@ -692,7 +702,7 @@
sclk_hdmiphy, mout_hdmi;
};
 
-   mixer {
+   mixer: mixer {
compatible = samsung,exynos5250-mixer;
reg = 0x1445 0x1;
interrupts = 0 94 0;
@@ -713,7 +723,7 @@
phy-names = dp;
};
 
-   fimd@1440 {
+   fimd: fimd@1440 {
clocks = clock CLK_SCLK_FIMD1, clock CLK_FIMD1;
clock-names = sclk_fimd, fimd;
};
@@ -736,4 +746,258 @@
clocks = clock 348;
clock-names = secss;
};
+
+   sysmmu_g2d: sysmmu@10A6 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x10A6 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 24 5;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_2D;
+   };
+
+   sysmmu_mfc_r: sysmmu@1120 {
+   compatible = samsung,sysmmu-v2;
+   reg = 0x1120 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 6 2;
+   clock-names = sysmmu, master;
+   clocks = clock CLK_SMMU_MFCR, clock CLK_MFC;
+   mmu-masters = mfc;
+   samsung,power-domain = pd_mfc;
+   };
+
+   sysmmu_mfc_l: sysmmu@1121 {
+   compatible = samsung,sysmmu-v2;
+   reg = 0x1121 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 8 5;
+   clock-names = sysmmu, master;
+   clocks = clock CLK_SMMU_MFCL, clock CLK_MFC;
+   mmu-masters = mfc;
+   samsung,power-domain = pd_mfc;
+   };
+
+   sysmmu_rotator: sysmmu@11D4 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x11D4 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 4 0;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_ROTATOR;
+   };
+
+   sysmmu_fimc_isp: sysmmu@1326 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x1326 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 10 6;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_FIMC_ISP;
+   samsung,power-domain = pd_isp;
+   };
+
+   sysmmu_fimc_drc: sysmmu@1327 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x1327 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 11 6;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_FIMC_DRC;
+   samsung,power-domain = pd_isp;
+   };
+
+   sysmmu_fimc_scc: sysmmu@1328 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x1328 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 5 2;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_FIMC_SCC;
+   samsung,power-domain = pd_isp;
+   };
+
+   sysmmu_fimc_scp: sysmmu@1329 {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x1329 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 3 6;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_FIMC_SCP;
+   samsung,power-domain = pd_isp;
+   };
+
+   sysmmu_fimc_fd: sysmmu@132A {
+   compatible = samsung,sysmmu-v1;
+   reg = 0x132A 0x1000;
+   interrupt-parent = combiner;
+   interrupts = 5 0;
+   clock-names = sysmmu;
+   clocks = clock CLK_SMMU_FIMC_FD;
+   

[PATCH v12 26/31] clk: exynos: add gate clock descriptions of System MMU

2014-04-27 Thread Shaik Ameer Basha
From: Cho KyongHo pullip@samsung.com

This adds gate clocks of all System MMUs and their master IPs
that are not apeared in clk-exynos5250.c and clk-exynos5420.c

Signed-off-by: Cho KyongHo pullip@samsung.com
---
 drivers/clk/samsung/clk-exynos5250.c   |   36 
 drivers/clk/samsung/clk-exynos5420.c   |   13 ++--
 include/dt-bindings/clock/exynos5250.h |   17 +++
 include/dt-bindings/clock/exynos5420.h |6 +-
 4 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/samsung/clk-exynos5250.c 
b/drivers/clk/samsung/clk-exynos5250.c
index e7ee442..04f41ec 100644
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@ -28,6 +28,8 @@
 #define MPLL_CON0  0x4100
 #define SRC_CORE1  0x4204
 #define GATE_IP_ACP0x8800
+#define GATE_IP_ISP0   0xC800
+#define GATE_IP_ISP1   0xC804
 #define CPLL_LOCK  0x10020
 #define EPLL_LOCK  0x10030
 #define VPLL_LOCK  0x10040
@@ -37,6 +39,7 @@
 #define VPLL_CON0  0x10140
 #define GPLL_CON0  0x10150
 #define SRC_TOP0   0x10210
+#define SRC_TOP1   0x10214
 #define SRC_TOP2   0x10218
 #define SRC_TOP3   0x1021c
 #define SRC_GSCL   0x10220
@@ -100,6 +103,7 @@ static unsigned long exynos5250_clk_regs[] __initdata = {
DIV_CPU0,
SRC_CORE1,
SRC_TOP0,
+   SRC_TOP1,
SRC_TOP2,
SRC_TOP3,
SRC_GSCL,
@@ -141,6 +145,8 @@ static unsigned long exynos5250_clk_regs[] __initdata = {
PLL_DIV2_SEL,
GATE_IP_DISP1,
GATE_IP_ACP,
+   GATE_IP_ISP0,
+   GATE_IP_ISP1,
 };
 
 static int exynos5250_clk_suspend(void)
@@ -196,6 +202,7 @@ PNAME(mout_aclk200_p)   = { mout_mpll_user, 
mout_bpll_user };
 PNAME(mout_aclk200_sub_p) = { fin_pll, div_aclk200 };
 PNAME(mout_aclk266_sub_p) = { fin_pll, div_aclk266 };
 PNAME(mout_aclk333_sub_p) = { fin_pll, div_aclk333 };
+PNAME(mout_aclk400_isp_sub_p) = { fin_pll, div_aclk400_isp };
 PNAME(mout_hdmi_p) = { div_hdmi_pixel, sclk_hdmiphy };
 PNAME(mout_usb3_p) = { mout_mpll_user, mout_cpll };
 PNAME(mout_group1_p)   = { fin_pll, fin_pll, sclk_hdmi27m,
@@ -273,6 +280,7 @@ static struct samsung_mux_clock exynos5250_mux_clks[] 
__initdata = {
MUX(0, mout_aclk166, mout_aclk166_p, SRC_TOP0, 8, 1),
MUX(0, mout_aclk200, mout_aclk200_p, SRC_TOP0, 12, 1),
MUX(0, mout_aclk333, mout_aclk166_p, SRC_TOP0, 16, 1),
+   MUX(0, mout_aclk400_isp, mout_aclk200_p, SRC_TOP1, 24, 1),
 
MUX(0, mout_cpll, mout_cpll_p, SRC_TOP2, 8, 1),
MUX(0, mout_epll, mout_epll_p, SRC_TOP2, 12, 1),
@@ -319,6 +327,8 @@ static struct samsung_mux_clock exynos5250_mux_clks[] 
__initdata = {
MUX(0, mout_spi1, mout_group1_p, SRC_PERIC1, 20, 4),
MUX(0, mout_spi2, mout_group1_p, SRC_PERIC1, 24, 4),
 
+   MUX(0, mout_aclk_400_isp_sub, mout_aclk400_isp_sub_p, SRC_TOP3, 20, 
1),
+   MUX(0, mout_aclk_266_isp_sub, mout_aclk266_sub_p, SRC_TOP3, 16, 1),
/*
 * CMU_CDREX
 */
@@ -351,6 +361,7 @@ static struct samsung_div_clock exynos5250_div_clks[] 
__initdata = {
DIV(0, div_aclk200, mout_aclk200, DIV_TOP0, 12, 3),
DIV(0, div_aclk266, mout_mpll_user, DIV_TOP0, 16, 3),
DIV(0, div_aclk333, mout_aclk333, DIV_TOP0, 20, 3),
+   DIV(0, div_aclk400_isp, mout_aclk400_isp, DIV_TOP1, 20, 3),
 
DIV(0, div_aclk66_pre, mout_mpll_user, DIV_TOP1, 24, 3),
 
@@ -615,6 +626,31 @@ static struct samsung_gate_clock exynos5250_gate_clks[] 
__initdata = {
GATE(CLK_WDT, wdt, div_aclk66, GATE_IP_PERIS, 19, 0, 0),
GATE(CLK_RTC, rtc, div_aclk66, GATE_IP_PERIS, 20, 0, 0),
GATE(CLK_TMU, tmu, div_aclk66, GATE_IP_PERIS, 21, 0, 0),
+   GATE(CLK_SMMU_TV, smmu_tv, mout_aclk200_disp1_sub,
+   GATE_IP_DISP1, 2, 0, 0),
+   GATE(CLK_SMMU_FIMD1, smmu_fimd1, mout_aclk200_disp1_sub,
+   GATE_IP_DISP1, 8, 0, 0),
+   GATE(CLK_SMMU_2D, smmu_2d, div_aclk200, GATE_IP_ACP, 7, 0, 0),
+   GATE(CLK_SMMU_FIMC_ISP, smmu_fimc_isp, mout_aclk_266_isp_sub,
+   GATE_IP_ISP0, 8, 0, 0),
+   GATE(CLK_SMMU_FIMC_DRC, smmu_fimc_drc, mout_aclk_266_isp_sub,
+   GATE_IP_ISP0, 9, 0, 0),
+   GATE(CLK_SMMU_FIMC_FD, smmu_fimc_fd, mout_aclk_266_isp_sub,
+   GATE_IP_ISP0, 10, 0, 0),
+   GATE(CLK_SMMU_FIMC_SCC, smmu_fimc_scc, mout_aclk_266_isp_sub,
+   GATE_IP_ISP0, 11, 0, 0),
+   GATE(CLK_SMMU_FIMC_SCP, smmu_fimc_scp, mout_aclk_266_isp_sub,
+   GATE_IP_ISP0, 12, 0, 0),
+   GATE(CLK_SMMU_FIMC_MCU, smmu_fimc_mcu, mout_aclk_400_isp_sub,
+   GATE_IP_ISP0, 13, 0, 0),
+   GATE(CLK_SMMU_FIMC_ODC, smmu_fimc_odc, mout_aclk_266_isp_sub,
+   GATE_IP_ISP1, 4, 0, 0),
+   GATE(CLK_SMMU_FIMC_DIS0, smmu_fimc_dis0, mout_aclk_266_isp_sub,
+  

Re: [PATCH v11 20/27] iommu/exynos: allow having multiple System MMUs for a master H/W

2014-04-22 Thread Shaik Ameer Basha
Hi KyongHo Cho,



On Fri, Mar 14, 2014 at 10:40 AM, Cho KyongHo pullip@samsung.com wrote:
 Some master device descriptor like fimc-is which is an abstraction
 of very complex H/W may have multiple System MMUs. For those devices,
 the design of the link between System MMU and its master H/W is needed
 to be reconsidered.

 A link structure, sysmmu_list_data is introduced that provides a link
 to master H/W and that has a pointer to the device descriptor of a
 System MMU. Given a device descriptor of a master H/W, it is possible
 to traverse all System MMUs that must be controlled along with the
 master H/W.

 Signed-off-by: Cho KyongHo pullip@samsung.com
 ---
  drivers/iommu/exynos-iommu.c |  534 
 ++
  1 file changed, 333 insertions(+), 201 deletions(-)

 diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
 index 84ba29a..7489343 100644
 --- a/drivers/iommu/exynos-iommu.c
 +++ b/drivers/iommu/exynos-iommu.c
 @@ -128,6 +128,10 @@
  #define __master_clk_disable(data) __clk_gate_ctrl(data, clk_master, dis)


[snip]

 +static int __init __sysmmu_init_master(struct device *dev)
 +{
 +   int ret;
 +   int i = 0;
 +   struct device_node *node;
 +
 +   while ((node = of_parse_phandle(dev-of_node, mmu-masters, i++))) {
 struct platform_device *master = of_find_device_by_node(node);
 +   struct exynos_iommu_owner *owner;
 +   struct sysmmu_list_data *list_data;

 if (!master) {
 dev_err(dev, %s: mmu-master '%s' not found\n,
 __func__, node-name);
 -   return -EINVAL;
 +   ret = -EINVAL;
 +   goto err;
 }

 -   if (master-dev.archdata.iommu != NULL) {
 -   dev_err(dev, %s: '%s' is master of other MMU\n,
 -   __func__, node-name);
 -   return -EINVAL;
 +   owner = master-dev.archdata.iommu;
 +   if (!owner) {
 +   owner = devm_kzalloc(dev, sizeof(*owner), GFP_KERNEL);
 +   if (!owner) {
 +   dev_err(dev,
 +   %s: Failed to allocate owner structure\n,
 +   __func__);
 +   ret = -ENOMEM;
 +   goto err;
 +   }
 +
 +   INIT_LIST_HEAD(owner-mmu_list);
 +   INIT_LIST_HEAD(owner-client);
 +   owner-dev = master-dev;
 +   spin_lock_init(owner-lock);
 +
 +   master-dev.archdata.iommu = owner;
 }

 +   list_data = devm_kzalloc(dev, sizeof(*list_data), GFP_KERNEL);
 +   if (!list_data) {
 +   dev_err(dev,
 +   %s: Failed to allocate sysmmu_list_data\n,
 +   __func__);
 +   ret = -ENOMEM;
 +   goto err;
 +   }
 +
 +   INIT_LIST_HEAD(list_data-entry);
 +   list_data-sysmmu = dev;
 +
 /*
 -* archdata.iommu will be initialized with exynos_iommu_client
 -* in sysmmu_hook_driver_register().
 +* System MMUs are attached in the order of the presence
 +* in device tree
  */
 -   master-dev.archdata.iommu = dev;
 +   list_add_tail(list_data-entry, owner-mmu_list);
 }

 -   data-sysmmu = dev;
 -   rwlock_init(data-lock);
 +   return 0;
 +err:
 +   while ((node = of_parse_phandle(dev-of_node, mmu-masters, i++))) {

Don't we need to reinitialize variable 'i' here before using?
i = 0;

Regards,
Shaik Ameer Basha



 +   struct platform_device *master = of_find_device_by_node(node);
 +   struct exynos_iommu_owner *owner;
 +   struct sysmmu_list_data *list_data;

 -   platform_set_drvdata(pdev, data);
 +   if (!master)
 +   continue;

 -   pm_runtime_enable(dev);
 -   data-runtime_active = !pm_runtime_enabled(dev);
 +   owner = master-dev.archdata.iommu;
 +   if (!owner)
 +   continue;

 -   dev_dbg(dev, Probed and initialized\n);
 -   return 0;
 +   for_each_sysmmu_list(owner-dev, list_data) {
 +   if (list_data-sysmmu == dev) {
 +   list_del(list_data-entry);
 +   kfree(list_data);
 +   break;
 +   }
 +   }
 +   }
 +
 +   return ret;
  }


[snip]
___
iommu mailing list
iommu@lists.linux-foundation.org
https

Re: [PATCH v11 12/27] ARM: dts: Add description of System MMU of Exynos SoCs

2014-04-21 Thread Shaik Ameer Basha
 {
 +   mixer: mixer@1445 {
 compatible = samsung,exynos5420-mixer;
 reg = 0x1445 0x1;
 interrupts = 0 94 0;
 @@ -720,4 +720,205 @@
 clock-names = watchdog;
 samsung,syscon-phandle = pmu_system_controller;
  };
 +
 +   sysmmu_g2dr: sysmmu@10A6 {
 +   compatible = samsung,sysmmu-v3.2;
 +   reg = 0x10A6 0x1000;
 +   interrupt-parent = combiner;
 +   interrupts = 24 5;
 +   clock-names = sysmmu, master;
 +   clocks = clock 482, clock 481;
 +   };
 +
 +   sysmmu_g2dw: sysmmu@10A7 {
 +   compatible = samsung,sysmmu-v3.2;
 +   reg = 0x10A6 0x1000;

Duplicate sysmmu reg base address.
reg = 0x10A7 0x1000;

 +   interrupt-parent = combiner;
 +   interrupts = 22 2;
 +   clock-names = sysmmu, master;
 +   clocks = clock 482, clock 481;
 +   };
 +
 +   sysmmu_scaler0r: sysmmu@1288 {
 +   compatible = samsung,sysmmu-v3.2;
 +   reg = 0x1288 0x1000;
 +   interrupt-parent = combiner;
 +   interrupts = 22 4;
 +   clock-names = sysmmu, master;
 +   clocks = clock 384, clock 381;
 +   };
 +
 +   sysmmu_scaler1r: sysmmu@1289 {
 +   compatible = samsung,sysmmu-v3.2;
 +   reg = 0x1289 0x1000;
 +   interrupts = 0 186 0;
 +   clock-names = sysmmu, master;
 +   clocks = clock 385, clock 382;
 +   };
 +
 +   sysmmu_scaler2r: sysmmu@128A {
 +   compatible = samsung,sysmmu-v3.2;
 +   reg = 0x128A 0x1000;
 +   interrupts = 0 188 0;
 +   clock-names = sysmmu, master;
 +   clocks = clock 386, clock 383;
 +   };
 +
 +   sysmmu_scaler0w: sysmmu@128C {
 +   compatible = samsung,sysmmu-v3.2;
 +   reg = 0x128C 0x1000;
 +   interrupt-parent = combiner;
 +   interrupts = 27 2;
 +   clock-names = sysmmu, master;
 +   clocks = clock 384, clock 381;
 +   };
 +
 +   sysmmu_scaler1w: sysmmu@128D {
 +   compatible = samsung,sysmmu-v3.2;
 +   reg = 0x128D 0x1000;
 +   interrupt-parent = combiner;
 +   interrupts = 22 6;
 +   clock-names = sysmmu, master;
 +   clocks = clock 385, clock 382;
 +   };
 +
 +   sysmmu_scaler2w: sysmmu@128E {
 +   compatible = samsung,sysmmu-v3.2;
 +   reg = 0x128E 0x1000;
 +   interrupt-parent = combiner;
 +   interrupts = 19 6;
 +   clock-names = sysmmu, master;
 +   clocks = clock 386, clock 383;
 +   };
 +
 +   sysmmu_mfc_r: sysmmu@1120 {

0x1120 belongs to mfc_l
 sysmmu_mfc_l: sysmmu@1120

 +   compatible = samsung,sysmmu-v2;
 +   reg = 0x1120 0x1000;
 +   interrupt-parent = combiner;
 +   interrupts = 6 2;

interrupts = 8 5;
Add mmu-masters field,
mmu-masters = mfc;

 +   clock-names = sysmmu, master;
 +   clocks = clock 402, clock 401;

clocks = clock 403, clock 401;

 +   samsung,power-domain = mfc_pd;
 +   };
 +
 +   sysmmu_mfc_l: sysmmu@1121 {

0x1121 belongs to mfc_r
sysmmu_mfc_r: sysmmu@1121

 +   compatible = samsung,sysmmu-v2;
 +   reg = 0x1121 0x1000;
 +   interrupt-parent = combiner;
 +   interrupts = 8 5;

interrupts = 6 2;
Add mmu-masters field,
mmu-masters = mfc;

 +   clock-names = sysmmu, master;
 +   clocks = clock 403, clock 401;

clocks = clock 402, clock 401;

Regards,
Shaik Ameer Basha
___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu