From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 8 Oct 2015 21:38:33 +0000 (-0700)
Subject: PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64
X-Git-Tag: v4.1.12-92~257^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d39428713e56e17b1558a1b69828e514b29b18e5;p=users%2Fjedix%2Flinux-maple.git

PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64

If host bridge does not have mmio64 above 4G, We don't need to
treat device non-pref mmio64 as as pref mmio64.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

Orabug: 21826746

Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
(cherry picked from commit 7d9d19e4847c249d5eecd6f6e1316e86e597db24)
---

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index b1e4595ba934..95d18ef267e1 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -742,7 +742,7 @@ int pci_claim_bridge_resource(struct pci_dev *bridge, int i)
 static bool pci_up_path_over_pref_mem64(struct pci_bus *bus)
 {
 	if (pci_is_root_bus(bus))
-		return true;
+		return to_pci_host_bridge(bus->bridge)->has_mem64;
 
 	if (bus->self) {
 		int i;