iommu/pamu: Add support for generic iommu-device

This patch adds a global iommu-handle to the pamu driver and
initializes it at probe time. Also link devices added to the
iommu to this handle.

Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index 9ee8e9e161f57b693873860d4d4a81a1ca0c1e8f..9238a85de53ee17bf9f12ffe874ee63fc639efe7 100644 (file)
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -44,6 +44,8 @@ static struct paace *spaact;
 
 static bool probed;                    /* Has PAMU been probed? */
 
+struct iommu_device pamu_iommu;        /* IOMMU core code handle */
+
 /*
  * Table for matching compatible strings, for device tree
  * guts node, for QorIQ SOCs.
@@ -1154,6 +1156,18 @@ static int fsl_pamu_probe(struct platform_device *pdev)
        if (ret)
                goto error_genpool;
 
+       ret = iommu_device_sysfs_add(&pamu_iommu, dev, NULL, "iommu0");
+       if (ret)
+               goto error_genpool;
+
+       iommu_device_set_ops(&pamu_iommu, &fsl_pamu_ops);
+
+       ret = iommu_device_register(&pamu_iommu);
+       if (ret) {
+               dev_err(dev, "Can't register iommu device\n");
+               goto error_sysfs;
+       }
+
        pamubypenr = in_be32(&guts_regs->pamubypenr);
 
        for (pamu_reg_off = 0, pamu_counter = 0x80000000; pamu_reg_off < size;
@@ -1181,6 +1195,9 @@ static int fsl_pamu_probe(struct platform_device *pdev)
 
        return 0;
 
+error_sysfs:
+       iommu_device_sysfs_remove(&pamu_iommu);
+
 error_genpool:
        gen_pool_destroy(spaace_pool);
 

diff --git a/drivers/iommu/fsl_pamu.h b/drivers/iommu/fsl_pamu.h
index c3434f29c9671378281c8c87f4ca960251a6ffe6..fa48222f342122c8dc089e526d6b06cbbcba5b9c 100644 (file)
--- a/drivers/iommu/fsl_pamu.h
+++ b/drivers/iommu/fsl_pamu.h
@@ -391,6 +391,9 @@ struct ome {
 #define EOE_WWSAOL      0x1e    /* Write with stash allocate only and lock */
 #define EOE_VALID       0x80
 
+extern const struct iommu_ops fsl_pamu_ops;
+extern struct iommu_device pamu_iommu; /* IOMMU core code handle */
+
 /* Function prototypes */
 int pamu_domain_init(void);
 int pamu_enable_liodn(int liodn);

diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index da0e1e30ef378841601eab22e9e5a50c0049efc1..914953b87bf1437698f5a50bab0cfe1e976d32c4 100644 (file)
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -983,11 +983,14 @@ static int fsl_pamu_add_device(struct device *dev)
 
        iommu_group_put(group);
 
+       iommu_device_link(&pamu_iommu, dev);
+
        return 0;
 }
 
 static void fsl_pamu_remove_device(struct device *dev)
 {
+       iommu_device_unlink(&pamu_iommu, dev);
        iommu_group_remove_device(dev);
 }
 
@@ -1047,7 +1050,7 @@ static u32 fsl_pamu_get_windows(struct iommu_domain *domain)
        return dma_domain->win_cnt;
 }
 
-static const struct iommu_ops fsl_pamu_ops = {
+const struct iommu_ops fsl_pamu_ops = {
        .capable        = fsl_pamu_capable,
        .domain_alloc   = fsl_pamu_domain_alloc,
        .domain_free    = fsl_pamu_domain_free,

diff --git a/drivers/iommu/fsl_pamu_domain.h b/drivers/iommu/fsl_pamu_domain.h
index f2b0f741d3de66c6fbda832737a6e841c9c966af..6d8661e488fb19d8f046e7ee4c017b1a6d3d4858 100644 (file)
--- a/drivers/iommu/fsl_pamu_domain.h
+++ b/drivers/iommu/fsl_pamu_domain.h
@@ -21,6 +21,8 @@
 
 #include "fsl_pamu.h"
 
+const struct iommu_ops fsl_pamu_ops;
+
 struct dma_window {
        phys_addr_t paddr;
        u64 size;