From patchwork Fri Mar 17 12:36:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 21847 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 0BA39CF7A; Fri, 17 Mar 2017 13:42:38 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0085.outbound.protection.outlook.com [104.47.40.85]) by dpdk.org (Postfix) with ESMTP id 13838CF7A for ; Fri, 17 Mar 2017 13:37:24 +0100 (CET) Received: from BLUPR0301CA0007.namprd03.prod.outlook.com (10.162.113.145) by BLUPR03MB183.namprd03.prod.outlook.com (10.255.212.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.961.17; Fri, 17 Mar 2017 12:37:22 +0000 Received: from BL2FFO11FD038.protection.gbl (2a01:111:f400:7c09::187) by BLUPR0301CA0007.outlook.office365.com (2a01:111:e400:5259::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.977.11 via Frontend Transport; Fri, 17 Mar 2017 12:37:22 +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 BL2FFO11FD038.mail.protection.outlook.com (10.173.161.134) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.961.10 via Frontend Transport; Fri, 17 Mar 2017 12:37:19 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2HCalHv023358; Fri, 17 Mar 2017 05:37:16 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 17 Mar 2017 18:06:28 +0530 Message-ID: <1489754201-1027-10-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489754201-1027-1-git-send-email-hemant.agrawal@nxp.com> References: <1489754201-1027-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131342278422549349; (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)(336005)(39860400002)(39450400003)(39380400002)(39410400002)(39400400002)(39840400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(106466001)(54906002)(53936002)(81166006)(38730400002)(81156014)(8656002)(77096006)(5660300001)(2351001)(105606002)(33646002)(47776003)(50466002)(8676002)(110136004)(85426001)(104016004)(50226002)(8936002)(4326008)(76176999)(356003)(305945005)(50986999)(189998001)(2906002)(48376002)(5003940100001)(36756003)(6666003)(6916009)(575784001)(86362001)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB183; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD038; 1:+AXM9opYOXOSsPYjmCbrUwt6GxHYsgC/dGI4QM3e7pIVFAZzUlo6pe59AadxSF9x0kOKEb0+2qen/XJtvDRB2FqxmxBBIxK43TYK0toVAeP3auzWujz5CRW6LFSmqQZhWgYttjHiEQRQvmGF6+utQuPrkCBYli/zrEn3dYgB4fowbqtgWyN1tqTnVlFgbASamBS2jD/e0i+9PYfqTWfgvlC5BsiQHGUG0ZsQFCpqOxxXR9s+1gWM0EpkMmbsoSaUW3XcBfBj/HIkgkmmpeTRsYaAtD2gSnfMdqn2Z4WytWJ6Lg6wskMhkHLQEL/nB7sMEo1RcCJnAaXtEMVyKcuStVNlhr4AGM4arw+zWMvCSo1AwVt0JZ5cHh3PI5bb/lAwlqB4Z5DpvJOEm8PaokSATt5KnlWV7eFI5v3mLK3KQPKPU8Q/lVPjxMajUMaq17RDk1/4cLcw+YbviyELlQTT/XqI6EUYo6KDwO6ujJ/8JrYdlNj2XLxpihB+RGpn2Uye8uCbiHnkCPsx/QwQEVyCm/v9oCLTHjDGpXSVa6XyneWDBDH6SK6misDwxonoywmtAh8zNBhUQd+rSZNLia8qWnN0DFrYkoq7cufSYzZahV9oYpZOHszlfBonOAv8/jK9KQKtrfPElZ8crE4o9cd++w== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 67c58d36-f95e-4239-d365-08d46d325bd4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BLUPR03MB183; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB183; 3:aJjHIqv/PfRmIjBInQdcistXlWaqWKAJjKBoho4zFN7MF26TmWFg+6+eNmhpzuerv7+07XfGeF6b3p0o6X1I+7K4XVg8hoNRyudciETG9GQtHL0y6fuAfi7pGsarJXoWF9px2jwHVo2c3PVgmAadUlip9M40drckm1E7VQ7c5jSTq7pD+UENh8sWRReOIhFgNyzK1LIM1nvN1jAwmta2XWu3hSBNcygdk5/awI8NY1uUEoivvJZderYoPzee2oOy5AXhHxB9wz9FJ4ga6ajdQQjmi0cD0yvwJvhwhTk+rmg3Dywmv/ywt/nm+zj+m/Gp0j5Tm5OYE86sQsZazS4VTGz0mnDsSbfm8KypYeHOf8q+aTz7+49Y1rS+vsDKmvKs; 25:wjB+QCYWPX6CQzGdeCz3BP70clLnoB3VFJSjVWYXPWLewYijyHoVaDB170eEEYaeo/x0fzC+wy3Jy8+VwwZ4xK9B8tyjPZa5IoSb4/QybpFYV9hjDByFF+X4aMQBSikZT/yp0Gkv7oJtiyDDfWNXsizbh47sZhDhpXlnD2cFaPHvNlH+gZXKFtsCH/I+TmrpR18kG30gK7TOhWI6J0OHL6hjjfK6OnD+dMMexCaBzjIZ/BPav/i60xsLTgzRlrBKph0x6BYOB17ByDNZqK5DDdwBJLuqVJT01v0KtEKCcUKVecgprhQYTauDgOnlug009LB3s7R2iVPxWclCFXtVV5EsFPiRtz8UKpvx6rQKBgKId3hiHQf9YCVuq2ijCm8mdLaGUtGm8Aas8GYeSA6fMeJAGIVtUCLKwht36NEH8lQGJXN5jalUu4pbee9Giq0FcWka7bqElYbyhCHQbZ4D/Q== X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB183; 31:WGWkOEIN4RlVcxuTyTTq8dmOhkm2pUMuC/L61OMTHZxJMeV9mZDGWAqhx0w3nBYDxKwcGWXN2/tQHpjidKJwSUXJhN+wuqWjFQExp3bpdAGs4gy1lZnDoOtwMc/+V/R42DvkltiYZV/6t1g9khJjxMW9ttm2DJREFqhSPTf8wLH71/Na6Sa9YurZYq7s5wgK+31Z4cZpqKPkIlmuNWzIPg75LjEjIUx3Gi+fcXY3YmniP5kqYNY2t2969vRqoXotyM5/OUd3S8AOS05B6RlBFA== 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)(5005006)(13015025)(8121501046)(13017025)(13024025)(13023025)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123563025)(20161123565025)(20161123559025)(20161123561025); SRVR:BLUPR03MB183; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB183; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB183; 4:USJLwzLI9Q83kIrVUk8B/Sh8Yw5y3S74McVbSs8GZuKkafAJMs2CwtrWt8Au2lVTNYeq1k6f2hq5NNHAblwFKBXx3YRRyucOBsPOib85/eZhehsFGMF2J4TBM3l5K9ftH2J1NxmAGFbCUOBXibAoVRhmSnTJOdlt10cLsQDydTrKo7JyXOGU8pBePkKPralGFML17RkZgqUnMMH8RZ+5pzbvdzw2hUIDyuoyhY3v1oVNm46dKiAHawAh7WMgDKYzAKuhBOcJSvQjx+T6cKGpz836kJDl4PWIUYwMbHI48tMGuHS8CfVa+n3XIwkpt9IfpODbUYYkynOzT0JsJWMRakCui7Z1AHnZVdktuA3FQfpgU+v2Bm9+JMz0LKyrg/jGAF9qLh0i9Kz1V/E3OM5BOC0htvVLEf+KGwSyUgf8OVtDfbVRF9MJr1+Sf7ME0SeF2MKtwnPbfDmMSIilI5ONLVo0R+Dapupb65lYX9Dk/uZWHNNuptSPFA+dKz9qAW2VED8+Mb1Jmxo1JI1rOfq6VtXut9FNFL/dcLI8/ld7nEsfRJ4Jw/pJ9KnrgcUipQ3WDQ6oZ7atK56Cz7zQF8QwgBc/v97gJNXr8rTwrwDfhsKUANqNHl1IYPPXA8/InmI7NPgj882rPDH47jJp4LAYLTS41E7+UCQEPk7AGtY1Lt/i+QX1qxiYr5Q+Jj92pHaV223aKXuS5DUlI4at7bQYVXuAUBPxqn5LHtsXblavy7gyCT4Dun6zCd05Jnrd5myB762n4JJ9n9kC7iByjiNoU1b1ElirgYhcAheCjgeXWjFQwLR+RMtkF5GctPl1MhDZ X-Forefront-PRVS: 0249EFCB0B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB183; 23:CLDVTun+OpjkGjxcPRCGXOITRQYDcV++Se54WEdBRO?= 3DosGFwKvS91bcvuzBLi0BII0Rth9eK76saGqD9XQXI61mWRBFY+OE/m3w9855rLVkGtOG/Z22YcvE0YbcYd1qxo8AVJMt6+6AXqekZ8/wLMjFQQ1TwQSewWqtlCl7Q4oaVSx8lW3rA9sXdzlWhu56eZa63CHDeTvcY1za7lOG17JQoWum2v8ZWT4wgN4cXLqECXeWMnmFRdGHQPe7iyKny/IvNLytnGkzzPtYJK16ZfdZ2WG+CD1bSj43VWHST54D8wdOODHPAFHPuTV4JGOajWp49r4DpfKEPkF845XWEQBMUdReNSgvj+KQK2q1Yn8xN9NtDlxarsuJ4SnCFM4xWQGZPQHRbQX07T5V7NMhy/UYK1O3hzKDNcBYnLG4DjwYsKdqwviO8hwjjh7SaYbY8IGCofIb19o40rYJmvLjRBZjwLFZJ0BMQPsNy2r8RRg9fUoJsW/FxcMOCuTcXcGFHnIkWJqIGBq5DZ4W8Hy7orFF8qb1I8CwMAc6SI6e+10mHgjmo4rVARcYBHw81IPJ/qVvDk7CASfJcHoGteX/3FJq3gSpFLf9YyGAkHD87j2ya7EpAKiVSPIP11oGC9W8OzH0QP5Db+wcIpCAZh42cot7ZrY5pX8DHW12nUtrxrxwjJyBFTfZwO9c+X7WUWaHouqX4FJMD5XMuqrhBiqxFYvt1F4rMzX6FM/gbIb/3l2OzKcSy5PFb/d78lrOmm5eL6i2fAhg5qzfcCvs/4eCnZzxK1S1rbu0wPQPNK5rPEUfLdZ1Sm4ciIhu49W1qx6oY5qzfgwzLsoEM6aCiXUa+LiD4btT9ztoRwvsH6Yvj6NBIcCQHSy6EiRwVWcRZim+tsa5YqkXu+Q4HgvvOpdwPTM945SW9qr8mLM/UjhKNQpLMBjJ/NACn2p7ZlOo7ekGlL/+72lka+k6lIMReMehHTLbskTzFII6AbWGIHMB5tsNZYwsLV2VH4yYnzXAbOA561kuzueJs0kEJPdrxpbOY9D2VSarmaD2fecJ3i2AyksK45hGAe02FGEpOGRdgguzr1A+svy4PpzVE/NwzCekCmc4LjL/ZsS1iHGBiOjKXLxFlBmqjqxGIGu5qYFHOk4D+W7c2wisgj/W6ELz8bhALESXtEpnXMXaNj8hFe+cfUpPOHi14sye7CdHOw0n9BkysUEvUhr83QKojvA3Z9EuX1WkE73tZGlI0TOrKXAcoOhtkA9yqoF845JECq8Dn6pB X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB183; 6:AZeB8KefpdAU7U295Aqf6DZTCwrQh95t6DPuS4kXjc28FytyIrxCSkLUsQcYPytBOkiSzh24rVOvskPKvhYyvLv4yVp1TIiWJqc0CAJLg12QcbhjuQFKRaF2n1r3zsyrWXRtvitnZVGWd0v+Y0XSCeAqA05T73wJCJ5GQDRwBuBLTzlAABvKm4NITHqKfBnhi4cY87TrNNk57b22YJohYkvm2LD5+rRi55fWWbqlAKmzheNN6NJ7c07bk3GTFh9Otf9AuT48Z0jBkLuRImiDB5zfIcpRhAc3tkotmy4BIRnWK8cZNNaghDKipfY1yF6piDR+su8gvoK4NH75I0lWev593BTJWM4EMqb89MkxP75GQkxM64ZBwt7IK8Rxdfm+1eODp0U5/18jdbhdgpDzGv6fWcZ1XYqNz+UZXffZIJE=; 5:YcN4dHP8ei3Dj7J6fNJDvHdEKGoWAn6sciIuSYfvmvBum6MQWNUQzCnEPk2yXsy7M708dmz+KCTgru4+K7mhEHgYQo481iEw1ukgV8L9f0GN/3yq3DKi9GNIWlyEHn+xtvvtHv7N23IIFsc8ebydLjG3CSxPKDo3Y/YgnuDqk/NgkKdaruhL7HVcEv7kPDAe; 24:l3F25wP1hnf9ifwPDZycvhN7bnDfE04QgC5ju/8KV0D7j0futTfxWA1LlSHoLz+ApyZS9+EwiyG1sgeaPS3zk5mK40zzLuffoNxuhVgfkEw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB183; 7:37aXAt1JxPsy0Xy2xlGP9ABM0pg6PnmmBONb5YSSEzhF5lFpShBMNPfRjBsBDUwaaLmc/Aw3gS7dWFM+BPdstd3qrZoFhlbAEL4k2kHYzG8LhpMbh9X9+IRslWynGCpOHjpOfdHghBfVc0x1ihO99KdcvUi6kPJBwa+Yv/gWanG8OpaYRaN+QTwmDN5cSFCZWdIMe1UzeWEYwtwgbnRCXjP28G5bL4rbxiVHSbl0kX/WroMBaP/z1EBOCHx5jsOGP759F/UgNB1DN5kxEO5grmyEv8ygWhTOjFV4pwCrHKoLePtIzeWF0kD4c6wh5HLMFewifPrpqF+jWHNZVLt7sA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2017 12:37:19.6185 (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: BLUPR03MB183 Subject: [dpdk-dev] [PATCH v1 09/22] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 67b0dc8..f64572f 100644 --- a/drivers/bus/fslmc/rte_bus_fslmc_version.map +++ b/drivers/bus/fslmc/rte_bus_fslmc_version.map @@ -36,6 +36,7 @@ DPDK_17.05 { qbman_swp_send_multiple; rte_fslmc_driver_register; rte_fslmc_driver_unregister; + rte_mcp_ptr_list; local: *; };