lkml.org 
[lkml]   [2016]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v13 09/16] powerpc/PCI: Keep resource idx order with bridge register number
    Date
    Same as sparc version.

    Make resource with consistent sequence
    like other arch or directly from pci_read_bridge_bases(),
    even when non-pref mmio is missing, or out of ordering in firmware reporting.

    Just hold i = 1 for non pref mmio, and i = 2 for pref mmio.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: linuxppc-dev@lists.ozlabs.org
    ---
    arch/powerpc/kernel/pci_of_scan.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
    index 526ac67..719f225 100644
    --- a/arch/powerpc/kernel/pci_of_scan.c
    +++ b/arch/powerpc/kernel/pci_of_scan.c
    @@ -252,7 +252,7 @@ void of_scan_pci_bridge(struct pci_dev *dev)
    bus->resource[i] = res;
    ++res;
    }
    - i = 1;
    + i = 3;
    for (; len >= 32; len -= 32, ranges += 8) {
    flags = pci_parse_of_flags(of_read_number(ranges, 1), 1);
    size = of_read_number(&ranges[6], 2);
    @@ -265,6 +265,12 @@ void of_scan_pci_bridge(struct pci_dev *dev)
    " for bridge %s\n", node->full_name);
    continue;
    }
    + } else if ((flags & IORESOURCE_PREFETCH) &&
    + !bus->resource[2]->flags) {
    + res = bus->resource[2];
    + } else if (((flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH)) ==
    + IORESOURCE_MEM) && !bus->resource[1]->flags) {
    + res = bus->resource[1];
    } else {
    if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) {
    printk(KERN_ERR "PCI: too many memory ranges"
    --
    2.8.3
    \
     
     \ /
      Last update: 2016-06-18 05:21    [W:4.112 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site