powerpc/powernv: PE list based on creation order

The resource (I/O and MMIO) will be assigned on basis of PE from
top to bottom so that we can implement the trick here: the resource
that has been assigned to parent PE could be taken by child PE if
necessary.

The current implementation already has PE list per PHB basis, but
the list doesn't meet our requirment: tracing PE based on their
cration time from top to bottom. So the patch does rename for the
DMA based PE list and introduces the list to trace the PEs sequentially
based on their creation time.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Reviewed-by: Ram Pai <linuxram@us.ibm.com>
Reviewed-by: Richard Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 0ddc2e5235d6..7999da1e0b11 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -656,13 +656,13 @@ static void __devinit pnv_ioda_link_pe_by_weight(struct pnv_phb *phb,
 {
         struct pnv_ioda_pe *lpe;
 
-        list_for_each_entry(lpe, &phb->ioda.pe_list, link) {
+        list_for_each_entry(lpe, &phb->ioda.pe_dma_list, dma_link) {
                 if (lpe->dma_weight < pe->dma_weight) {
-                        list_add_tail(&pe->link, &lpe->link);
+                        list_add_tail(&pe->dma_link, &lpe->dma_link);
                         return;
                 }
         }
-        list_add_tail(&pe->link, &phb->ioda.pe_list);
+        list_add_tail(&pe->dma_link, &phb->ioda.pe_dma_list);
 }
 
 static unsigned int pnv_ioda_dma_weight(struct pci_dev *dev)
@@ -828,6 +828,9 @@ static void __devinit pnv_ioda_setup_bus_PE(struct pci_bus *bus, int all)
         /* Associate it with all child devices */
         pnv_ioda_setup_same_PE(bus, pe);
 
+        /* Put PE to the list */
+        list_add_tail(&pe->list, &phb->ioda.pe_list);
+
         /* Account for one DMA PE if at least one DMA capable device exist
          * below the bridge
          */
@@ -1011,7 +1014,7 @@ static void __devinit pnv_ioda_setup_dma(struct pnv_phb *phb)
         remaining = phb->ioda.tce32_count;
         tw = phb->ioda.dma_weight;
         base = 0;
-        list_for_each_entry(pe, &phb->ioda.pe_list, link) {
+        list_for_each_entry(pe, &phb->ioda.pe_dma_list, dma_link) {
                 if (!pe->dma_weight)
                         continue;
                 if (!remaining) {
@@ -1305,6 +1308,7 @@ void __init pnv_pci_init_ioda1_phb(struct device_node *np)
         phb->ioda.pe_array = aux + pemap_off;
         set_bit(0, phb->ioda.pe_alloc);
 
+        INIT_LIST_HEAD(&phb->ioda.pe_dma_list);
         INIT_LIST_HEAD(&phb->ioda.pe_list);
 
         /* Calculate how many 32-bit TCE segments we have */