{"id":817531,"url":"http://patchwork.ozlabs.org/api/patches/817531/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/patch/20170922140608.47665-2-bryantly@linux.vnet.ibm.com/","project":{"id":28,"url":"http://patchwork.ozlabs.org/api/projects/28/?format=json","name":"Linux PCI development","link_name":"linux-pci","list_id":"linux-pci.vger.kernel.org","list_email":"linux-pci@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170922140608.47665-2-bryantly@linux.vnet.ibm.com>","list_archive_url":null,"date":"2017-09-22T14:06:07","name":"[v2,1/2] powerpc/kernel: Separate SR-IOV Calls","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b27fa0bf475caf84295c404551fcc8cdf89488ff","submitter":{"id":72247,"url":"http://patchwork.ozlabs.org/api/people/72247/?format=json","name":"Bryant G. Ly","email":"bryantly@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-pci/patch/20170922140608.47665-2-bryantly@linux.vnet.ibm.com/mbox/","series":[{"id":4637,"url":"http://patchwork.ozlabs.org/api/series/4637/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/list/?series=4637","date":"2017-09-22T14:06:06","name":"Prepartion for SR-IOV PowerVM Enablement","version":2,"mbox":"http://patchwork.ozlabs.org/series/4637/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817531/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817531/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-pci-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xzFdY16HQz9t3h\n\tfor ;\n\tSat, 23 Sep 2017 00:06:25 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752218AbdIVOGY (ORCPT );\n\tFri, 22 Sep 2017 10:06:24 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57852 \"EHLO\n\tmx0a-001b2d01.pphosted.com\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1751980AbdIVOGX (ORCPT\n\t); Fri, 22 Sep 2017 10:06:23 -0400","from pps.filterd (m0098399.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8ME5SUJ093173\n\tfor ; Fri, 22 Sep 2017 10:06:23 -0400","from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d4yxb9tn6-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Fri, 22 Sep 2017 10:06:23 -0400","from localhost\n\tby e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tFri, 22 Sep 2017 08:06:21 -0600","from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17)\n\tby e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tFri, 22 Sep 2017 08:06:17 -0600","from b03ledav006.gho.boulder.ibm.com\n\t(b03ledav006.gho.boulder.ibm.com [9.17.130.237])\n\tby b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8ME6H1E1442100; Fri, 22 Sep 2017 07:06:17 -0700","from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 675D0C6043;\n\tFri, 22 Sep 2017 08:06:17 -0600 (MDT)","from bryants-mbp-3.rchland.ibm.com (unknown [9.10.79.180])\n\tby b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP id DF5E7C603C;\n\tFri, 22 Sep 2017 08:06:16 -0600 (MDT)"],"From":"\"Bryant G. Ly\" ","To":"bhelgaas@google.com, benh@kernel.crashing.org, paulus@samba.org,\n\tmpe@ellerman.id.au","Cc":"linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n\t\"Bryant G. Ly\" ,\n\t\"Juan J . Alvarez\" ","Subject":"[PATCH v2 1/2] powerpc/kernel: Separate SR-IOV Calls","Date":"Fri, 22 Sep 2017 09:06:07 -0500","X-Mailer":"git-send-email 2.11.0 (Apple Git-81)","In-Reply-To":"<20170922140608.47665-1-bryantly@linux.vnet.ibm.com>","References":"<20170922140608.47665-1-bryantly@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17092214-8235-0000-0000-00000C4F12BA","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007777; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000231; SDB=6.00920736; UDB=6.00462682;\n\tIPR=6.00700957; \n\tBA=6.00005601; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017248;\n\tXFM=3.00000015; UTC=2017-09-22 14:06:19","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17092214-8236-0000-0000-00003DC0F9AF","Message-Id":"<20170922140608.47665-2-bryantly@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-22_05:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709220196","Sender":"linux-pci-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-pci@vger.kernel.org"},"content":"SR-IOV can now be enabled in PowerNV platforms and Pseries\nplatforms. Therefore, the appropriate calls were moved to\nmachine dependent code instead of definition at compile time.\n\nSigned-off-by: Bryant G. Ly \nSigned-off-by: Juan J. Alvarez \n---\n arch/powerpc/include/asm/machdep.h | 7 ++++++\n arch/powerpc/include/asm/pci-bridge.h | 4 +---\n arch/powerpc/kernel/eeh_driver.c | 4 ++--\n arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++\n arch/powerpc/kernel/pci_dn.c | 6 -----\n arch/powerpc/platforms/powernv/eeh-powernv.c | 34 +++++++++++++++-------------\n arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--\n 7 files changed, 55 insertions(+), 29 deletions(-)","diff":"diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h\nindex f90b22c722e1..57b6608bb4fb 100644\n--- a/arch/powerpc/include/asm/machdep.h\n+++ b/arch/powerpc/include/asm/machdep.h\n@@ -173,11 +173,18 @@ struct machdep_calls {\n \t/* Called after scan and before resource survey */\n \tvoid (*pcibios_fixup_phb)(struct pci_controller *hose);\n \n+\t/* Called after device has been added to bus and\n+\t * before sysfs has been created\n+\t */\n+\tvoid (*pcibios_bus_add_device)(struct pci_dev *pdev);\n+\n \tresource_size_t (*pcibios_default_alignment)(void);\n \n #ifdef CONFIG_PCI_IOV\n \tvoid (*pcibios_fixup_sriov)(struct pci_dev *pdev);\n \tresource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);\n+\tint (*pcibios_sriov_enable)(struct pci_dev *pdev, u16 num_vfs);\n+\tint (*pcibios_sriov_disable)(struct pci_dev *pdev);\n #endif /* CONFIG_PCI_IOV */\n \n \t/* Called to shutdown machine specific hardware not already controlled\ndiff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h\nindex 56c67d3f0108..e5bf0f15fc4d 100644\n--- a/arch/powerpc/include/asm/pci-bridge.h\n+++ b/arch/powerpc/include/asm/pci-bridge.h\n@@ -204,10 +204,9 @@ struct pci_dn {\n \tstruct eeh_dev *edev;\t\t/* eeh device */\n #endif\n #define IODA_INVALID_PE\t\t0xFFFFFFFF\n-#ifdef CONFIG_PPC_POWERNV\n \tunsigned int pe_number;\n-\tint vf_index;\t\t/* VF index in the PF */\n #ifdef CONFIG_PCI_IOV\n+\tint vf_index;\t\t/* VF index in the PF */\n \tu16 vfs_expanded;\t\t/* number of VFs IOV BAR expanded */\n \tu16 num_vfs;\t\t/* number of VFs enabled*/\n \tunsigned int *pe_num_map;\t/* PE# for the first VF PE or array */\n@@ -216,7 +215,6 @@ struct pci_dn {\n \tint (*m64_map)[PCI_SRIOV_NUM_BARS];\n #endif /* CONFIG_PCI_IOV */\n \tint\tmps;\t\t\t/* Maximum Payload Size */\n-#endif\n \tstruct list_head child_list;\n \tstruct list_head list;\n };\ndiff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c\nindex c405c79e50cd..ee5805926e77 100644\n--- a/arch/powerpc/kernel/eeh_driver.c\n+++ b/arch/powerpc/kernel/eeh_driver.c\n@@ -440,7 +440,7 @@ static void *eeh_add_virt_device(void *data, void *userdata)\n \t\t\treturn NULL;\n \t}\n \n-#ifdef CONFIG_PPC_POWERNV\n+#ifdef CONFIG_PCI_IOV\n \tpci_iov_add_virtfn(edev->physfn, pdn->vf_index, 0);\n #endif\n \treturn NULL;\n@@ -496,7 +496,7 @@ static void *eeh_rmv_device(void *data, void *userdata)\n \t\t(*removed)++;\n \n \tif (edev->physfn) {\n-#ifdef CONFIG_PPC_POWERNV\n+#ifdef CONFIG_PCI_IOV\n \t\tstruct pci_dn *pdn = eeh_dev_to_pdn(edev);\n \n \t\tpci_iov_remove_virtfn(edev->physfn, pdn->vf_index, 0);\ndiff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c\nindex 6fae7654017e..786040138aec 100644\n--- a/arch/powerpc/kernel/pci-common.c\n+++ b/arch/powerpc/kernel/pci-common.c\n@@ -249,8 +249,31 @@ resource_size_t pcibios_iov_resource_alignment(struct pci_dev *pdev, int resno)\n \n \treturn pci_iov_resource_size(pdev, resno);\n }\n+\n+int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)\n+{\n+\tif (ppc_md.pcibios_sriov_enable)\n+\t\treturn ppc_md.pcibios_sriov_enable(pdev, num_vfs);\n+\n+\treturn 0;\n+}\n+\n+int pcibios_sriov_disable(struct pci_dev *pdev)\n+{\n+\tif (ppc_md.pcibios_sriov_disable)\n+\t\treturn ppc_md.pcibios_sriov_disable(pdev);\n+\n+\treturn 0;\n+}\n+\n #endif /* CONFIG_PCI_IOV */\n \n+void pcibios_bus_add_device(struct pci_dev *pdev)\n+{\n+\tif (ppc_md.pcibios_bus_add_device)\n+\t\tppc_md.pcibios_bus_add_device(pdev);\n+}\n+\n static resource_size_t pcibios_io_size(const struct pci_controller *hose)\n {\n #ifdef CONFIG_PPC64\ndiff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c\nindex 592693437070..52659bb7450f 100644\n--- a/arch/powerpc/kernel/pci_dn.c\n+++ b/arch/powerpc/kernel/pci_dn.c\n@@ -159,10 +159,8 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent,\n \tpdn->parent = parent;\n \tpdn->busno = busno;\n \tpdn->devfn = devfn;\n-#ifdef CONFIG_PPC_POWERNV\n \tpdn->vf_index = vf_index;\n \tpdn->pe_number = IODA_INVALID_PE;\n-#endif\n \tINIT_LIST_HEAD(&pdn->child_list);\n \tINIT_LIST_HEAD(&pdn->list);\n \tlist_add_tail(&pdn->list, &parent->child_list);\n@@ -236,9 +234,7 @@ void remove_dev_pci_data(struct pci_dev *pdev)\n \t */\n \tif (pdev->is_virtfn) {\n \t\tpdn = pci_get_pdn(pdev);\n-#ifdef CONFIG_PPC_POWERNV\n \t\tpdn->pe_number = IODA_INVALID_PE;\n-#endif\n \t\treturn;\n \t}\n \n@@ -305,9 +301,7 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,\n \tdn->data = pdn;\n \tpdn->node = dn;\n \tpdn->phb = hose;\n-#ifdef CONFIG_PPC_POWERNV\n \tpdn->pe_number = IODA_INVALID_PE;\n-#endif\n \tregs = of_get_property(dn, \"reg\", NULL);\n \tif (regs) {\n \t\tu32 addr = of_read_number(regs, 1);\ndiff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c\nindex d12ea7b9fd47..39502617e1fc 100644\n--- a/arch/powerpc/platforms/powernv/eeh-powernv.c\n+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c\n@@ -44,6 +44,22 @@\n static bool pnv_eeh_nb_init = false;\n static int eeh_event_irq = -EINVAL;\n \n+void pnv_pcibios_bus_add_device(struct pci_dev *pdev)\n+{\n+\tstruct pci_dn *pdn = pci_get_pdn(pdev);\n+\n+\tif (!pdev->is_virtfn)\n+\t\treturn;\n+\n+\t/*\n+\t * The following operations will fail if VF's sysfs files\n+\t * aren't created or its resources aren't finalized.\n+\t */\n+\teeh_add_device_early(pdn);\n+\teeh_add_device_late(pdev);\n+\teeh_sysfs_add_device(pdev);\n+}\n+\n static int pnv_eeh_init(void)\n {\n \tstruct pci_controller *hose;\n@@ -82,6 +98,8 @@ static int pnv_eeh_init(void)\n \t\tbreak;\n \t}\n \n+\tppc_md.pcibios_bus_add_device = pnv_pcibios_bus_add_device;\n+\n \treturn 0;\n }\n \n@@ -1751,22 +1769,6 @@ static struct eeh_ops pnv_eeh_ops = {\n \t.restore_config\t\t= pnv_eeh_restore_config\n };\n \n-void pcibios_bus_add_device(struct pci_dev *pdev)\n-{\n-\tstruct pci_dn *pdn = pci_get_pdn(pdev);\n-\n-\tif (!pdev->is_virtfn)\n-\t\treturn;\n-\n-\t/*\n-\t * The following operations will fail if VF's sysfs files\n-\t * aren't created or its resources aren't finalized.\n-\t */\n-\teeh_add_device_early(pdn);\n-\teeh_add_device_late(pdev);\n-\teeh_sysfs_add_device(pdev);\n-}\n-\n #ifdef CONFIG_PCI_IOV\n static void pnv_pci_fixup_vf_mps(struct pci_dev *pdev)\n {\ndiff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c\nindex 283caf1070c9..4e6c0aa36f69 100644\n--- a/arch/powerpc/platforms/powernv/pci-ioda.c\n+++ b/arch/powerpc/platforms/powernv/pci-ioda.c\n@@ -1675,7 +1675,7 @@ int pnv_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs)\n \treturn ret;\n }\n \n-int pcibios_sriov_disable(struct pci_dev *pdev)\n+int pnv_pcibios_sriov_disable(struct pci_dev *pdev)\n {\n \tpnv_pci_sriov_disable(pdev);\n \n@@ -1684,7 +1684,7 @@ int pcibios_sriov_disable(struct pci_dev *pdev)\n \treturn 0;\n }\n \n-int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)\n+int pnv_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)\n {\n \t/* Allocate PCI data */\n \tadd_dev_pci_data(pdev);\n@@ -3873,6 +3873,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,\n #ifdef CONFIG_PCI_IOV\n \tppc_md.pcibios_fixup_sriov = pnv_pci_ioda_fixup_iov_resources;\n \tppc_md.pcibios_iov_resource_alignment = pnv_pci_iov_resource_alignment;\n+\tppc_md.pcibios_sriov_enable = pnv_pcibios_sriov_enable;\n+\tppc_md.pcibios_sriov_disable = pnv_pcibios_sriov_disable;\n #endif\n \n \tpci_add_flags(PCI_REASSIGN_ALL_RSRC);\n","prefixes":["v2","1/2"]}