powerpc/powernv: TCE invalidation for PHB3

The TCE should be invalidated while it's created or free'd. The
approach to do that for IODA1 and IODA2 compliant PHBs are different.
So the patch differentiate them with different functions called to
do that for IODA1 and IODA2 compliant PHBs. It's notable that the
PCI address is used to invalidate the corresponding TCE on IODA2
compliant PHB3.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 3f88c51cb95b5c518e6b03da66647b03232309ee..1c7e808a1302c91f9f8b34f4bd7e5ae2cea168bf 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -89,6 +89,7 @@ static int pnv_ioda_alloc_pe(struct pnv_phb *phb)
                        return IODA_INVALID_PE;
        } while(test_and_set_bit(pe, phb->ioda.pe_alloc));
 
+       phb->ioda.pe_array[pe].phb = phb;
        phb->ioda.pe_array[pe].pe_number = pe;
        return pe;
 }
@@ -449,6 +450,85 @@ static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, struct pci_bus *bus)
        }
 }
 
+static void pnv_pci_ioda1_tce_invalidate(struct iommu_table *tbl,
+                                        u64 *startp, u64 *endp)
+{
+       u64 __iomem *invalidate = (u64 __iomem *)tbl->it_index;
+       unsigned long start, end, inc;
+
+       start = __pa(startp);
+       end = __pa(endp);
+
+       /* BML uses this case for p6/p7/galaxy2: Shift addr and put in node */
+       if (tbl->it_busno) {
+               start <<= 12;
+               end <<= 12;
+               inc = 128 << 12;
+               start |= tbl->it_busno;
+               end |= tbl->it_busno;
+       } else if (tbl->it_type & TCE_PCI_SWINV_PAIR) {
+               /* p7ioc-style invalidation, 2 TCEs per write */
+               start |= (1ull << 63);
+               end |= (1ull << 63);
+               inc = 16;
+        } else {
+               /* Default (older HW) */
+                inc = 128;
+       }
+
+        end |= inc - 1;        /* round up end to be different than start */
+
+        mb(); /* Ensure above stores are visible */
+        while (start <= end) {
+                __raw_writeq(start, invalidate);
+                start += inc;
+        }
+
+       /*
+        * The iommu layer will do another mb() for us on build()
+        * and we don't care on free()
+        */
+}
+
+static void pnv_pci_ioda2_tce_invalidate(struct pnv_ioda_pe *pe,
+                                        struct iommu_table *tbl,
+                                        u64 *startp, u64 *endp)
+{
+       unsigned long start, end, inc;
+       u64 __iomem *invalidate = (u64 __iomem *)tbl->it_index;
+
+       /* We'll invalidate DMA address in PE scope */
+       start = 0x2ul << 60;
+       start |= (pe->pe_number & 0xFF);
+       end = start;
+
+       /* Figure out the start, end and step */
+       inc = tbl->it_offset + (((u64)startp - tbl->it_base) / sizeof(u64));
+       start |= (inc << 12);
+       inc = tbl->it_offset + (((u64)endp - tbl->it_base) / sizeof(u64));
+       end |= (inc << 12);
+       inc = (0x1ul << 12);
+       mb();
+
+       while (start <= end) {
+               __raw_writeq(start, invalidate);
+               start += inc;
+       }
+}
+
+void pnv_pci_ioda_tce_invalidate(struct iommu_table *tbl,
+                                u64 *startp, u64 *endp)
+{
+       struct pnv_ioda_pe *pe = container_of(tbl, struct pnv_ioda_pe,
+                                             tce32_table);
+       struct pnv_phb *phb = pe->phb;
+
+       if (phb->type == PNV_PHB_IODA1)
+               pnv_pci_ioda1_tce_invalidate(tbl, startp, endp);
+       else
+               pnv_pci_ioda2_tce_invalidate(pe, tbl, startp, endp);
+}
+
 static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb,
                                      struct pnv_ioda_pe *pe, unsigned int base,
                                      unsigned int segs)
@@ -520,8 +600,9 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb,
                 */
                tbl->it_busno = 0;
                tbl->it_index = (unsigned long)ioremap(be64_to_cpup(swinvp), 8);
-               tbl->it_type = TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE
-                       | TCE_PCI_SWINV_PAIR;
+               tbl->it_type = TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE;
+               if (phb->type == PNV_PHB_IODA1)
+                       tbl->it_type |= TCE_PCI_SWINV_PAIR;
        }
        iommu_init_table(tbl, phb->hose->node);
 

diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index 861e185483fe979cd173933d153eca990a355d6b..55dfca844ddf0f8f38cbb5cb1c6863b71e217110 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -329,48 +329,6 @@ struct pci_ops pnv_pci_ops = {
        .write = pnv_pci_write_config,
 };
 
-
-static void pnv_tce_invalidate(struct iommu_table *tbl,
-                              u64 *startp, u64 *endp)
-{
-       u64 __iomem *invalidate = (u64 __iomem *)tbl->it_index;
-       unsigned long start, end, inc;
-
-       start = __pa(startp);
-       end = __pa(endp);
-
-
-       /* BML uses this case for p6/p7/galaxy2: Shift addr and put in node */
-       if (tbl->it_busno) {
-               start <<= 12;
-               end <<= 12;
-               inc = 128 << 12;
-               start |= tbl->it_busno;
-               end |= tbl->it_busno;
-       }
-       /* p7ioc-style invalidation, 2 TCEs per write */
-       else if (tbl->it_type & TCE_PCI_SWINV_PAIR) {
-               start |= (1ull << 63);
-               end |= (1ull << 63);
-               inc = 16;
-       }
-       /* Default (older HW) */
-       else
-               inc = 128;
-
-       end |= inc - 1;         /* round up end to be different than start */
-
-       mb(); /* Ensure above stores are visible */
-       while (start <= end) {
-               __raw_writeq(start, invalidate);
-               start += inc;
-       }
-       /* The iommu layer will do another mb() for us on build() and
-        * we don't care on free()
-        */
-}
-
-
 static int pnv_tce_build(struct iommu_table *tbl, long index, long npages,
                         unsigned long uaddr, enum dma_data_direction direction,
                         struct dma_attrs *attrs)
@@ -395,7 +353,7 @@ static int pnv_tce_build(struct iommu_table *tbl, long index, long npages,
         * of flags if that becomes the case
         */
        if (tbl->it_type & TCE_PCI_SWINV_CREATE)
-               pnv_tce_invalidate(tbl, tces, tcep - 1);
+               pnv_pci_ioda_tce_invalidate(tbl, tces, tcep - 1);
 
        return 0;
 }
@@ -409,8 +367,8 @@ static void pnv_tce_free(struct iommu_table *tbl, long index, long npages)
        while (npages--)
                *(tcep++) = 0;
 
-       if (tbl->it_type & TCE_PCI_SWINV_FREE)
-               pnv_tce_invalidate(tbl, tces, tcep - 1);
+       if (tbl->it_type & TCE_PCI_SWINV_CREATE)
+               pnv_pci_ioda_tce_invalidate(tbl, tces, tcep - 1);
 }
 
 static unsigned long pnv_tce_get(struct iommu_table *tbl, long index)

diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index 3c552b3dd0c6cd7f6442c6855cda1ef370e1eedb..48dc4bb856a14932878f29b917b5d7551897de66 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -23,8 +23,10 @@ enum pnv_phb_model {
 #define PNV_IODA_PE_BUS_ALL    (1 << 2)        /* PE has subordinate buses     */
 
 /* Data associated with a PE, including IOMMU tracking etc.. */
+struct pnv_phb;
 struct pnv_ioda_pe {
        unsigned long           flags;
+       struct pnv_phb          *phb;
 
        /* A PE can be associated with a single device or an
         * entire bus (& children). In the former case, pdev
@@ -154,6 +156,6 @@ extern void pnv_pci_setup_iommu_table(struct iommu_table *tbl,
 extern void pnv_pci_init_p5ioc2_hub(struct device_node *np);
 extern void pnv_pci_init_ioda_hub(struct device_node *np);
 extern void pnv_pci_init_ioda2_phb(struct device_node *np);
-
-
+extern void pnv_pci_ioda_tce_invalidate(struct iommu_table *tbl,
+                                       u64 *startp, u64 *endp);
 #endif /* __POWERNV_PCI_H */