Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / powerpc / include / asm / iommu.h

diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
index 7ead7c1..edfc980 100644 (file)
--- a/arch/powerpc/include/asm/iommu.h
+++ b/arch/powerpc/include/asm/iommu.h
@@ -35,16 +35,6 @@
 #define IOMMU_PAGE_MASK       (~((1 << IOMMU_PAGE_SHIFT) - 1))
 #define IOMMU_PAGE_ALIGN(addr) _ALIGN_UP(addr, IOMMU_PAGE_SIZE)
 
-/* Cell page table entries */
-#define CBE_IOPTE_PP_W         0x8000000000000000ul /* protection: write */
-#define CBE_IOPTE_PP_R         0x4000000000000000ul /* protection: read */
-#define CBE_IOPTE_M            0x2000000000000000ul /* coherency required */
-#define CBE_IOPTE_SO_R         0x1000000000000000ul /* ordering: writes */
-#define CBE_IOPTE_SO_RW                0x1800000000000000ul /* ordering: r & w */
-#define CBE_IOPTE_RPN_Mask     0x07fffffffffff000ul /* RPN */
-#define CBE_IOPTE_H            0x0000000000000800ul /* cache hint */
-#define CBE_IOPTE_IOID_Mask    0x00000000000007fful /* ioid */
-
 /* Boot time flags */
 extern int iommu_is_off;
 extern int iommu_force_on;
@@ -80,6 +70,16 @@ struct iommu_table {
 
 struct scatterlist;
 
+static inline void set_iommu_table_base(struct device *dev, void *base)
+{
+       dev->archdata.dma_data.iommu_table_base = base;
+}
+
+static inline void *get_iommu_table_base(struct device *dev)
+{
+       return dev->archdata.dma_data.iommu_table_base;
+}
+
 /* Frees table for an individual device node */
 extern void iommu_free_table(struct iommu_table *tbl, const char *node_name);