lkml.org 
[lkml]   [2010]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 04/11] pci: don't shrink bridge resources
    when we are clearing leaf bridge resource and try to get big one, we could
    shrink the bridge if there is no resource under it.

    let check with old resource size and make sure we are trying to get big one.

    -v2: keep disable window print out, still could happen on non pci hotplug system

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    drivers/pci/setup-bus.c | 14 ++++++++++++--
    1 files changed, 12 insertions(+), 2 deletions(-)

    diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
    index c704e5c..5eebec8 100644
    --- a/drivers/pci/setup-bus.c
    +++ b/drivers/pci/setup-bus.c
    @@ -387,7 +387,7 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size)
    {
    struct pci_dev *dev;
    struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO);
    - unsigned long size = 0, size1 = 0;
    + unsigned long size = 0, size1 = 0, old_size;

    if (!b_res)
    return;
    @@ -412,12 +412,17 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size)
    }
    if (size < min_size)
    size = min_size;
    + old_size = resource_size(b_res);
    + if (old_size == 1)
    + old_size = 0;
    /* To be fixed in 2.5: we should have sort of HAVE_ISA
    flag in the struct pci_bus. */
    #if defined(CONFIG_ISA) || defined(CONFIG_EISA)
    size = (size & 0xff) + ((size & ~0xffUL) << 2);
    #endif
    size = ALIGN(size + size1, 4096);
    + if (size < old_size)
    + size = old_size;
    if (!size) {
    if (b_res->start || b_res->end)
    dev_info(&bus->self->dev, "disabling bridge window "
    @@ -438,7 +443,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
    unsigned long type, resource_size_t min_size)
    {
    struct pci_dev *dev;
    - resource_size_t min_align, align, size;
    + resource_size_t min_align, align, size, old_size;
    resource_size_t aligns[12]; /* Alignments from 1Mb to 2Gb */
    int order, max_order;
    struct resource *b_res = find_free_bus_resource(bus, type);
    @@ -488,6 +493,11 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
    }
    if (size < min_size)
    size = min_size;
    + old_size = resource_size(b_res);
    + if (old_size == 1)
    + old_size = 0;
    + if (size < old_size)
    + size = old_size;

    align = 0;
    min_align = 0;
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-01-16 03:47    [W:0.025 / U:0.228 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site