From patchwork Fri Jun 29 06:47:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 1130811 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CC344DFF34 for ; Fri, 29 Jun 2012 06:48:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751529Ab2F2Gss (ORCPT ); Fri, 29 Jun 2012 02:48:48 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:46547 "EHLO e7.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751258Ab2F2Gsr (ORCPT ); Fri, 29 Jun 2012 02:48:47 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 29 Jun 2012 02:48:46 -0400 Received: from d01relay07.pok.ibm.com (9.56.227.147) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 29 Jun 2012 02:48:01 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5T6m0Vm65405148 for ; Fri, 29 Jun 2012 02:48:00 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5T6lxUw001746 for ; Fri, 29 Jun 2012 03:48:00 -0300 Received: from shangw ([9.77.178.49]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5T6lwZq001712; Fri, 29 Jun 2012 03:47:58 -0300 Received: by shangw (Postfix, from userid 1000) id B04C63818B1; Fri, 29 Jun 2012 14:47:56 +0800 (CST) From: Gavin Shan 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 Subject: [PATCH 6/7] pci: function to retrieve alignment of p2p bars Date: Fri, 29 Jun 2012 14:47:49 +0800 Message-Id: <9229382f79ce3eeb4645160b5349a51bb51db06b.1340949637.git.shangw@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: x-cbid: 12062906-5806-0000-0000-000016C78CE8 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The patch introduces function pci_align_boundary() to retrieve the minimal alignment of p2p bars according to the argument. Signed-off-by: Gavin Shan --- 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);