From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0077.outbound.protection.outlook.com [104.47.32.77]) by dpdk.org (Postfix) with ESMTP id C649969C3 for ; Fri, 3 Mar 2017 08:13:42 +0100 (CET) Received: from CY1PR03CA0012.namprd03.prod.outlook.com (10.174.128.22) by BY2PR03MB1941.namprd03.prod.outlook.com (10.164.114.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16; Fri, 3 Mar 2017 07:13:38 +0000 Received: from BN1BFFO11FD019.protection.gbl (2a01:111:f400:7c10::1:127) by CY1PR03CA0012.outlook.office365.com (2603:10b6:600::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12 via Frontend Transport; Fri, 3 Mar 2017 07:13:37 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; caviumnetworks.com; dkim=none (message not signed) header.d=none; caviumnetworks.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD019.mail.protection.outlook.com (10.58.144.82) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.933.11 via Frontend Transport; Fri, 3 Mar 2017 07:13:37 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v237D50C005035; Fri, 3 Mar 2017 00:13:34 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 3 Mar 2017 18:16:26 +0530 Message-ID: <1488545223-25739-10-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> References: <1487205586-6785-1-git-send-email-hemant.agrawal@nxp.com> <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131329988181309888; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39450400003)(39410400002)(39860400002)(39380400002)(39840400002)(39400400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(53936002)(305945005)(86362001)(104016004)(6916009)(5003940100001)(50226002)(105606002)(356003)(36756003)(38730400002)(92566002)(85426001)(50466002)(5660300001)(110136004)(8676002)(626004)(2906002)(50986999)(54906002)(106466001)(4326008)(47776003)(81166006)(48376002)(33646002)(8936002)(189998001)(76176999)(8656002)(77096006)(6666003)(2351001)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB1941; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD019; 1:2I/19ug0qu4TnEQkdbrJqPYvXT6/D2du4eIOMRzr1Y2BFBnPq/2qmk1zN02PW8FNy31bJE4nS17Ej22QnwTzPR3bDMeLOcbhd5xwmY+M5RXp4bEZuVwgKqPWzI/Cccuezlso6jZsCNlC5gByH92qZyG8Wz6J5/bTkfQx9szmP56eujFifdx3kg0ydkARxuEF/mtJnx+vcgWUm+fwQmcAWpV52FWSE5cyjDFxBFwWMWH9HvxDz6V+50qlVzMGYZPq6BzTyZNaZ4F9V8vukVHO9ZL4dMK/j1IqN29FxanU+pD6LDc7VHPBKHbtUthxRcP0iWqQz8fNpUVwXFFFg/QrN39M9Hh+5rtw2dVAOqDBe/fKA4qpi51tcTYP+jjeyfm0TfdNRwE0e7Wyp5ViUEmVJo54xgqBz7DYWsnq/snt6meLRQR0kTKq1UkqwSTOhpFO4TXpGGZ8ZXMI1JZxB5pu9ij8aFHGV5+fxf0P6YsAApzoYS9jBfdw5c43y5b7TETGXbodbcH5dFyZ7IjVfm42mxBsOIm7LXHbLpxglrTB9QUz7A3Xro0vnfhzrlnx4uPX6Pf9qhG1OTI95ziwRy4nuisOmFTANA80VYZQi/n596tWLQ7p57D09lkIkgVEKiRx0Zh284c1vUpiLAgWnRb6CA== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: ce8a6055-1ef6-4191-d860-08d46204d05b X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BY2PR03MB1941; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1941; 3:IyCLkaCLLdwfJiDQV8KT6SVkBdy9Jo9F9QYPbntSVGKlss63kqKzsLWZXVri6MGJBMFN9JKGYmhYciMOfifqXBj5ySDZDREfYdDxtyqOsxH6h4saJ7ZFywCSu6u+tLC7fcQVNog+bx4phD9IOyBx5xCkfMhrvP50EK0N3Gk7qEvMMjfpjJ2ScK5KusF7VgZbQzx8tGcJpJDTQ4XAcxrYa5zJCt0vzC2lD9/0XKtQMbbfrv/YnBC6JKP2Jjw5mGXXZHqZjb0d75rMy968foWBV5h1LBqoTAIUwG7/Xu6FFLha2WbYeCjn16JoXU2yrbkahku886ygGmYs5X/gkqf/Hwc0GSQKmIQJfTwzQ3SMAuRCL/6HtVZMa2fVvHO/xv53; 25:fQQkZI8sNcNkHOIH3YVRkMA8Eng1SBcGIsglbx6oG0vUYUy5gqHLUp82FhskFGE7HNjLSbVvI9E6g6ESOuLWtg5oVq9JVvGaqiSnOyI57h3O8EbDx8L1S8QzTx0X9vB+sAWZkbdAiJWPAG60a/ojxg63Daa2cJAZSS8eWG7UKUi+net96LhiIqgGj2u1+641PQ7Mxaj1GPiNtRnS+06PkJCdtL/FrHE7GiPmopusAQDewIncj2GwA+SO5kWt9/w9Njg48JIB/PRVh+7yv9uEIAqEzlNu4A0SB/j92N1sZKQOkKeNPsURcoRA7nyJGQ4yE+AKgsVnXl1WFGrxt94pOS6YDz2FfgMH5oAMWcCNS/mxZKjBBYjQ1v7nWFrKppOULD++h+chImpLke+RTLtX4yQw9dAnuSuStEbdBA9KmrUVAosfY+NGAM+KyQy5uCNIwZ7PmcVqhh8ySk5i4KCiVA== X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1941; 31:FtibxoLZunakdDe5xS7QPkcMWm7avZKjjqTMZqQ2Jhv0ohrKGKcHEEQPZ2VBzWb44FO8hnt1+pzvUGOxEj7hVm3okNFwT+Q/pfF5zBfhpphryFg4hWrWumMAmcFfIueFk/VQf9sHrg8geaBJO/ME/VqidTtAeTOFqlaOhJwIu3I9CKkVd1JQTzbdcejEQlMxMIx8+TX5UK1ZdUbdsAhhhjPez3fvhGCxd52iLVTT//jIl9WtnBOFdZgdmMphhPLHBpgHhvgYIvcGQ02cpRDmxxFwLhjz3HJvELeRInrhUjQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13018025)(8121501046)(13015025)(13024025)(13017025)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123559025)(20161123556025)(20161123561025)(20161123563025)(20161123565025); SRVR:BY2PR03MB1941; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB1941; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1941; 4:b1LROcaONBlKtUyblkH1G1vdsGdhLj1hL+h8yCw+Uq3xkhU3fcMnCp1DKvyO2p19m5BlyxvHyCfKIbmmMNZh9Abzpm4f3wbOOQJHGTtzUTN+JixrKfOanTsI/9YF6lcsk+OBXMK9sQOhZh3pAGLV0S7B7M6XsBQhxTMb5ojW4Ymu62lNBVYENiqbdOxpD9b9cEwaYUt5MA7opZ9Hl6ZSMoonG8ezfYVo/l129pxmlQY89JlWTlRZDBm4brSKldKoV2eh+GJ4scuTbqBAIF1IrSozraqJnijSjynxjcIn6PRLX4ri6Wz5sxQMBLttg7AQTFNdxx1WaQRlXULdU51EXlKw8ZRScAS6m+O1GSm/LJGfaMzYCypsOUS6Uak+8uZQrrXS4oU6hMbI3LRon7Rc6YuC0Eh9wCdM4IepzbV5O4cqutOXImhMTKEtdl+gXBqqE0qhwV022n1nIzgXZitNlZQN0haZ+u+RtRntHAdPRfg9TK9IbO4ALAnLD/AB7rM2/enJsn5GoeDkPe42tGmssWyxBUrOKYno9VZrUCDioGG9xw5/l/00XU4OMjp6AKUNKXvF9huD3UycN9sJZ/LKM9v6cqCJSPK2sYmNeANwHomk2xH4CeQEyF1e2acgjf1uOzHLfIJWDhC4ozmk45rve2cFLMjn/ggXuZsZc0slegO0blwGOmaLACoVWyemj/kzhVhu+CGKYpgRSaigu1jbADIZ+tlqCftyWwAcMpJPObpmppIEWu9/ZyVSlNtK9EKXI4dnYAl6SI8WqTVaqp7xhc40mPU0DMrmSZDpNXPZ8DAHl9Z554YZwojnW7idVlNQ X-Forefront-PRVS: 0235CBE7D0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB1941; 23:CIMpBLh5b3dvjyRWAOgSuJhr+bBELYCIrxTcrTXiZ?= =?us-ascii?Q?70ae4UTS6zuRZXU4WZ4YHy7TYW+rezj3HAjR8NsEycv0gczjAq8FfuutoZbU?= =?us-ascii?Q?gUI3X0q/C0A1KQLjdu++4jzKhpvHkONK9iDybrmLA8jMh+gv24ZaB/+DomBN?= =?us-ascii?Q?aDHOKGs7QvHPMcWEaB8uUKDSYBFLG3yciD6pNox1orvdf3m7fMTLoMJTfnVZ?= =?us-ascii?Q?7YV9516P4ogikxjX5/9Ja1N2rOAkDYLQG5+W6Q2NRGyKF2+9Di/AOz+H98Mv?= =?us-ascii?Q?jRBPizPMk958+3DXB0rkZwWp5KLmNQcNbpXhOQZW113cXVLLFECKu/3a7AJh?= =?us-ascii?Q?2eCaDxiowsWlxi73l28/Gt5sb9iu/T9kQgkh7sYI6pXiDG65gcE5ZFsUWpqJ?= =?us-ascii?Q?t3q7bowsQe1PZ/CsMfeIU6wrE2G7X8+ufvET5VgDim07fjNTDrop3tmkaVaj?= =?us-ascii?Q?QVlpu6LqBl60gcQnSF036LBsXxYz3txnFnRS8N5aJrOMEYepRWmmvn5n2ow7?= =?us-ascii?Q?ZeesO+E4Sdn+GW5JnbeYnaX8f9MKsvcxCQwS0VkHgjIgpJXwhRMRPvbJRXsX?= =?us-ascii?Q?lykriQbFNORPTpgxiAcc6TcKWuQwl7a+YdxX3XgBWVm+cZ6bhOabzmpVTaRK?= =?us-ascii?Q?eYcp3C/D9JZeHb6RD0CquA6ggnjnUj1o3GFYP+wtSqXy/NSbECca1Eym1ntx?= =?us-ascii?Q?D3c4yr4JKFgae6e9UqcmDLN9vA7fEwghsE36DQKRK6/pWTIHeEY807AnLbVw?= =?us-ascii?Q?rurYH/A/lhOZVwRfjTYm80pgxgdx8xejh3FvZu6+8lhOeIamT6bvg8TSOueZ?= =?us-ascii?Q?aNnRsNq/Jg0LpekrbvJQyuKBLzUXLIaDp6miEWi9ZBBObpdV4ePBnhq9n15+?= =?us-ascii?Q?BchvuLTSBmDFEZKojWHhWxxN2p5MolZJ7Jn3e+49NJ/Ya22+nUusWDRTxzIu?= =?us-ascii?Q?EdqVgH2vLcCtH3tL5uF5cZTVkF4+ZI0mVg1Jz23Y5Ms6KZaY3ayf6vnRDEtu?= =?us-ascii?Q?TwK4T5cl/nowYGEqRhxsqTjgCqTqakSgw+GWBqgrt41UJY4NwyM/QkJPC7/O?= =?us-ascii?Q?g/v09L8C2KqRKLioU/0yfTHGQesLQ3jE7BLSCZk+77SSDpU09qHqqmxRz8P+?= =?us-ascii?Q?0yAKtZ9EKiCWO8V55j2RBnQeqqQwutEpigY1Q+qj7YaBoSOwLrxLavMj/QzG?= =?us-ascii?Q?rKnFkJw3A4tQEfIeHfflJo/tV9omGld2UDkcofDa0J1Vs3WJzByHIIKFsnXt?= =?us-ascii?Q?SwGz5CIAPMR0qaWZ/o5ZMSWQ3vQiutInq3WQrZ5?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1941; 6:cVi9BAq57bIloo7kPldGxSs0lEP7LrgO3gXj0/iRvN6BBydf/QqfwQIwHUi/G7QkFp5xpsbpkGdAC4PNQ2cm2/zU7x6GVdf+lv2KWUvUIsYSh1u53YdJ1AOtMh+Qx0h9o8sBxhTzIxDycqQ/wY5JhkHyymEipEz+4kR7rfc12RIabwPJ4/zGDIXo9hU3wpfxfKYVaeU2xtybhirjZk5F2wY5mY6niBVJOTxg63u04M1ZC/ezzIYu1/mRrw85tIHw8dIrfhJ0Ax+k27xLJtNsPNoPZZ+LoHl/CKDwuVlTnxkjOMTy2bYENiomzAk70AzVb+colmgk/i59DuEfkBfT9+jBK+bBCFA0IrQe75GzwUhuUo9yFNqUc6M3wfjGnN4UGdr+t1NP/vQVo8dHOpO/OASPolx8Kxk1rkpZ1ZsDojM=; 5:HDk3Kg6IpCjthbBydW1iqrt5AaEOEkh9Hf65UEiSGkVYoBh0vrw3J3Dqy57k3yJJ/QS/NnaBv41jCD05zw6V30vvuoxlC71RZBPVcI8ZUjIzAzF27JuV+Cfp9fpZL5WQyR8EwnW0+z+FZvsRXx59QosSYmegTATIscr6ill989EDl5fZsksWmCvafp2XfJFX; 24:2gQtwbPGpX9yuMmlNWFNoBCv0kowddr8cpitgYn8pjairFYwf+MhYEKA/jBP6LnajPW/MAKHIq2ZFGxFbpPa9L77fiKvXULfBMYdkj8ssU8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB1941; 7:vB0XfYq2jCY84zKTACty5uwsklFYU3IPI/DXRomxXLaxHMvJdZZ+pXj1lZu8P3nT5A+PAwTFeRvrVytcbvK1Bryh19aO79aOrodGIetN8w7lIH+GF0N6edQyxmm6cdkLG9KDfXKK7wKTA87YB4EQZlp6Zvn2Mg1P+ANz0y6eAd/NE6S+wcK2gOEAjFEuVUb4zUrXWtPZA+fwUGiyhkctWGmma7EHd7ysdltvk3cHcKCAERbeb39/Ain9oYjYhliZlw8Sfc50d39p3EBqMUlpQnkn7I/C0hPCazNlrZYXwz5+gdjSzTxMbLVqa8QzilTFqErR3gsqX3KEEjDl6wJTEQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2017 07:13:37.9281 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB1941 Subject: [dpdk-dev] [PATCHv8 09/46] bus/fslmc: add vfio support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 07:13:43 -0000 Add support for using VFIO for dpaa2 based fsl-mc bus. There are some differences in the way vfio used for fsl-mc bus from the eal vfio. - The scanning of bus for individual objects on the basis of the DPRC container. - The use and mapping of MC portal for object access With the evolution of bus model, they canbe further aligned with eal vfio code. Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/Makefile | 1 + drivers/bus/fslmc/fslmc_bus.c | 10 + drivers/bus/fslmc/fslmc_vfio.c | 450 ++++++++++++++++++++++++++++ drivers/bus/fslmc/fslmc_vfio.h | 74 +++++ drivers/bus/fslmc/rte_bus_fslmc_version.map | 1 + 5 files changed, 536 insertions(+) create mode 100644 drivers/bus/fslmc/fslmc_vfio.c create mode 100644 drivers/bus/fslmc/fslmc_vfio.h diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile index d30cea9..90edaad 100644 --- a/drivers/bus/fslmc/Makefile +++ b/drivers/bus/fslmc/Makefile @@ -68,6 +68,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ mc/dpio.c \ mc/mc_sys.c +SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c # library dependencies diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 8a4f519..ee794e7 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -42,6 +42,7 @@ #include #include "rte_fslmc.h" +#include "fslmc_vfio.h" #define FSLMC_BUS_LOG(level, fmt, args...) \ RTE_LOG(level, EAL, "%s(): " fmt "\n", __func__, ##args) @@ -51,6 +52,15 @@ static int rte_fslmc_scan(void) { + if (fslmc_vfio_setup_group()) { + FSLMC_BUS_LOG(ERR, "fslmc: Unable to setup VFIO"); + return -1; + } + if (fslmc_vfio_process_group()) { + FSLMC_BUS_LOG(ERR, "fslmc: Unable to setup devices"); + return -1; + } + RTE_LOG(INFO, EAL, "fslmc: Bus scan completed\n"); return 0; } diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c new file mode 100644 index 0000000..73db595 --- /dev/null +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -0,0 +1,450 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (c) 2016 NXP. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Freescale Semiconductor, Inc nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "rte_fslmc.h" +#include "fslmc_vfio.h" + +#define VFIO_MAX_CONTAINERS 1 + +#define FSLMC_VFIO_LOG(level, fmt, args...) \ + RTE_LOG(level, EAL, "%s(): " fmt "\n", __func__, ##args) + +/** Pathname of FSL-MC devices directory. */ +#define SYSFS_FSL_MC_DEVICES "/sys/bus/fsl-mc/devices" + +/* Number of VFIO containers & groups with in */ +static struct fslmc_vfio_group vfio_groups[VFIO_MAX_GRP]; +static struct fslmc_vfio_container vfio_containers[VFIO_MAX_CONTAINERS]; +static int container_device_fd; +void *(*rte_mcp_ptr_list); +static uint32_t mcp_id; + +static int vfio_connect_container(struct fslmc_vfio_group *vfio_group) +{ + struct fslmc_vfio_container *container; + int i, fd, ret; + + /* Try connecting to vfio container if already created */ + for (i = 0; i < VFIO_MAX_CONTAINERS; i++) { + container = &vfio_containers[i]; + if (!ioctl(vfio_group->fd, VFIO_GROUP_SET_CONTAINER, + &container->fd)) { + FSLMC_VFIO_LOG(INFO, "Container pre-exists with" + " FD[0x%x] for this group", + container->fd); + vfio_group->container = container; + return 0; + } + } + + /* Opens main vfio file descriptor which represents the "container" */ + fd = vfio_get_container_fd(); + if (fd < 0) { + FSLMC_VFIO_LOG(ERR, "Failed to open VFIO container"); + return -errno; + } + + /* Check whether support for SMMU type IOMMU present or not */ + if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU)) { + /* Connect group to container */ + ret = ioctl(vfio_group->fd, VFIO_GROUP_SET_CONTAINER, &fd); + if (ret) { + FSLMC_VFIO_LOG(ERR, "Failed to setup group container"); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU); + if (ret) { + FSLMC_VFIO_LOG(ERR, "Failed to setup VFIO iommu"); + close(fd); + return -errno; + } + } else { + FSLMC_VFIO_LOG(ERR, "No supported IOMMU available"); + close(fd); + return -EINVAL; + } + + container = NULL; + for (i = 0; i < VFIO_MAX_CONTAINERS; i++) { + if (vfio_containers[i].used) + continue; + FSLMC_VFIO_LOG(DEBUG, "Unused container at index %d", i); + container = &vfio_containers[i]; + } + if (!container) { + FSLMC_VFIO_LOG(ERR, "No free container found"); + close(fd); + return -ENOMEM; + } + + container->used = 1; + container->fd = fd; + container->group_list[container->index] = vfio_group; + vfio_group->container = container; + container->index++; + return 0; +} + +int vfio_dmamap_mem_region(uint64_t vaddr, + uint64_t iova, + uint64_t size) +{ + struct fslmc_vfio_group *group; + struct vfio_iommu_type1_dma_map dma_map = { + .argsz = sizeof(dma_map), + .flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE, + }; + + dma_map.vaddr = vaddr; + dma_map.size = size; + dma_map.iova = iova; + + /* SET DMA MAP for IOMMU */ + group = &vfio_groups[0]; + if (ioctl(group->container->fd, VFIO_IOMMU_MAP_DMA, &dma_map)) { + FSLMC_VFIO_LOG(ERR, "VFIO_IOMMU_MAP_DMA (errno = %d)", errno); + return -1; + } + return 0; +} + +static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj) +{ + int64_t v_addr = (int64_t)MAP_FAILED; + int32_t ret, mc_fd; + + struct vfio_device_info d_info = { .argsz = sizeof(d_info) }; + struct vfio_region_info reg_info = { .argsz = sizeof(reg_info) }; + + /* getting the mcp object's fd*/ + mc_fd = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, mcp_obj); + if (mc_fd < 0) { + FSLMC_VFIO_LOG(ERR, "error in VFIO get device %s fd from group" + " %d", mcp_obj, group->fd); + return v_addr; + } + + /* getting device info*/ + ret = ioctl(mc_fd, VFIO_DEVICE_GET_INFO, &d_info); + if (ret < 0) { + FSLMC_VFIO_LOG(ERR, "error in VFIO getting DEVICE_INFO"); + goto MC_FAILURE; + } + + /* getting device region info*/ + ret = ioctl(mc_fd, VFIO_DEVICE_GET_REGION_INFO, ®_info); + if (ret < 0) { + FSLMC_VFIO_LOG(ERR, "error in VFIO getting REGION_INFO"); + goto MC_FAILURE; + } + + FSLMC_VFIO_LOG(DEBUG, "region offset = %llx , region size = %llx", + reg_info.offset, reg_info.size); + + v_addr = (uint64_t)mmap(NULL, reg_info.size, + PROT_WRITE | PROT_READ, MAP_SHARED, + mc_fd, reg_info.offset); + +MC_FAILURE: + close(mc_fd); + + return v_addr; +} + +/* Following function shall fetch total available list of MC devices + * from VFIO container & populate private list of devices and other + * data structures + */ +int fslmc_vfio_process_group(void) +{ + struct fslmc_vfio_device *vdev; + struct vfio_device_info device_info = { .argsz = sizeof(device_info) }; + char *temp_obj, *object_type __rte_unused, *mcp_obj, *dev_name; + int32_t object_id, i, dev_fd; + DIR *d; + struct dirent *dir; + char path[PATH_MAX]; + int64_t v_addr; + int ndev_count; + struct fslmc_vfio_group *group = &vfio_groups[0]; + static int process_once; + + /* if already done once */ + if (process_once) { + FSLMC_VFIO_LOG(DEBUG, "Already scanned once - re-scan " + "not supported"); + return 0; + } + process_once = 0; + + sprintf(path, "/sys/kernel/iommu_groups/%d/devices", group->groupid); + + d = opendir(path); + if (!d) { + FSLMC_VFIO_LOG(ERR, "Unable to open directory %s", path); + return -1; + } + + /*Counting the number of devices in a group and getting the mcp ID*/ + ndev_count = 0; + mcp_obj = NULL; + while ((dir = readdir(d)) != NULL) { + if (dir->d_type == DT_LNK) { + ndev_count++; + if (!strncmp("dpmcp", dir->d_name, 5)) { + if (mcp_obj) + free(mcp_obj); + mcp_obj = malloc(sizeof(dir->d_name)); + if (!mcp_obj) { + FSLMC_VFIO_LOG(ERR, "mcp obj:Unable to" + " allocate memory"); + return -ENOMEM; + } + strcpy(mcp_obj, dir->d_name); + temp_obj = strtok(dir->d_name, "."); + temp_obj = strtok(NULL, "."); + sscanf(temp_obj, "%d", &mcp_id); + } + } + } + closedir(d); + + if (!mcp_obj) { + FSLMC_VFIO_LOG(ERR, "DPAA2 MCP Object not Found"); + return -ENODEV; + } + RTE_LOG(INFO, EAL, "fslmc: DPRC contains = %d devices\n", ndev_count); + + /* Allocate the memory depends upon number of objects in a group*/ + group->vfio_device = (struct fslmc_vfio_device *)malloc(ndev_count * + sizeof(struct fslmc_vfio_device)); + if (!(group->vfio_device)) { + FSLMC_VFIO_LOG(ERR, "vfio device: Unable to allocate memory\n"); + free(mcp_obj); + return -ENOMEM; + } + + /* Allocate memory for MC Portal list */ + rte_mcp_ptr_list = malloc(sizeof(void *) * 1); + if (!rte_mcp_ptr_list) { + FSLMC_VFIO_LOG(ERR, "portal list: Unable to allocate memory!"); + free(mcp_obj); + goto FAILURE; + } + + v_addr = vfio_map_mcp_obj(group, mcp_obj); + free(mcp_obj); + if (v_addr == (int64_t)MAP_FAILED) { + FSLMC_VFIO_LOG(ERR, "Error mapping region (errno = %d)", errno); + goto FAILURE; + } + + FSLMC_VFIO_LOG(DEBUG, "DPAA2 MC has VIR_ADD = %ld", v_addr); + + rte_mcp_ptr_list[0] = (void *)v_addr; + + d = opendir(path); + if (!d) { + FSLMC_VFIO_LOG(ERR, "Unable to open %s Directory", path); + goto FAILURE; + } + + i = 0; + FSLMC_VFIO_LOG(DEBUG, "DPAA2 - Parsing devices:"); + /* Parsing each object and initiating them*/ + while ((dir = readdir(d)) != NULL) { + if (dir->d_type != DT_LNK) + continue; + if (!strncmp("dprc", dir->d_name, 4) || + !strncmp("dpmcp", dir->d_name, 5)) + continue; + dev_name = malloc(sizeof(dir->d_name)); + if (!dev_name) { + FSLMC_VFIO_LOG(ERR, "name: Unable to allocate memory"); + goto FAILURE; + } + strcpy(dev_name, dir->d_name); + object_type = strtok(dir->d_name, "."); + temp_obj = strtok(NULL, "."); + sscanf(temp_obj, "%d", &object_id); + FSLMC_VFIO_LOG(DEBUG, " - %s ", dev_name); + + /* getting the device fd*/ + dev_fd = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, dev_name); + if (dev_fd < 0) { + FSLMC_VFIO_LOG(ERR, "VFIO_GROUP_GET_DEVICE_FD error" + " Device fd: %s, Group: %d", + dev_name, group->fd); + free(dev_name); + goto FAILURE; + } + + free(dev_name); + vdev = &group->vfio_device[group->object_index++]; + vdev->fd = dev_fd; + vdev->index = i; + i++; + /* Get Device inofrmation */ + if (ioctl(vdev->fd, VFIO_DEVICE_GET_INFO, &device_info)) { + FSLMC_VFIO_LOG(ERR, "DPAA2 VFIO_DEVICE_GET_INFO fail"); + goto FAILURE; + } + } + closedir(d); + + return 0; + +FAILURE: + free(group->vfio_device); + group->vfio_device = NULL; + return -1; +} + +int fslmc_vfio_setup_group(void) +{ + struct fslmc_vfio_group *group = NULL; + int groupid; + int ret, i; + char *container; + struct vfio_group_status status = { .argsz = sizeof(status) }; + + /* if already done once */ + if (container_device_fd) + return 0; + + container = getenv("DPRC"); + + if (container == NULL) { + FSLMC_VFIO_LOG(ERR, "VFIO container not set in env DPRC"); + return -1; + } + /* get group number */ + ret = vfio_get_group_no(SYSFS_FSL_MC_DEVICES, container, &groupid); + if (ret == 0) { + RTE_LOG(WARNING, EAL, "%s not managed by VFIO, skipping\n", + container); + return 1; + } + + /* if negative, something failed */ + if (ret < 0) + return -1; + + FSLMC_VFIO_LOG(DEBUG, "VFIO iommu group id = %d", groupid); + + /* Check if group already exists */ + for (i = 0; i < VFIO_MAX_GRP; i++) { + group = &vfio_groups[i]; + if (group->groupid == groupid) { + FSLMC_VFIO_LOG(ERR, "groupid already exists %d", + groupid); + return 0; + } + } + + /* get the actual group fd */ + group->fd = vfio_get_group_fd(groupid); + if (group->fd < 0) + return -1; + + /* + * at this point, we know that this group is viable (meaning, + * all devices are either bound to VFIO or not bound to anything) + */ + + if (ioctl(group->fd, VFIO_GROUP_GET_STATUS, &status)) { + FSLMC_VFIO_LOG(ERR, " VFIO error getting group status"); + close(group->fd); + return -1; + } + if (!(status.flags & VFIO_GROUP_FLAGS_VIABLE)) { + FSLMC_VFIO_LOG(ERR, "VFIO group not viable"); + close(group->fd); + return -1; + } + /* Since Group is VIABLE, Store the groupid */ + group->groupid = groupid; + + /* check if group does not have a container yet */ + if (!(status.flags & VFIO_GROUP_FLAGS_CONTAINER_SET)) { + /* Now connect this IOMMU group to given container */ + if (vfio_connect_container(group)) { + FSLMC_VFIO_LOG(ERR, "VFIO error connecting container" + " with groupid %d", groupid); + close(group->fd); + return -1; + } + } + + /* Get Device information */ + ret = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, container); + if (ret < 0) { + FSLMC_VFIO_LOG(ERR, "VFIO error getting device %s fd from" + " group %d", container, group->groupid); + return ret; + } + container_device_fd = ret; + FSLMC_VFIO_LOG(DEBUG, "VFIO Container FD is [0x%X]", + container_device_fd); + + return 0; +} diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h new file mode 100644 index 0000000..5e58211 --- /dev/null +++ b/drivers/bus/fslmc/fslmc_vfio.h @@ -0,0 +1,74 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (c) 2016 NXP. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Freescale Semiconductor, Inc nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _FSLMC_VFIO_H_ +#define _FSLMC_VFIO_H_ + +#include "eal_vfio.h" + +#define DPAA2_VENDOR_ID 0x1957 +#define DPAA2_MC_DPNI_DEVID 7 +#define DPAA2_MC_DPSECI_DEVID 3 + +#define VFIO_MAX_GRP 1 + +typedef struct fslmc_vfio_device { + int fd; /* fslmc root container device ?? */ + int index; /*index of child object */ + struct fslmc_vfio_device *child; /* Child object */ +} fslmc_vfio_device; + +typedef struct fslmc_vfio_group { + int fd; /* /dev/vfio/"groupid" */ + int groupid; + struct fslmc_vfio_container *container; + int object_index; + struct fslmc_vfio_device *vfio_device; +} fslmc_vfio_group; + +typedef struct fslmc_vfio_container { + int fd; /* /dev/vfio/vfio */ + int used; + int index; /* index in group list */ + struct fslmc_vfio_group *group_list[VFIO_MAX_GRP]; +} fslmc_vfio_container; + +int vfio_dmamap_mem_region( + uint64_t vaddr, + uint64_t iova, + uint64_t size); + +int fslmc_vfio_setup_group(void); +int fslmc_vfio_process_group(void); + +#endif /* _FSLMC_VFIO_H_ */ diff --git a/drivers/bus/fslmc/rte_bus_fslmc_version.map b/drivers/bus/fslmc/rte_bus_fslmc_version.map index b6979e8..463c658 100644 --- a/drivers/bus/fslmc/rte_bus_fslmc_version.map +++ b/drivers/bus/fslmc/rte_bus_fslmc_version.map @@ -35,6 +35,7 @@ DPDK_17.05 { qbman_swp_send_multiple; rte_fslmc_driver_register; rte_fslmc_driver_unregister; + rte_mcp_ptr_list; local: *; }; -- 1.9.1