From patchwork Tue Jun 10 01:56:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 357680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 475011400E2 for ; Tue, 10 Jun 2014 11:57:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934053AbaFJB5W (ORCPT ); Mon, 9 Jun 2014 21:57:22 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:55997 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932145AbaFJB5L (ORCPT ); Mon, 9 Jun 2014 21:57:11 -0400 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 10 Jun 2014 07:27:09 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 10 Jun 2014 07:27:07 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id DAC3A3940048 for ; Tue, 10 Jun 2014 07:27:06 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s5A1vv3b5374320 for ; Tue, 10 Jun 2014 07:27:57 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s5A1v6CM013243 for ; Tue, 10 Jun 2014 07:27:06 +0530 Received: from localhost (richard.cn.ibm.com [9.111.17.78]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s5A1v5od013230; Tue, 10 Jun 2014 07:27:05 +0530 From: Wei Yang To: benh@au1.ibm.com Cc: linuxppc-dev@lists.ozlabs.org, bhelgaas@google.com, linux-pci@vger.kernel.org, gwshan@linux.vnet.ibm.com, yan@linux.vnet.ibm.com, qiudayu@linux.vnet.ibm.com, Wei Yang Subject: [RFC PATCH V3 08/17] PCI: Add weak pcibios_sriov_resource_size() interface Date: Tue, 10 Jun 2014 09:56:30 +0800 Message-Id: <1402365399-5121-9-git-send-email-weiyang@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1402365399-5121-1-git-send-email-weiyang@linux.vnet.ibm.com> References: <1402365399-5121-1-git-send-email-weiyang@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14061001-8878-0000-0000-00000CE25DA8 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org When retrieving sriov resource size in pci_sriov_resource_size(), it will divide the total IOV resource size with the totalVF number. This is true for most cases, while may not be correct on some specific platform. For example on powernv platform, in order to fix the IOV BAR into a hardware alignment, the IOV resource size would be expended. This means the original method couldn't work. This patch introduces a weak pcibios_sriov_resource_size() interface, which gives platform a chance to implement specific method to calculate the sriov resource size. Signed-off-by: Wei Yang --- drivers/pci/iov.c | 27 +++++++++++++++++++++++++-- include/linux/pci.h | 3 +++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index cc87773..9fd4648 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -45,6 +45,30 @@ static void virtfn_remove_bus(struct pci_bus *physbus, struct pci_bus *virtbus) pci_remove_bus(virtbus); } +resource_size_t __weak pcibios_sriov_resource_size(struct pci_dev *dev, int resno) +{ + return 0; +} + +resource_size_t pci_sriov_resource_size(struct pci_dev *dev, int resno) +{ + u64 size; + struct pci_sriov *iov; + + if (!dev->is_physfn) + return 0; + + size = pcibios_sriov_resource_size(dev, resno); + if (size != 0) + return size; + + iov = dev->sriov; + size = resource_size(dev->resource + resno); + do_div(size, iov->total_VFs); + + return size; +} + static int virtfn_add(struct pci_dev *dev, int id, int reset) { int i; @@ -81,8 +105,7 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset) continue; virtfn->resource[i].name = pci_name(virtfn); virtfn->resource[i].flags = res->flags; - size = resource_size(res); - do_div(size, iov->total_VFs); + size = pci_sriov_resource_size(dev, i + PCI_IOV_RESOURCES); virtfn->resource[i].start = res->start + size * id; virtfn->resource[i].end = virtfn->resource[i].start + size - 1; rc = request_resource(res, &virtfn->resource[i]); diff --git a/include/linux/pci.h b/include/linux/pci.h index ddb1ca0..315c150 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1637,6 +1637,7 @@ int pci_num_vf(struct pci_dev *dev); int pci_vfs_assigned(struct pci_dev *dev); int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); int pci_sriov_get_totalvfs(struct pci_dev *dev); +resource_size_t pci_sriov_resource_size(struct pci_dev *dev, int resno); #else static inline int pci_iov_virtfn_bus(struct pci_dev *dev, int id) { @@ -1658,6 +1659,8 @@ static inline int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs) { return 0; } static inline int pci_sriov_get_totalvfs(struct pci_dev *dev) { return 0; } +static inline resource_size_t pci_sriov_resource_size(struct pci_dev *dev, int resno) +{ return -1; } #endif #if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)