powerpc/powernv: Reserve M64 PEs based on BARs

On PHB3, some PEs might be reserved in advance to reflect the M64
segments consumed by those PEs. We're reserving PEs based on the
M64 window of root port, which might contain VF BAR. The PEs for
VFs are allocated dynamically, not reserved based on the consumed
M64 segments. So the M64 window of root port isn't reliable for
the task. Instead, we go through M64 BARs (VF BARs excluded) of
PCI devices under the specified root bus and reserve PEs accordingly,
as the patch does.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 4775f9544f5cca5bc27d7dec3de82145275d96f3..51a4dfe588d2a5e0be02a759ef6b13f637a31903 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -229,32 +229,48 @@ fail:
        return -EIO;
 }
 
-static void pnv_ioda2_reserve_m64_pe(struct pnv_phb *phb)
+static void pnv_ioda2_reserve_dev_m64_pe(struct pci_dev *pdev,
+                                        unsigned long *pe_bitmap)
 {
-       resource_size_t sgsz = phb->ioda.m64_segsize;
-       struct pci_dev *pdev;
+       struct pci_controller *hose = pci_bus_to_host(pdev->bus);
+       struct pnv_phb *phb = hose->private_data;
        struct resource *r;
-       int base, step, i;
-
-       /*
-        * Root bus always has full M64 range and root port has
-        * M64 range used in reality. So we're checking root port
-        * instead of root bus.
-        */
-       list_for_each_entry(pdev, &phb->hose->bus->devices, bus_list) {
-               for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
-                       r = &pdev->resource[PCI_BRIDGE_RESOURCES + i];
-                       if (!r->parent ||
-                           !pnv_pci_is_mem_pref_64(r->flags))
-                               continue;
+       resource_size_t base, sgsz, start, end;
+       int segno, i;
+
+       base = phb->ioda.m64_base;
+       sgsz = phb->ioda.m64_segsize;
+       for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
+               r = &pdev->resource[i];
+               if (!r->parent || !pnv_pci_is_mem_pref_64(r->flags))
+                       continue;
 
-                       base = (r->start - phb->ioda.m64_base) / sgsz;
-                       for (step = 0; step < resource_size(r) / sgsz; step++)
-                               pnv_ioda_reserve_pe(phb, base + step);
+               start = _ALIGN_DOWN(r->start - base, sgsz);
+               end = _ALIGN_UP(r->end - base, sgsz);
+               for (segno = start / sgsz; segno < end / sgsz; segno++) {
+                       if (pe_bitmap)
+                               set_bit(segno, pe_bitmap);
+                       else
+                               pnv_ioda_reserve_pe(phb, segno);
                }
        }
 }
 
+static void pnv_ioda2_reserve_m64_pe(struct pci_bus *bus,
+                                    unsigned long *pe_bitmap,
+                                    bool all)
+{
+       struct pci_dev *pdev;
+
+       list_for_each_entry(pdev, &bus->devices, bus_list) {
+               pnv_ioda2_reserve_dev_m64_pe(pdev, pe_bitmap);
+
+               if (all && pdev->subordinate)
+                       pnv_ioda2_reserve_m64_pe(pdev->subordinate,
+                                                pe_bitmap, all);
+       }
+}
+
 static int pnv_ioda2_pick_m64_pe(struct pnv_phb *phb,
                                 struct pci_bus *bus, int all)
 {
@@ -1145,7 +1161,7 @@ static void pnv_pci_ioda_setup_PEs(void)
 
                /* M64 layout might affect PE allocation */
                if (phb->reserve_m64_pe)
-                       phb->reserve_m64_pe(phb);
+                       phb->reserve_m64_pe(hose->bus, NULL, true);
 
                pnv_ioda_setup_PEs(hose->bus);
        }

diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index 8ef2d28aded0f6ebda3a0d9f767726927817dac5..c6ddd18841b4e1ec1dbeab22529f0b4451084157 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -110,7 +110,8 @@ struct pnv_phb {
        void (*fixup_phb)(struct pci_controller *hose);
        u32 (*bdfn_to_pe)(struct pnv_phb *phb, struct pci_bus *bus, u32 devfn);
        int (*init_m64)(struct pnv_phb *phb);
-       void (*reserve_m64_pe)(struct pnv_phb *phb);
+       void (*reserve_m64_pe)(struct pci_bus *bus,
+                              unsigned long *pe_bitmap, bool all);
        int (*pick_m64_pe)(struct pnv_phb *phb, struct pci_bus *bus, int all);
        int (*get_pe_state)(struct pnv_phb *phb, int pe_no);
        void (*freeze_pe)(struct pnv_phb *phb, int pe_no);