lkml.org 
[lkml]   [2011]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/8] PCI: Using add_list in pcie hotplug path

    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)

    \
     
     \ /
      Last update: 2011-10-16 03:35    [W:0.033 / U:60.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site