From: Gavin Shan <shangw@linux.vnet.ibm.com> To: linux-pci@vger.kernel.org, linuxppc-dev@ozlabs.org Cc: bhelgaas@google.com, yinghai@kernel.org, benh@kernel.crashing.org, linuxram@us.ibm.com, Gavin Shan <shangw@linux.vnet.ibm.com> Subject: [PATCH 7/7] pci: resource assignment based on p2p alignment Date: Fri, 29 Jun 2012 14:47:50 +0800 [thread overview] Message-ID: <4a82175568f1ed2ca4e5c1842365943ebf261931.1340949637.git.shangw@linux.vnet.ibm.com> (raw) In-Reply-To: <cover.1340949637.git.shangw@linux.vnet.ibm.com> In-Reply-To: <cover.1340949637.git.shangw@linux.vnet.ibm.com> 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 from the p2p bridge. Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> --- drivers/pci/setup-bus.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 8fa2d4b..52b60af 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -710,6 +710,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; @@ -735,13 +736,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 = pci_align_boundary(bus, IORESOURCE_IO); 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 " @@ -751,11 +754,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); @@ -785,10 +788,15 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, struct resource *b_res = find_free_bus_resource(bus, type); unsigned int mem64_mask = 0; resource_size_t children_add_size = 0; + resource_size_t mem_align; + int mem_align_shift; if (!b_res) return 0; + mem_align = pci_align_boundary(bus, type); + mem_align_shift = __ffs(mem_align); + memset(aligns, 0, sizeof(aligns)); max_order = 0; size = 0; @@ -818,8 +826,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, #endif /* For bridges size != alignment */ align = pci_resource_alignment(dev, r); - order = __ffs(align) - 20; - if (order > 11) { + order = __ffs(align) - mem_align_shift; + if (order > (11 - (mem_align_shift - 20))) { dev_warn(&dev->dev, "disabling BAR %d: %pR " "(bad alignment %#llx)\n", i, r, (unsigned long long) align); @@ -846,7 +854,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, for (order = 0; order <= max_order; order++) { resource_size_t align1 = 1; - align1 <<= (order + 20); + align1 <<= (order + mem_align_shift); if (!align) min_align = align1; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Gavin Shan <shangw@linux.vnet.ibm.com> To: linux-pci@vger.kernel.org, linuxppc-dev@ozlabs.org Cc: bhelgaas@google.com, yinghai@kernel.org, Gavin Shan <shangw@linux.vnet.ibm.com>, linuxram@us.ibm.com Subject: [PATCH 7/7] pci: resource assignment based on p2p alignment Date: Fri, 29 Jun 2012 14:47:50 +0800 [thread overview] Message-ID: <4a82175568f1ed2ca4e5c1842365943ebf261931.1340949637.git.shangw@linux.vnet.ibm.com> (raw) In-Reply-To: <cover.1340949637.git.shangw@linux.vnet.ibm.com> In-Reply-To: <cover.1340949637.git.shangw@linux.vnet.ibm.com> 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 from the p2p bridge. Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> --- drivers/pci/setup-bus.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 8fa2d4b..52b60af 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -710,6 +710,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; @@ -735,13 +736,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 = pci_align_boundary(bus, IORESOURCE_IO); 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 " @@ -751,11 +754,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); @@ -785,10 +788,15 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, struct resource *b_res = find_free_bus_resource(bus, type); unsigned int mem64_mask = 0; resource_size_t children_add_size = 0; + resource_size_t mem_align; + int mem_align_shift; if (!b_res) return 0; + mem_align = pci_align_boundary(bus, type); + mem_align_shift = __ffs(mem_align); + memset(aligns, 0, sizeof(aligns)); max_order = 0; size = 0; @@ -818,8 +826,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, #endif /* For bridges size != alignment */ align = pci_resource_alignment(dev, r); - order = __ffs(align) - 20; - if (order > 11) { + order = __ffs(align) - mem_align_shift; + if (order > (11 - (mem_align_shift - 20))) { dev_warn(&dev->dev, "disabling BAR %d: %pR " "(bad alignment %#llx)\n", i, r, (unsigned long long) align); @@ -846,7 +854,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, for (order = 0; order <= max_order; order++) { resource_size_t align1 = 1; - align1 <<= (order + 20); + align1 <<= (order + mem_align_shift); if (!align) min_align = align1; -- 1.7.9.5
next prev parent reply other threads:[~2012-06-29 6:48 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-29 6:47 [PATCH V5 0/7] minimal alignment for p2p bars Gavin Shan 2012-06-29 6:47 ` Gavin Shan 2012-06-29 6:47 ` [PATCH 1/7] pci: change variable name for find_pci_host_bridge Gavin Shan 2012-06-29 6:47 ` Gavin Shan 2012-06-29 6:47 ` [PATCH 2/7] pci: argument pci_bus " Gavin Shan 2012-06-29 6:47 ` Gavin Shan 2012-06-29 6:47 ` [PATCH 3/7] pci: make find_pci_host_bridge global Gavin Shan 2012-06-29 6:47 ` Gavin Shan 2012-06-29 6:47 ` [PATCH 4/7] pci: fiddle with conversion of pci and CPU address Gavin Shan 2012-06-29 6:47 ` Gavin Shan 2012-06-29 6:47 ` [PATCH 5/7] pci: minimal alignment for bars of P2P bridges Gavin Shan 2012-06-29 6:47 ` Gavin Shan 2012-07-13 20:12 ` Bjorn Helgaas 2012-07-13 20:12 ` Bjorn Helgaas [not found] ` <20120716035044.GC24203@shangw> 2012-07-16 14:58 ` Bjorn Helgaas 2012-06-29 6:47 ` [PATCH 6/7] pci: function to retrieve alignment of p2p bars Gavin Shan 2012-06-29 6:47 ` Gavin Shan 2012-06-29 6:47 ` Gavin Shan [this message] 2012-06-29 6:47 ` [PATCH 7/7] pci: resource assignment based on p2p alignment Gavin Shan 2012-07-03 7:01 ` [PATCH V5 0/7] minimal alignment for p2p bars Gavin Shan 2012-07-03 7:01 ` Gavin Shan 2012-07-16 23:12 ` [PATCH v5 " Bjorn Helgaas 2012-07-16 23:12 ` Bjorn Helgaas [not found] ` <1342452631-21152-4-git-send-email-shangw@linux.vnet.ibm.com> 2012-07-17 0:07 ` [PATCH 04/15] pci: weak function returns alignment Bjorn Helgaas 2012-07-17 0:07 ` Bjorn Helgaas [not found] ` <1342452631-21152-5-git-send-email-shangw@linux.vnet.ibm.com> 2012-07-17 0:47 ` [PATCH 05/15] pci: resource assignment based on p2p alignment Bjorn Helgaas 2012-07-17 0:47 ` Bjorn Helgaas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4a82175568f1ed2ca4e5c1842365943ebf261931.1340949637.git.shangw@linux.vnet.ibm.com \ --to=shangw@linux.vnet.ibm.com \ --cc=benh@kernel.crashing.org \ --cc=bhelgaas@google.com \ --cc=linux-pci@vger.kernel.org \ --cc=linuxppc-dev@ozlabs.org \ --cc=linuxram@us.ibm.com \ --cc=yinghai@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.