Merge branch 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...

[linux-2.6-microblaze.git] / arch / powerpc / kernel / pci_of_scan.c

diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 24522aa..409c6c1 100644 (file)
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -42,6 +42,8 @@ unsigned int pci_parse_of_flags(u32 addr0, int bridge)
        if (addr0 & 0x02000000) {
                flags = IORESOURCE_MEM | PCI_BASE_ADDRESS_SPACE_MEMORY;
                flags |= (addr0 >> 22) & PCI_BASE_ADDRESS_MEM_TYPE_64;
+               if (flags & PCI_BASE_ADDRESS_MEM_TYPE_64)
+                       flags |= IORESOURCE_MEM_64;
                flags |= (addr0 >> 28) & PCI_BASE_ADDRESS_MEM_TYPE_1M;
                if (addr0 & 0x40000000)
                        flags |= IORESOURCE_PREFETCH
@@ -77,10 +79,16 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev)
        const __be32 *addrs;
        u32 i;
        int proplen;
+       bool mark_unset = false;
 
        addrs = of_get_property(node, "assigned-addresses", &proplen);
-       if (!addrs)
-               return;
+       if (!addrs || !proplen) {
+               addrs = of_get_property(node, "reg", &proplen);
+               if (!addrs || !proplen)
+                       return;
+               mark_unset = true;
+       }
+
        pr_debug("    parse addresses (%d bytes) @ %p\n", proplen, addrs);
        for (; proplen >= 20; proplen -= 20, addrs += 5) {
                flags = pci_parse_of_flags(of_read_number(addrs, 1), 0);
@@ -105,6 +113,8 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev)
                        continue;
                }
                res->flags = flags;
+               if (mark_unset)
+                       res->flags |= IORESOURCE_UNSET;
                res->name = pci_name(dev);
                region.start = base;
                region.end = base + size - 1;