AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

iommu/pamu: Add support for generic iommu-device

Browse Source 
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>
This commit is contained in:
Joerg Roedel 2017-08-09 16:36:00 +02:00
parent 07eb6fdf49
commit 68a17f0be6
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/iommu/fsl_pamu.c
View File

@ -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);

3
drivers/iommu/fsl_pamu.h
View File

@ -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);

5
drivers/iommu/fsl_pamu_domain.c
View File

@ -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,

2
drivers/iommu/fsl_pamu_domain.h
View File

@ -21,6 +21,8 @@
#include "fsl_pamu.h"
const struct iommu_ops fsl_pamu_ops;
struct dma_window {
phys_addr_t paddr;
u64 size;