Skip to content

Commit

Permalink
sparc: Revert generic IOMMU allocator.
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
davem330 committed Apr 18, 2015
1 parent 04b7fe6 commit c12f048
Show file tree
Hide file tree
Showing 8 changed files with 325 additions and 537 deletions.
7 changes: 4 additions & 3 deletions arch/sparc/include/asm/iommu_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#define IOPTE_WRITE 0x0000000000000002UL

#define IOMMU_NUM_CTXS 4096
#include <linux/iommu-common.h>

struct iommu_arena {
unsigned long *map;
Expand All @@ -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;
Expand All @@ -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 {
Expand Down
Loading

0 comments on commit c12f048

Please sign in to comment.