From patchwork Tue Jul 17 05:23:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Pai X-Patchwork-Id: 1203171 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BE19140071 for ; Tue, 17 Jul 2012 05:23:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751287Ab2GQFXn (ORCPT ); Tue, 17 Jul 2012 01:23:43 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:49349 "EHLO e35.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750851Ab2GQFXm (ORCPT ); Tue, 17 Jul 2012 01:23:42 -0400 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Jul 2012 23:23:41 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 16 Jul 2012 23:23:39 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 8C8A03E40051 for ; Tue, 17 Jul 2012 05:23:38 +0000 (WET) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6H5NdvF055518 for ; Mon, 16 Jul 2012 23:23:39 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6H5NbmE007588 for ; Mon, 16 Jul 2012 23:23:38 -0600 Received: from us.ibm.com ([9.123.236.83]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q6H5NY3v007128; Mon, 16 Jul 2012 23:23:34 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Tue, 17 Jul 2012 13:23:33 +0800 Date: Tue, 17 Jul 2012 13:23:33 +0800 From: Ram Pai To: Ram Pai Cc: Gavin Shan , linux-pci@vger.kernel.org, linuxppc-dev@ozlabs.org, bhelgaas@google.com, benh@kernel.crashing.org, yinghai@kernel.org Subject: Re: [PATCH 05/15] pci: resource assignment based on p2p alignment Message-ID: <20120717052333.GE2369@ram-ThinkPad-T61> Reply-To: Ram Pai References: <1342491799-30303-1-git-send-email-shangw@linux.vnet.ibm.com> <1342491799-30303-6-git-send-email-shangw@linux.vnet.ibm.com> <20120717050547.GD2369@ram-ThinkPad-T61> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120717050547.GD2369@ram-ThinkPad-T61> User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071705-6148-0000-0000-000007B8D334 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Tue, Jul 17, 2012 at 01:05:47PM +0800, Ram Pai wrote: > On Tue, Jul 17, 2012 at 10:23:17AM +0800, Gavin Shan wrote: > > The patch changes function pbus_size_io() and pbus_size_mem() to > > do resource (I/O, memory and prefetchable memory) reassignment > > based on the minimal alignments for the p2p bridge, which was > > retrieved by function window_alignment(). > > > > Signed-off-by: Gavin Shan > > --- > > drivers/pci/setup-bus.c | 13 +++++++++---- > > 1 files changed, 9 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c > > index c0fb9da..a29483a 100644 > > --- a/drivers/pci/setup-bus.c > > +++ b/drivers/pci/setup-bus.c > > @@ -731,6 +731,7 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, > > struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO); > > unsigned long size = 0, size0 = 0, size1 = 0; > > resource_size_t children_add_size = 0; > > + resource_size_t io_align; > > > > if (!b_res) > > return; > > @@ -756,13 +757,15 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, > > children_add_size += get_res_add_size(realloc_head, r); > > } > > } > > + > > + io_align = window_alignment(bus, IORESOURCE_IO); > > this should also be > io_align = max(4096, window_alignment(bus, IORESOURCE_IO)); > > right? > > > > size0 = calculate_iosize(size, min_size, size1, > > - resource_size(b_res), 4096); > > + resource_size(b_res), io_align); > > if (children_add_size > add_size) > > add_size = children_add_size; > > size1 = (!realloc_head || (realloc_head && !add_size)) ? size0 : > > calculate_iosize(size, min_size, add_size + size1, > > - resource_size(b_res), 4096); > > + resource_size(b_res), io_align); > > if (!size0 && !size1) { > > if (b_res->start || b_res->end) > > dev_info(&bus->self->dev, "disabling bridge window " > > @@ -772,11 +775,11 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, > > return; > > } > > /* Alignment of the IO window is always 4K */ > > - b_res->start = 4096; > > + b_res->start = io_align; > > b_res->end = b_res->start + size0 - 1; > > b_res->flags |= IORESOURCE_STARTALIGN; > > if (size1 > size0 && realloc_head) { > > - add_to_list(realloc_head, bus->self, b_res, size1-size0, 4096); > > + add_to_list(realloc_head, bus->self, b_res, size1-size0, io_align); > > dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " > > "%pR to [bus %02x-%02x] add_size %lx\n", b_res, > > bus->secondary, bus->subordinate, size1-size0); > > @@ -875,6 +878,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, > > min_align = align1 >> 1; > > align += aligns[order]; > > } > > + > > + min_align = max(min_align, window_alignment(bus, type)); > > 'type' can sometimes be (IORESOURCE_MEM | IORESOURCE_PREFETCH), which > can lead to unpredictable results depending on how window_alignment() > is implemented... Hence to be on the safer side I suggest > > min_align = max(min_align, window_alignment(bus, b_res->flags & mask)); While you are at it, can we move the min_align calculation into a separate function? Somewhat around the following patch More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 8fa2d4b..426c8ad6 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -762,6 +762,25 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, } } +static inline calculate_min_align(resource_size_t aligns *aligns, int max_order) +{ + resource_size_t align = 0; + resource_size_t min_align = 0; + int order; + for (order = 0; order <= max_order; order++) { + resource_size_t align1 = 1; + + align1 <<= (order + 20); + + if (!align) + min_align = align1; + else if (ALIGN(align + min_align, min_align) < align1) + min_align = align1 >> 1; + align += aligns[order]; + } + return min_align; +} + /** * pbus_size_mem() - size the memory window of a given bus * @@ -841,19 +860,9 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, children_add_size += get_res_add_size(realloc_head, r); } } - align = 0; - min_align = 0; - for (order = 0; order <= max_order; order++) { - resource_size_t align1 = 1; - align1 <<= (order + 20); + min_align = calculate_min_align(aligns, max_order); - if (!align) - min_align = align1; - else if (ALIGN(align + min_align, min_align) < align1) - min_align = align1 >> 1; - align += aligns[order]; - } size0 = calculate_memsize(size, min_size, 0, resource_size(b_res), min_align); if (children_add_size > add_size) add_size = children_add_size; @@ -880,6 +889,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, return 1; } RP -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org