vserver 1.9.3

[linux-2.6.git] / arch / sparc64 / kernel / pci_iommu.c

diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c
index cca82a1..94a5298 100644 (file)
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
@@ -56,6 +56,39 @@ static void __iommu_flushall(struct pci_iommu *iommu)
        }
 }
 
+#define IOPTE_CONSISTENT(CTX) \
+       (IOPTE_VALID | IOPTE_CACHE | \
+        (((CTX) << 47) & IOPTE_CONTEXT))
+
+#define IOPTE_STREAMING(CTX) \
+       (IOPTE_CONSISTENT(CTX) | IOPTE_STBUF)
+
+/* Existing mappings are never marked invalid, instead they
+ * are pointed to a dummy page.
+ */
+#define IOPTE_IS_DUMMY(iommu, iopte)   \
+       ((iopte_val(*iopte) & IOPTE_PAGE) == (iommu)->dummy_page_pa)
+
+static void inline iopte_make_dummy(struct pci_iommu *iommu, iopte_t *iopte)
+{
+       unsigned long val = iopte_val(*iopte);
+
+       val &= ~IOPTE_PAGE;
+       val |= iommu->dummy_page_pa;
+
+       iopte_val(*iopte) = val;
+}
+
+void pci_iommu_table_init(struct pci_iommu *iommu, int tsbsize)
+{
+       int i;
+
+       tsbsize /= sizeof(iopte_t);
+
+       for (i = 0; i < tsbsize; i++)
+               iopte_make_dummy(iommu, &iommu->page_table[i]);
+}
+
 static iopte_t *alloc_streaming_cluster(struct pci_iommu *iommu, unsigned long npages)
 {
        iopte_t *iopte, *limit, *first;
@@ -79,7 +112,7 @@ static iopte_t *alloc_streaming_cluster(struct pci_iommu *iommu, unsigned long n
        
        first = iopte;
        for (;;) {
-               if (iopte_val(*iopte) == 0UL) {
+               if (IOPTE_IS_DUMMY(iommu, iopte)) {
                        if ((iopte + (1 << cnum)) >= limit)
                                ent = 0;
                        else
@@ -142,12 +175,12 @@ static iopte_t *alloc_consistent_cluster(struct pci_iommu *iommu, unsigned long
        iopte = iommu->page_table + (1 << (iommu->page_table_sz_bits - PBM_LOGCLUSTERS));
        while (iopte > iommu->page_table) {
                iopte--;
-               if (!(iopte_val(*iopte) & IOPTE_VALID)) {
+               if (IOPTE_IS_DUMMY(iommu, iopte)) {
                        unsigned long tmp = npages;
 
                        while (--tmp) {
                                iopte--;
-                               if (iopte_val(*iopte) & IOPTE_VALID)
+                               if (!IOPTE_IS_DUMMY(iommu, iopte))
                                        break;
                        }
                        if (tmp == 0) {
@@ -162,15 +195,6 @@ static iopte_t *alloc_consistent_cluster(struct pci_iommu *iommu, unsigned long
        return NULL;
 }
 
-#define IOPTE_CONSISTENT(CTX) \
-       (IOPTE_VALID | IOPTE_CACHE | \
-        (((CTX) << 47) & IOPTE_CONTEXT))
-
-#define IOPTE_STREAMING(CTX) \
-       (IOPTE_CONSISTENT(CTX) | IOPTE_STBUF)
-
-#define IOPTE_INVALID  0UL
-
 /* Allocate and map kernel buffer of size SIZE using consistent mode
  * DMA for PCI device PDEV.  Return non-NULL cpu-side address if
  * successful and set *DMA_ADDRP to the PCI side dma address.
@@ -261,7 +285,7 @@ void pci_free_consistent(struct pci_dev *pdev, size_t size, void *cpu, dma_addr_
                limit = (iommu->page_table +
                         (1 << (iommu->page_table_sz_bits - PBM_LOGCLUSTERS)));
                while (walk < limit) {
-                       if (iopte_val(*walk) != IOPTE_INVALID)
+                       if (!IOPTE_IS_DUMMY(iommu, walk))
                                break;
                        walk++;
                }
@@ -280,7 +304,7 @@ void pci_free_consistent(struct pci_dev *pdev, size_t size, void *cpu, dma_addr_
                ctx = (iopte_val(*iopte) & IOPTE_CONTEXT) >> 47UL;
 
        for (i = 0; i < npages; i++, iopte++)
-               iopte_val(*iopte) = IOPTE_INVALID;
+               iopte_make_dummy(iommu, iopte);
 
        if (iommu->iommu_ctxflush) {
                pci_iommu_write(iommu->iommu_ctxflush, ctx);
@@ -376,7 +400,7 @@ void pci_unmap_single(struct pci_dev *pdev, dma_addr_t bus_addr, size_t sz, int
        base = iommu->page_table +
                ((bus_addr - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
 #ifdef DEBUG_PCI_IOMMU
-       if (iopte_val(*base) == IOPTE_INVALID)
+       if (IOPTE_IS_DUMMY(iommu, base))
                printk("pci_unmap_single called on non-mapped region %08x,%08x from %016lx\n",
                       bus_addr, sz, __builtin_return_address(0));
 #endif
@@ -415,7 +439,7 @@ void pci_unmap_single(struct pci_dev *pdev, dma_addr_t bus_addr, size_t sz, int
        }
 
        /* Step 2: Clear out first TSB entry. */
-       iopte_val(*base) = IOPTE_INVALID;
+       iopte_make_dummy(iommu, base);
 
        free_streaming_cluster(iommu, bus_addr - iommu->page_table_map_base,
                               npages, ctx);
@@ -611,7 +635,7 @@ void pci_unmap_sg(struct pci_dev *pdev, struct scatterlist *sglist, int nelems,
                ((bus_addr - iommu->page_table_map_base) >> IO_PAGE_SHIFT);
 
 #ifdef DEBUG_PCI_IOMMU
-       if (iopte_val(*base) == IOPTE_INVALID)
+       if (IOPTE_IS_DUMMY(iommu, base))
                printk("pci_unmap_sg called on non-mapped region %016lx,%d from %016lx\n", sglist->dma_address, nelems, __builtin_return_address(0));
 #endif
 
@@ -648,7 +672,7 @@ void pci_unmap_sg(struct pci_dev *pdev, struct scatterlist *sglist, int nelems,
        }
 
        /* Step 2: Clear out first TSB entry. */
-       iopte_val(*base) = IOPTE_INVALID;
+       iopte_make_dummy(iommu, base);
 
        free_streaming_cluster(iommu, bus_addr - iommu->page_table_map_base,
                               npages, ctx);