From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
Taku Izumi <izumi.taku@jp.fujitsu.com>,
Jiang Liu <jiang.liu@huawei.com>, x86 <x86@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH part3 03/11] PCI: pci_bus_size_bridges() should not size own bridge
Date: Sun, 2 Sep 2012 14:52:13 -0700 [thread overview]
Message-ID: <1346622741-30799-4-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1346622741-30799-1-git-send-email-yinghai@kernel.org>
During checking acpiphp code, found following sequence:
pci_bus_size_bridges(bus);
pci_bus_assign_resources(bus);
pci_enable_bridges(bus);
The problem is that when bus is not root bus, pci_bus_size_bridges would also size
own pci bridge bus->self if that bridge resource is not inserted before.
but later pci_bus_assign_resources will not allocate those size bridge res.
So try make it less confusing, let it does not include self sizing.
and add with_self parameter info __pci_bus_size_bridge()
Fixes caller in pci hotplug componets.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/hotplug/acpiphp_glue.c | 3 ++-
drivers/pci/setup-bus.c | 24 +++++++++++++++---------
include/linux/pci.h | 1 +
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 085eec7..6cb1923 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -842,7 +842,8 @@ static int __ref enable_device(struct acpiphp_slot *slot)
max = pci_scan_bridge(bus, dev, max, pass);
if (pass && dev->subordinate) {
check_hotplug_bridge(slot, dev);
- pci_bus_size_bridges(dev->subordinate);
+ pci_bus_size_bridges_with_self(
+ dev->subordinate);
}
}
}
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 1dc22b3..70d6292 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1005,8 +1005,8 @@ handle_done:
;
}
-void __ref __pci_bus_size_bridges(struct pci_bus *bus,
- struct list_head *realloc_head)
+static void __ref __pci_bus_size_bridges(struct pci_bus *bus,
+ struct list_head *realloc_head, bool with_self)
{
struct pci_dev *dev;
unsigned long mask, prefmask;
@@ -1024,13 +1024,13 @@ void __ref __pci_bus_size_bridges(struct pci_bus *bus,
case PCI_CLASS_BRIDGE_PCI:
default:
- __pci_bus_size_bridges(b, realloc_head);
+ __pci_bus_size_bridges(b, realloc_head, true);
break;
}
}
- /* The root bus? */
- if (!bus->self)
+ /* Is root bus or not wanted? */
+ if (!bus->self || !with_self)
return;
switch (bus->self->class >> 8) {
@@ -1070,9 +1070,15 @@ void __ref __pci_bus_size_bridges(struct pci_bus *bus,
}
}
+void __ref pci_bus_size_bridges_with_self(struct pci_bus *bus)
+{
+ __pci_bus_size_bridges(bus, NULL, true);
+}
+EXPORT_SYMBOL(pci_bus_size_bridges_with_self);
+
void __ref pci_bus_size_bridges(struct pci_bus *bus)
{
- __pci_bus_size_bridges(bus, NULL);
+ __pci_bus_size_bridges(bus, NULL, false);
}
EXPORT_SYMBOL(pci_bus_size_bridges);
@@ -1385,7 +1391,7 @@ again:
/* Depth first, calculate sizes and alignments of all
subordinate buses. */
list_for_each_entry(bus, &pci_root_buses, node)
- __pci_bus_size_bridges(bus, add_list);
+ __pci_bus_size_bridges(bus, add_list, false);
/* Depth last, allocate resources and update the hardware. */
list_for_each_entry(bus, &pci_root_buses, node)
@@ -1462,7 +1468,7 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
IORESOURCE_PREFETCH;
again:
- __pci_bus_size_bridges(parent, &add_list);
+ __pci_bus_size_bridges(parent, &add_list, true);
__pci_bridge_assign_resources(bridge, &add_list, &fail_head);
BUG_ON(!list_empty(&add_list));
tried_times++;
@@ -1523,7 +1529,7 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
if (dev->subordinate)
__pci_bus_size_bridges(dev->subordinate,
- &add_list);
+ &add_list, true);
up_read(&pci_bus_sem);
__pci_bus_assign_resources(bus, &add_list, NULL);
BUG_ON(!list_empty(&add_list));
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1bd7559..f994e93 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -980,6 +980,7 @@ int pci_vpd_truncate(struct pci_dev *dev, size_t size);
resource_size_t pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx);
void pci_bus_assign_resources(const struct pci_bus *bus);
void pci_bus_size_bridges(struct pci_bus *bus);
+void pci_bus_size_bridges_with_self(struct pci_bus *bus);
int pci_claim_resource(struct pci_dev *, int);
void pci_assign_unassigned_resources(void);
void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge);
--
1.7.7
next prev parent reply other threads:[~2012-09-02 21:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-02 21:52 [PATCH part3 00/11] PCI, x86: pci root bus hotplug support - part3 Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 01/11] PCI: Separate out pci_assign_unassigned_bus_resources() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 02/11] PCI: Move back pci_rescan_bus() to probe.c Yinghai Lu
2012-09-02 21:52 ` Yinghai Lu [this message]
2012-09-02 21:52 ` [PATCH part3 04/11] PCI: Use __pci_bus_size_bridges() directly in pci_assign_unassigned_bus_resources() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 05/11] PCI, sysfs: Use device_type and attr_groups with pci dev Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 06/11] PCI, sysfs: Create rescan_bridge under /sys/.../pci/devices/... for pci bridges Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 07/11] PCI: Add pci_bus_add_single_device() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 08/11] PCI: Make pci_rescan_bus_bridge_resize() use pci_scan_bridge Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 09/11] PCI: Clean up rescan_bus_bridge_resize() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 10/11] PCI: Rescan bus or bridge using callback method too Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 11/11] PCI, sysfs: Clean up rescan/remove with scheule_callback Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346622741-30799-4-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=izumi.taku@jp.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).