lkml.org 
[lkml]   [2015]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 13/53] PCI: Separate realloc list checking after allocation
    Date
    We check the realloc list, as list must be empty after allocation.

    Separate the realloc list checking to another function.

    Add checking that is missed in acpiphp driver.

    -v2: change to WARN_ON addording to Rafael.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
    Cc: Len Brown <lenb@kernel.org>
    Cc: linux-acpi@vger.kernel.org
    ---
    drivers/pci/hotplug/acpiphp_glue.c | 1 +
    drivers/pci/pci.h | 1 +
    drivers/pci/setup-bus.c | 12 +++++++++---
    3 files changed, 11 insertions(+), 3 deletions(-)

    diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
    index ff53856..ce9fb21 100644
    --- a/drivers/pci/hotplug/acpiphp_glue.c
    +++ b/drivers/pci/hotplug/acpiphp_glue.c
    @@ -507,6 +507,7 @@ static void enable_slot(struct acpiphp_slot *slot)
    }
    }
    __pci_bus_assign_resources(bus, &add_list, NULL);
    + pci_bus_check_realloc(&add_list);

    acpiphp_sanitize_bus(bus);
    pcie_bus_configure_settings(bus);
    diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
    index 24ba9dc..45a28c4 100644
    --- a/drivers/pci/pci.h
    +++ b/drivers/pci/pci.h
    @@ -237,6 +237,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus,
    void __pci_bus_assign_resources(const struct pci_bus *bus,
    struct list_head *realloc_head,
    struct list_head *fail_head);
    +void pci_bus_check_realloc(struct list_head *realloc_head);
    bool pci_bus_clip_resource(struct pci_dev *dev, int idx);

    void pci_reassigndev_resource_alignment(struct pci_dev *dev);
    diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
    index 9d7adab..c2482da 100644
    --- a/drivers/pci/setup-bus.c
    +++ b/drivers/pci/setup-bus.c
    @@ -349,6 +349,12 @@ out:
    }
    }

    +void pci_bus_check_realloc(struct list_head *realloc_head)
    +{
    + if (WARN_ON(!list_empty(realloc_head)))
    + free_list(realloc_head);
    +}
    +
    /**
    * assign_requested_resources_sorted() - satisfy resource requests
    *
    @@ -1860,7 +1866,7 @@ again:
    /* Depth last, allocate resources and update the hardware. */
    __pci_bus_assign_resources(bus, add_list, &fail_head);
    if (add_list)
    - BUG_ON(!list_empty(add_list));
    + pci_bus_check_realloc(add_list);
    tried_times++;

    /* any device complain? */
    @@ -1935,7 +1941,7 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
    again:
    __pci_bus_size_bridges(parent, &add_list);
    __pci_bridge_assign_resources(bridge, &add_list, &fail_head);
    - BUG_ON(!list_empty(&add_list));
    + pci_bus_check_realloc(&add_list);
    tried_times++;

    if (list_empty(&fail_head))
    @@ -1994,6 +2000,6 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
    &add_list);
    up_read(&pci_bus_sem);
    __pci_bus_assign_resources(bus, &add_list, NULL);
    - BUG_ON(!list_empty(&add_list));
    + pci_bus_check_realloc(&add_list);
    }
    EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources);
    --
    1.8.4.5


    \
     
     \ /
      Last update: 2015-09-17 00:21    [W:2.186 / U:0.428 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site