From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 8 Oct 2015 21:38:32 +0000 (-0700)
Subject: PCI: Add has_mem64 for struct host_bridge
X-Git-Tag: v4.1.12-92~257^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9bb848b4f153ca43e05ad976274c8281240d5adc;p=users%2Fjedix%2Flinux-maple.git

PCI: Add has_mem64 for struct host_bridge

Add has_mem64 for struct host_bridge, on root bus that does not support
mmio64 above 4g, will not set that.

We will use that info next two following patches:
1. Don't treat non-pref mmio64 as pref mmio, so will not put
   it under bridge's pref range when rescan the devices
2. will keep pref mmio64 and pref mmio32 under bridge pref bar.

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

Orabug: 21826746

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

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 502ac894ec76..7058e5539602 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2013,6 +2013,13 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
 		} else
 			bus_addr[0] = '\0';
 		dev_info(&b->dev, "root bus resource %pR%s\n", res, bus_addr);
+
+		if (resource_type(res) == IORESOURCE_MEM) {
+			if ((res->end - offset) > 0xffffffff)
+				bridge->has_mem64 = 1;
+			if ((res->start - offset) > 0xffffffff)
+				res->flags |= IORESOURCE_MEM_64;
+		}
 	}
 
 	down_write(&pci_bus_sem);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 52d8a9060ee8..5bce728c74d0 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -408,6 +408,7 @@ struct pci_host_bridge {
 	void (*release_fn)(struct pci_host_bridge *);
 	void *release_data;
 	unsigned int ignore_reset_delay:1;	/* for entire hierarchy */
+	unsigned int has_mem64:1;
 };
 
 #define	to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev)