From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Ram Pai <linuxram@us.ibm.com>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
linux-pci@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 3/5] PCI: Using add_list in pcie hotplug path.
Date: Wed, 7 Dec 2011 00:53:02 -0800 [thread overview]
Message-ID: <1323247984-15281-4-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1323247984-15281-1-git-send-email-yinghai@kernel.org>
We need add size for hot plug path when pluging in hotplug chassis without cards.
-v2: change descriptions. make it can be applied after
pci: Check bridge resources after resource allocation.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/setup-bus.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -327,13 +327,14 @@ requested_and_reassign:
}
static void pdev_assign_resources_sorted(struct pci_dev *dev,
+ struct resource_list_x *add_head,
struct resource_list_x *fail_head)
{
struct resource_list head;
head.next = NULL;
__dev_sort_resources(dev, &head);
- __assign_resources_sorted(&head, NULL, fail_head);
+ __assign_resources_sorted(&head, add_head, fail_head);
}
@@ -1003,17 +1004,19 @@ void __ref pci_bus_assign_resources(cons
EXPORT_SYMBOL(pci_bus_assign_resources);
static void __ref __pci_bridge_assign_resources(const struct pci_dev *bridge,
+ struct resource_list_x *add_head,
struct resource_list_x *fail_head)
{
struct pci_bus *b;
- pdev_assign_resources_sorted((struct pci_dev *)bridge, fail_head);
+ pdev_assign_resources_sorted((struct pci_dev *)bridge,
+ add_head, fail_head);
b = bridge->subordinate;
if (!b)
return;
- __pci_bus_assign_resources(b, NULL, fail_head);
+ __pci_bus_assign_resources(b, add_head, fail_head);
switch (bridge->class >> 8) {
case PCI_CLASS_BRIDGE_PCI:
@@ -1288,6 +1291,8 @@ enable_and_dump:
void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
{
struct pci_bus *parent = bridge->subordinate;
+ struct resource_list_x add_list; /* list of resources that
+ want additional resources */
int tried_times = 0;
struct resource_list_x head, *list;
int retval;
@@ -1295,11 +1300,12 @@ void pci_assign_unassigned_bridge_resour
IORESOURCE_PREFETCH;
head.next = NULL;
+ add_list.next = NULL;
again:
- pci_bus_size_bridges(parent);
- __pci_bridge_assign_resources(bridge, &head);
-
+ __pci_bus_size_bridges(parent, &add_list);
+ __pci_bridge_assign_resources(bridge, &add_list, &head);
+ BUG_ON(add_list.next);
tried_times++;
if (!head.next)
next prev parent reply other threads:[~2011-12-07 8:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-07 8:52 [PATCH 0/5] PCI: make pci hotplug/rescan path to handle add_size list Yinghai Lu
2011-12-07 8:53 ` [PATCH 1/5] PCI : Calculate right add_size Yinghai Lu
2012-01-06 21:14 ` Jesse Barnes
2012-01-07 1:21 ` Yinghai Lu
2011-12-07 8:53 ` [PATCH 2/5] PCI: Try to assign required+option size at first Yinghai Lu
2012-01-06 21:49 ` Jesse Barnes
2012-01-07 3:46 ` Yinghai Lu
2012-01-07 5:51 ` Yinghai Lu
2012-01-07 5:53 ` Yinghai Lu
2012-01-07 6:12 ` Yinghai Lu
2012-01-07 4:49 ` Linus Torvalds
2012-01-09 6:01 ` Yinghai Lu
2012-01-11 6:20 ` Linus Torvalds
2012-01-11 18:01 ` Yinghai Lu
2012-01-13 16:39 ` Ram Pai
2012-01-13 23:28 ` Yinghai Lu
2012-01-15 16:05 ` Ram Pai
2012-01-16 1:14 ` Yinghai Lu
2012-01-16 3:26 ` Ram Pai
2012-01-16 4:54 ` Yinghai Lu
2012-01-16 10:29 ` Ram Pai
2012-01-16 17:13 ` Yinghai Lu
2012-01-16 21:30 ` Yinghai Lu
2012-01-16 19:59 ` Peter Henriksson
2012-01-16 21:41 ` Yinghai Lu
2011-12-07 8:53 ` Yinghai Lu [this message]
2012-01-06 21:58 ` [PATCH 3/5] PCI: Using add_list in pcie hotplug path Jesse Barnes
2012-01-07 1:30 ` Yinghai Lu
2011-12-07 8:53 ` [PATCH 4/5] PCI: Make rescan bus could increase bridge resource size if needed Yinghai Lu
2011-12-07 8:53 ` [PATCH 5/5] PCI: Make pci_rescan_bus handle add_list 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=1323247984-15281-4-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=jbarnes@virtuousgeek.org \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-pci@vger.kernel.org \
--cc=linuxram@us.ibm.com \
/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).