powerpc/powernv/pci: Move tce size parsing to pci-ioda-tce.c

Move it in with the rest of the TCE wrangling rather than carting around
a static prototype in pci-ioda.c

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200406030745.24595-7-oohall@gmail.com

diff --git a/arch/powerpc/platforms/powernv/pci-ioda-tce.c b/arch/powerpc/platforms/powernv/pci-ioda-tce.c
index 5dc6847d5f4c84468d89010a392861fd046b70ae..f923359d8afc9ac9ff37aeacb2eb18928db4b9e9 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda-tce.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda-tce.c
@@ -17,6 +17,34 @@
 #include <asm/tce.h>
 #include "pci.h"
 
+unsigned long pnv_ioda_parse_tce_sizes(struct pnv_phb *phb)
+{
+       struct pci_controller *hose = phb->hose;
+       struct device_node *dn = hose->dn;
+       unsigned long mask = 0;
+       int i, rc, count;
+       u32 val;
+
+       count = of_property_count_u32_elems(dn, "ibm,supported-tce-sizes");
+       if (count <= 0) {
+               mask = SZ_4K | SZ_64K;
+               /* Add 16M for POWER8 by default */
+               if (cpu_has_feature(CPU_FTR_ARCH_207S) &&
+                               !cpu_has_feature(CPU_FTR_ARCH_300))
+                       mask |= SZ_16M | SZ_256M;
+               return mask;
+       }
+
+       for (i = 0; i < count; i++) {
+               rc = of_property_read_u32_index(dn, "ibm,supported-tce-sizes",
+                                               i, &val);
+               if (rc == 0)
+                       mask |= 1ULL << val;
+       }
+
+       return mask;
+}
+
 void pnv_pci_setup_iommu_table(struct iommu_table *tbl,
                void *tce_mem, u64 tce_size,
                u64 dma_offset, unsigned int page_shift)

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 7547789598b91f67803dcb4aa4e79031306c0e16..1fc4980e377673f23d9542480204f1f7692c2580 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -2585,8 +2585,6 @@ static struct iommu_table_group_ops pnv_pci_ioda2_ops = {
        .release_ownership = pnv_ioda2_release_ownership,
 };
 
-static unsigned long pnv_ioda_parse_tce_sizes(struct pnv_phb *phb);
-
 static void pnv_pci_ioda_setup_iommu_api(void)
 {
        struct pci_controller *hose;
@@ -2638,34 +2636,6 @@ static void pnv_pci_ioda_setup_iommu_api(void)
 static void pnv_pci_ioda_setup_iommu_api(void) { };
 #endif
 
-static unsigned long pnv_ioda_parse_tce_sizes(struct pnv_phb *phb)
-{
-       struct pci_controller *hose = phb->hose;
-       struct device_node *dn = hose->dn;
-       unsigned long mask = 0;
-       int i, rc, count;
-       u32 val;
-
-       count = of_property_count_u32_elems(dn, "ibm,supported-tce-sizes");
-       if (count <= 0) {
-               mask = SZ_4K | SZ_64K;
-               /* Add 16M for POWER8 by default */
-               if (cpu_has_feature(CPU_FTR_ARCH_207S) &&
-                               !cpu_has_feature(CPU_FTR_ARCH_300))
-                       mask |= SZ_16M | SZ_256M;
-               return mask;
-       }
-
-       for (i = 0; i < count; i++) {
-               rc = of_property_read_u32_index(dn, "ibm,supported-tce-sizes",
-                                               i, &val);
-               if (rc == 0)
-                       mask |= 1ULL << val;
-       }
-
-       return mask;
-}
-
 static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
                                       struct pnv_ioda_pe *pe)
 {

diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index d3bbdeab3a32b0f968b923560ae30f25e3f386c5..0c5845a1f05d4b2b90fee99469ee4bdbc81498dd 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -244,4 +244,6 @@ extern void pnv_pci_setup_iommu_table(struct iommu_table *tbl,
                void *tce_mem, u64 tce_size,
                u64 dma_offset, unsigned int page_shift);
 
+extern unsigned long pnv_ioda_parse_tce_sizes(struct pnv_phb *phb);
+
 #endif /* __POWERNV_PCI_H */