lkml.org 
[lkml]   [2012]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/11] x86, PCI: add host bridge resource release for using _CRS
    Date
    1. allocate pci_root_info instead of use local stack. we need to pass around info
    for release fn.
    2. add release_pci_root_info
    3. set x86 own host bridge release fn, so will make sure root bridge
    related resources get freed during root bus removal.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/pci/acpi.c | 66 +++++++++++++++++++++++++++++++++++++++++----------
    1 files changed, 53 insertions(+), 13 deletions(-)

    diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
    index 763f7bb..208f257 100644
    --- a/arch/x86/pci/acpi.c
    +++ b/arch/x86/pci/acpi.c
    @@ -309,7 +309,33 @@ static void free_pci_root_info(struct pci_root_info *info)
    {
    kfree(info->name);
    kfree(info->res);
    - memset(info, 0, sizeof(struct pci_root_info));
    + kfree(info);
    +}
    +
    +static void __release_pci_root_info(struct pci_root_info *info)
    +{
    + int i;
    + struct resource *res;
    +
    + for (i = 0; i < info->res_num; i++) {
    + res = &info->res[i];
    +
    + if (!res->parent)
    + continue;
    +
    + if (!(res->flags & (IORESOURCE_MEM | IORESOURCE_IO)))
    + continue;
    +
    + release_resource(res);
    + }
    +
    + free_pci_root_info(info);
    +}
    +static void release_pci_root_info(struct pci_host_bridge *bridge)
    +{
    + struct pci_root_info *info = bridge->release_data;
    +
    + __release_pci_root_info(info);
    }

    static void
    @@ -342,7 +368,7 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,
    struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
    {
    struct acpi_device *device = root->device;
    - struct pci_root_info info;
    + struct pci_root_info *info = NULL;
    int domain = root->segment;
    int busnum = root->secondary.start;
    LIST_HEAD(resources);
    @@ -379,15 +405,16 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
    * It's arguable whether it's worth the trouble to care.
    */
    sd = kzalloc(sizeof(*sd), GFP_KERNEL);
    - if (!sd) {
    - printk(KERN_WARNING "pci_bus %04x:%02x: "
    - "ignored (out of memory)\n", domain, busnum);
    - return NULL;
    - }
    + if (!sd)
    + goto out_no_memory;

    sd->domain = domain;
    sd->node = node;
    - memset(&info, 0, sizeof(struct pci_root_info));
    + info = kzalloc(sizeof(*info), GFP_KERNEL);
    + if (!info) {
    + kfree(sd);
    + goto out_no_memory;
    + }
    /*
    * Maybe the desired pci bus has been already scanned. In such case
    * it is unnecessary to scan the pci bus with the given domain,busnum.
    @@ -399,20 +426,22 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
    * be replaced by sd.
    */
    memcpy(bus->sysdata, sd, sizeof(*sd));
    + kfree(info);
    kfree(sd);
    } else {
    - probe_pci_root_info(&info, device, busnum, domain);
    + probe_pci_root_info(info, device, busnum, domain);

    /*
    * _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)
    - add_resources(&info, &resources);
    + add_resources(info, &resources);
    else {
    - free_pci_root_info(&info);
    + free_pci_root_info(info);
    x86_pci_root_bus_resources(busnum, &resources);
    }
    +
    bus = pci_create_root_bus(NULL, busnum, &pci_root_ops, sd,
    &resources);
    if (bus)
    @@ -420,8 +449,14 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
    else
    pci_free_resource_list(&resources);

    - if (!bus && pci_use_crs)
    - free_pci_root_info(&info);
    + if (pci_use_crs) {
    + if (bus)
    + pci_set_host_bridge_release(
    + to_pci_host_bridge(bus->bridge),
    + release_pci_root_info, info);
    + else
    + __release_pci_root_info(info);
    + }
    }

    /* After the PCI-E bus has been walked and all devices discovered,
    @@ -452,6 +487,11 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
    }

    return bus;
    +
    +out_no_memory:
    + printk(KERN_WARNING "pci_bus %04x:%02x: "
    + "ignored (out of memory)\n", domain, busnum);
    + return NULL;
    }

    int __init pci_acpi_init(void)
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-02-28 03:09    [W:0.029 / U:31.536 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site