diff options
author | Ohad Ben-Cohen <ohad@wizery.com> | 2011-09-13 15:26:29 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-14 09:36:35 -0400 |
commit | e7f10f02efca2e4c2372bbe4b785959533819919 (patch) | |
tree | ec739418369c0fbbf0eec1871f06bf25f984d0e0 /arch/arm/plat-omap/include/plat/iommu.h | |
parent | 4f3f8d9db359bbc780d482849f2a9c8b12f910b6 (diff) |
iommu/omap: Migrate to the generic fault report mechanism
Start using the generic fault report mechanism, as provided by
the IOMMU core, and remove its now-redundant omap_iommu_set_isr API.
Currently we're only interested in letting upper layers know about the
fault, so in case the faulting device is a remote processor, they could
restart it.
Dynamic PTE/TLB loading is not supported.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/iommu.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/iommu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h index 7f1df0e18d51..a1d79ee19250 100644 --- a/arch/arm/plat-omap/include/plat/iommu.h +++ b/arch/arm/plat-omap/include/plat/iommu.h | |||
@@ -32,6 +32,7 @@ struct omap_iommu { | |||
32 | void __iomem *regbase; | 32 | void __iomem *regbase; |
33 | struct device *dev; | 33 | struct device *dev; |
34 | void *isr_priv; | 34 | void *isr_priv; |
35 | struct iommu_domain *domain; | ||
35 | 36 | ||
36 | unsigned int refcount; | 37 | unsigned int refcount; |
37 | spinlock_t iommu_lock; /* global for this whole object */ | 38 | spinlock_t iommu_lock; /* global for this whole object */ |
@@ -48,8 +49,6 @@ struct omap_iommu { | |||
48 | struct list_head mmap; | 49 | struct list_head mmap; |
49 | struct mutex mmap_lock; /* protect mmap */ | 50 | struct mutex mmap_lock; /* protect mmap */ |
50 | 51 | ||
51 | int (*isr)(struct omap_iommu *obj, u32 da, u32 iommu_errs, void *priv); | ||
52 | |||
53 | void *ctx; /* iommu context: registres saved area */ | 52 | void *ctx; /* iommu context: registres saved area */ |
54 | u32 da_start; | 53 | u32 da_start; |
55 | u32 da_end; | 54 | u32 da_end; |