Revert "sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing"

This reverts commit 9594d268aa40997f3a47e5a8c64463f32db226ff. This
commit causes hotplug to break as documented in Orabug 22855133.

Orabug: 22855133

Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
(cherry picked from commit b2fd930d3e95db05979aefc42291be1f6ba2c625)
Signed-off-by: Allen Pais <allen.pais@oracle.com>

diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 3e9f27309643ff1f52f7dd35a36bfea09679fd6e..185aa96fa5be442922d6f1259af4f5493def8f57 100644 (file)
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -83,11 +83,10 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
        case 0x01:
                flags |= IORESOURCE_IO;
                break;
+
        case 0x02: /* 32 bits */
-               flags |= IORESOURCE_MEM;
-               break;
        case 0x03: /* 64 bits */
-               flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
+               flags |= IORESOURCE_MEM;
                break;
        }
        if (w & 0x40000000)

diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index defee61c27e695cf8b776b97efbe22b4276af8e5..7bbdc26d95126e6ca56c946c8b4f1b59eb7ea256 100644 (file)
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -146,11 +146,10 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
        case 0x01:
                flags |= IORESOURCE_IO;
                break;
+
        case 0x02: /* 32 bits */
-               flags |= IORESOURCE_MEM;
-               break;
        case 0x03: /* 64 bits */
-               flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
+               flags |= IORESOURCE_MEM;
                break;
        }
        if (w & 0x40000000)