lkml.org 
[lkml]   [2011]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v2 28/29] sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
    From
    Date
    Convert from pci_scan_bus() to pci_scan_root_bus() and remove root bus
    resource fixups. This fixes the problem of "early" and "header" quirks
    seeing incorrect root bus resources.

    CC: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    ---
    arch/sh/drivers/pci/pci.c | 19 ++++++++++---------
    1 files changed, 10 insertions(+), 9 deletions(-)

    diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
    index 194231c..d8dc68b 100644
    --- a/arch/sh/drivers/pci/pci.c
    +++ b/arch/sh/drivers/pci/pci.c
    @@ -35,9 +35,16 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose)
    {
    static int next_busno;
    static int need_domain_info;
    + struct list_head resources;
    + int i;
    struct pci_bus *bus;

    - bus = pci_scan_bus(next_busno, hose->pci_ops, hose);
    + INIT_LIST_HEAD(&resources);
    + for (i = 0; i < hose->nr_resources; i++)
    + pci_add_resource(&resources, hose->resources + i);
    +
    + bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose,
    + &resources);
    hose->bus = bus;

    need_domain_info = need_domain_info || hose->index;
    @@ -54,6 +61,8 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose)
    pci_bus_size_bridges(bus);
    pci_bus_assign_resources(bus);
    pci_enable_bridges(bus);
    + } else {
    + pci_free_resource_list(&resources);
    }
    }

    @@ -163,14 +172,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
    {
    struct pci_dev *dev = bus->self;
    struct list_head *ln;
    - struct pci_channel *hose = bus->sysdata;
    -
    - if (!dev) {
    - int i;
    -
    - for (i = 0; i < hose->nr_resources; i++)
    - bus->resource[i] = hose->resources + i;
    - }

    for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
    dev = pci_dev_b(ln);


    \
     
     \ /
      Last update: 2011-10-14 06:33    [W:4.821 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site