From: Khalid Aziz <khalid.aziz@oracle.com>
Date: Tue, 3 May 2016 14:04:04 +0000 (-0600)
Subject: Revert "PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64"
X-Git-Tag: v4.1.12-102.0.20170529_2200~91
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=df0a772aa4b9252b7e4b46745ae4e9141b957191;p=users%2Fjedix%2Flinux-maple.git

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

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

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 95d18ef267e10..b1e4595ba9348 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 to_pci_host_bridge(bus->bridge)->has_mem64;
+		return true;
 
 	if (bus->self) {
 		int i;