From fd00137026925c981caea6a75c7af71e4ec224c7 Mon Sep 17 00:00:00 2001
From: Felix Radensky <felix@embedded-sol.com>
Date: Sun, 28 Mar 2010 16:02:02 +0300
Subject: [PATCH] --- yaml --- r: 197927 b: refs/heads/master c:
 3322340a9db2251ac9d09bc7b8d49e872298ae95 h: refs/heads/master i:   197925:
 089c38c6e433f6ef6b12f4af5efa424f8c02fec5   197923:
 13bace20c8868ccf226edf75aa34377043b7b9c5   197919:
 4c1c99632228396d4ed913b653b68440c393f8f1 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/pci/quirks.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 670bd18550ed..fe5ca5f3df99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a02ce953a14d6a8aab721b129b3c8ff4981a76e6
+refs/heads/master: 3322340a9db2251ac9d09bc7b8d49e872298ae95
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index e5861d5a2e4d..b7512cf08c58 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -2554,6 +2554,19 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
 
 #endif	/* CONFIG_PCI_IOV */
 
+/* Allow manual resource allocation for PCI hotplug bridges
+ * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For
+ * some PCI-PCI hotplug bridges, like PLX 6254 (former HINT HB6),
+ * kernel fails to allocate resources when hotplug device is 
+ * inserted and PCI bus is rescanned.
+ */
+static void __devinit quirk_hotplug_bridge(struct pci_dev *dev)
+{
+	dev->is_hotplug_bridge = 1;
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
+
 /*
  * This is a quirk for the Ricoh MMC controller found as a part of
  * some mulifunction chips.