On Tue, Feb 07, 2012 at 08:48:36PM -0800, Yinghai Lu wrote:
> On Tue, Feb 7, 2012 at 8:35 PM, Ram Pai <linuxram@xxxxxxxxxx> wrote:
> > On Sat, Feb 04, 2012 at 10:55:03PM -0800, Yinghai Lu wrote:
> >> We should not set the requested size to -2.
> >>
> >> that will confuse the resource list sorting with align when SIZEALIGN is used.
> >>
> >> Change to STARTALIGN and pass align from start.
> >>
> >> We are safe to do that just as we do that regular pci bridge.
> >>
> >> In the long run, we should just treat cardbus like regular pci bridge.
> >>
> >> Also fix when realloc is not passed, should keep the requested size.
> >>
> >> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
> >> ---
> >> drivers/pci/setup-bus.c | 63 ++++++++++++++++++++++++++--------------------
> >> 1 files changed, 36 insertions(+), 27 deletions(-)
> >>
> >> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> >> index d5897c3..3b3932a 100644
> >> --- a/drivers/pci/setup-bus.c
> >> +++ b/drivers/pci/setup-bus.c
> >> @@ -898,21 +898,30 @@ static void pci_bus_size_cardbus(struct pci_bus *bus,
..snip
> >> - b_res[3].flags |= IORESOURCE_MEM | IORESOURCE_SIZEALIGN;
> >> - if (realloc_head)
> >> - add_to_list(realloc_head, bridge, b_res+3, pci_cardbus_mem_size, 0 /* dont care */);
> >
> > The b_res_3_size has to be reduced to half here.
> > Otherwise it will try allocate 2*pci_cardbus_mem_size to the BAR3..
> >
> > b_res_3_size = pci_cardbus_mem_size;
> >
> >
> >> - } else {
> >> - b_res[3].start = 0;
> >> - b_res[3].flags |= IORESOURCE_MEM | IORESOURCE_SIZEALIGN;
> >> - if (realloc_head)
> >> - add_to_list(realloc_head, bridge, b_res+3, pci_cardbus_mem_size * 2, 0 /* dont care */);
> >> + /* reduce that to half */
> >> + b_res_3_size = pci_cardbus_mem_size;
> >
> > b_res3_3_size should not be updated here, since BAR3 has to be allocated 2*pci_cardbus_mem_size
> > resource.
> >
>
> looks like you did not read the patch correctly
>
> that else {} get removed already in this patch
>
> please check segment after patch...
> /*
..snip..
> * If we have prefetchable memory support, allocate
> * two regions. Otherwise, allocate one region of
> * twice the size.
> */
> if (ctrl & PCI_CB_BRIDGE_CTL_PREFETCH_MEM0) {
> b_res[2].start = pci_cardbus_mem_size;
> b_res[2].end = b_res[2].start + pci_cardbus_mem_size - 1;
> b_res[2].flags |= IORESOURCE_MEM | IORESOURCE_PREFETCH |
> IORESOURCE_STARTALIGN;
> if (realloc_head) {
> b_res[2].end -= pci_cardbus_mem_size;
> add_to_list(realloc_head, bridge, b_res+2,
> pci_cardbus_mem_size, pci_cardbus_mem_size);
> }
>
> /* reduce that to half */
> b_res_3_size = pci_cardbus_mem_size;
> }
ACK. Ok. got it. This looks correct.
RP
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
