summaryrefslogtreecommitdiff
path: root/arch/sparc/include/asm/iommu_64.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-04-18 22:31:25 +0300
committerDavid S. Miller <davem@davemloft.net>2015-04-18 22:31:25 +0300
commitc12f048ffdf3a5802239426dc290290929268dc9 (patch)
tree89fa401142c58061744653492ca8b720d5b2d7b5 /arch/sparc/include/asm/iommu_64.h
parent04b7fe6a4a231871ef681bc95e08fe66992f7b1f (diff)
downloadlinux-c12f048ffdf3a5802239426dc290290929268dc9.tar.xz
sparc: Revert generic IOMMU allocator.
I applied the wrong version of this patch series, V4 instead of V10, due to a patchwork bundling snafu. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/iommu_64.h')
-rw-r--r--arch/sparc/include/asm/iommu_64.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/iommu_64.h b/arch/sparc/include/asm/iommu_64.h
index e3cd4493d81d..2b9321ab064d 100644
--- a/arch/sparc/include/asm/iommu_64.h
+++ b/arch/sparc/include/asm/iommu_64.h
@@ -16,7 +16,6 @@
#define IOPTE_WRITE 0x0000000000000002UL
#define IOMMU_NUM_CTXS 4096
-#include <linux/iommu-common.h>
struct iommu_arena {
unsigned long *map;
@@ -25,10 +24,11 @@ struct iommu_arena {
};
struct iommu {
- struct iommu_table tbl;
spinlock_t lock;
- u32 dma_addr_mask;
+ struct iommu_arena arena;
+ void (*flush_all)(struct iommu *);
iopte_t *page_table;
+ u32 page_table_map_base;
unsigned long iommu_control;
unsigned long iommu_tsbbase;
unsigned long iommu_flush;
@@ -40,6 +40,7 @@ struct iommu {
unsigned long dummy_page_pa;
unsigned long ctx_lowest_free;
DECLARE_BITMAP(ctx_bitmap, IOMMU_NUM_CTXS);
+ u32 dma_addr_mask;
};
struct strbuf {