lkml.org 
[lkml]   [2012]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/36] x86, PCI: add busn into resources list for acpi path
    Date
    will put it in resources list and pass it for create_root_bus

    Bjorn thought that we should just use that in acpi_root.

    Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/pci/acpi.c | 11 ++++++-----
    1 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
    index 2331ccb..5178917 100644
    --- a/arch/x86/pci/acpi.c
    +++ b/arch/x86/pci/acpi.c
    @@ -12,7 +12,6 @@ struct pci_root_info {
    char name[16];
    unsigned int res_num;
    struct resource *res;
    - int busnum;
    struct pci_sysdata sd;
    };

    @@ -347,7 +346,9 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,
    {
    size_t size;

    + sprintf(info->name, "PCI Bus %04x:%02x", domain, busnum);
    info->bridge = device;
    +
    info->res_num = 0;
    acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource,
    info);
    @@ -360,8 +361,6 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,
    if (!info->res)
    return;

    - sprintf(info->name, "PCI Bus %04x:%02x", domain, busnum);
    -
    acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
    info);
    }
    @@ -430,9 +429,11 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
    * _CRS with no apertures is normal, so only fall back to
    * defaults or native bridge info if we're ignoring _CRS.
    */
    - if (pci_use_crs)
    + if (pci_use_crs) {
    + /* insert busn res at first */
    + pci_add_resource(&resources, &root->secondary);
    add_resources(info, &resources);
    - else {
    + } else {
    free_pci_root_info_res(info);
    x86_pci_root_bus_resources(busnum, &resources);
    }
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-03-01 04:13    [W:0.072 / U:0.424 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site