From: Khalid Aziz Date: Tue, 3 May 2016 14:13:54 +0000 (-0600) Subject: Revert "sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing" X-Git-Tag: v4.1.12-102.0.20170529_2200~84 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b85bf90a15bfe7aed15dd18f5e9465655e55e4e6;p=users%2Fjedix%2Flinux-maple.git 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 (cherry picked from commit b2fd930d3e95db05979aefc42291be1f6ba2c625) Signed-off-by: Allen Pais --- diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c index 3e9f27309643f..185aa96fa5be4 100644 --- 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 defee61c27e69..7bbdc26d95126 100644 --- 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)