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 6/7] pci: function to retrieve alignment of p2p bars Date: Fri, 29 Jun 2012 14:47:49 +0800 [thread overview] Message-ID: <9229382f79ce3eeb4645160b5349a51bb51db06b.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 introduces function pci_align_boundary() to retrieve the minimal alignment of p2p bars according to the argument. Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> --- drivers/pci/host-bridge.c | 24 ++++++++++++++++++++++++ include/linux/pci.h | 1 + 2 files changed, 25 insertions(+) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 1854a2d..dc9a95e 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -105,3 +105,27 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, } EXPORT_SYMBOL(pcibios_bus_to_resource); + +resource_size_t pci_align_boundary(struct pci_bus *bus, unsigned long flags) +{ + resource_size_t align = 0; + struct pci_host_bridge *bridge = find_pci_host_bridge(bus); + + flags &= (IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH); + switch (flags) { + case IORESOURCE_IO: + align = (1 << bridge->io_align_shift); + break; + case IORESOURCE_MEM: + align = (1 << bridge->mem_align_shift); + break; + case (IORESOURCE_MEM | IORESOURCE_PREFETCH): + align = (1 << bridge->pmem_align_shift); + break; + default: + printk(KERN_WARNING "%s: invalid flags 0x%lx\n", + __func__, flags); + } + + return align; +} diff --git a/include/linux/pci.h b/include/linux/pci.h index 2b2b38d..64523ef 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -673,6 +673,7 @@ void __pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res, struct pci_bus_region *region); void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, struct pci_bus_region *region); +resource_size_t pci_align_boundary(struct pci_bus *bus, unsigned long flags); void pcibios_scan_specific_bus(int busn); extern struct pci_bus *pci_find_bus(int domain, int busnr); void pci_bus_add_devices(const struct pci_bus *bus); -- 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 6/7] pci: function to retrieve alignment of p2p bars Date: Fri, 29 Jun 2012 14:47:49 +0800 [thread overview] Message-ID: <9229382f79ce3eeb4645160b5349a51bb51db06b.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 introduces function pci_align_boundary() to retrieve the minimal alignment of p2p bars according to the argument. Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> --- drivers/pci/host-bridge.c | 24 ++++++++++++++++++++++++ include/linux/pci.h | 1 + 2 files changed, 25 insertions(+) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 1854a2d..dc9a95e 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -105,3 +105,27 @@ void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, } EXPORT_SYMBOL(pcibios_bus_to_resource); + +resource_size_t pci_align_boundary(struct pci_bus *bus, unsigned long flags) +{ + resource_size_t align = 0; + struct pci_host_bridge *bridge = find_pci_host_bridge(bus); + + flags &= (IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH); + switch (flags) { + case IORESOURCE_IO: + align = (1 << bridge->io_align_shift); + break; + case IORESOURCE_MEM: + align = (1 << bridge->mem_align_shift); + break; + case (IORESOURCE_MEM | IORESOURCE_PREFETCH): + align = (1 << bridge->pmem_align_shift); + break; + default: + printk(KERN_WARNING "%s: invalid flags 0x%lx\n", + __func__, flags); + } + + return align; +} diff --git a/include/linux/pci.h b/include/linux/pci.h index 2b2b38d..64523ef 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -673,6 +673,7 @@ void __pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res, struct pci_bus_region *region); void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, struct pci_bus_region *region); +resource_size_t pci_align_boundary(struct pci_bus *bus, unsigned long flags); void pcibios_scan_specific_bus(int busn); extern struct pci_bus *pci_find_bus(int domain, int busnr); void pci_bus_add_devices(const struct pci_bus *bus); -- 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 ` Gavin Shan [this message] 2012-06-29 6:47 ` [PATCH 6/7] pci: function to retrieve alignment of p2p bars Gavin Shan 2012-06-29 6:47 ` [PATCH 7/7] pci: resource assignment based on p2p alignment Gavin Shan 2012-06-29 6:47 ` 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=9229382f79ce3eeb4645160b5349a51bb51db06b.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.