From: Khalid Aziz <khalid.aziz@oracle.com>
Date: Tue, 3 May 2016 14:12:51 +0000 (-0600)
Subject: Revert "OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource"
X-Git-Tag: v4.1.12-102.0.20170529_2200~87
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=376751bc42d826e19b56de4fc314d530bfa2c824;p=users%2Fjedix%2Flinux-maple.git

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

This reverts commit 59072574902b6e44574c34a9989ec6ec6c494f99. 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 c0691adf4a28993c77371969ff7800901ff1a67b)
Signed-off-by: Allen Pais <allen.pais@oracle.com>
---

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 33996021a1be6..384574c3987c3 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -128,10 +128,8 @@ static unsigned int of_bus_pci_get_flags(const __be32 *addr)
 		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)