From: Yinghai Lu <yinghai@kernel.org>
Date: Sat, 18 Jun 2016 02:24:56 +0000 (-0700)
Subject: OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource
X-Git-Tag: v4.1.12-102.0.20170529_2200~71
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0dea39c98dd94a39dc864415bcb7292774041a29;p=users%2Fjedix%2Flinux-maple.git

OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource

For device resource PREF bit setting under bridge 64-bit pref resource,
we need to make sure only set PREF for 64bit resource.

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 <yinghai@kernel.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Tested-by: Khalid Aziz <khalid.aziz@oracle.com>

Orabug: 22855133

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

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