From: Yinghai Lu Date: Sat, 18 Jun 2016 02:24:52 +0000 (-0700) Subject: sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing X-Git-Tag: v4.1.12-102.0.20170529_2200~73 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c208740d3ec7cfd0bb8d555ee73462dfe4b22fe7;p=users%2Fjedix%2Flinux-maple.git sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing For device resource with PREF bit setting under bridge 64-bit pref resource, we need to make sure only set PREF for 64bit resource. so this patch set IORESOUCE_MEM_64 for 64bit resource during OF device resource flags parsing. Link: https://bugzilla.kernel.org/show_bug.cgi?id=96261 Link: https://bugzilla.kernel.org/show_bug.cgi?id=96241 Signed-off-by: Yinghai Lu Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org Tested-by: Khalid Aziz Orabug: 22855133 Signed-off-by: Khalid Aziz (cherry picked from commit 47b22604dceb59dfc1018ebd0b8def065daa27db) Signed-off-by: Allen Pais --- diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c index 185aa96fa5be4..3e9f27309643f 100644 --- a/arch/sparc/kernel/of_device_32.c +++ b/arch/sparc/kernel/of_device_32.c @@ -83,11 +83,12 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) case 0x01: flags |= IORESOURCE_IO; break; - case 0x02: /* 32 bits */ - case 0x03: /* 64 bits */ flags |= IORESOURCE_MEM; break; + case 0x03: /* 64 bits */ + flags |= IORESOURCE_MEM | IORESOURCE_MEM_64; + break; } if (w & 0x40000000) flags |= IORESOURCE_PREFETCH; diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c index 7bbdc26d95126..defee61c27e69 100644 --- a/arch/sparc/kernel/of_device_64.c +++ b/arch/sparc/kernel/of_device_64.c @@ -146,11 +146,12 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) case 0x01: flags |= IORESOURCE_IO; break; - case 0x02: /* 32 bits */ - case 0x03: /* 64 bits */ flags |= IORESOURCE_MEM; break; + case 0x03: /* 64 bits */ + flags |= IORESOURCE_MEM | IORESOURCE_MEM_64; + break; } if (w & 0x40000000) flags |= IORESOURCE_PREFETCH;