From patchwork Fri Mar 17 12:36:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 21846 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 6F6E6CFEC; Fri, 17 Mar 2017 13:42:06 +0100 (CET) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0083.outbound.protection.outlook.com [104.47.34.83]) by dpdk.org (Postfix) with ESMTP id 587AECF7A for ; Fri, 17 Mar 2017 13:37:24 +0100 (CET) Received: from DM5PR03CA0045.namprd03.prod.outlook.com (10.174.189.162) by CY1PR0301MB1964.namprd03.prod.outlook.com (10.164.1.26) 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 BY2FFO11FD025.protection.gbl (2a01:111:f400:7c0c::104) by DM5PR03CA0045.outlook.office365.com (2603:10b6:4:3b::34) 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 BY2FFO11FD025.mail.protection.outlook.com (10.1.15.214) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Fri, 17 Mar 2017 12:37:22 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2HCalHw023358; Fri, 17 Mar 2017 05:37:19 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 17 Mar 2017 18:06:29 +0530 Message-ID: <1489754201-1027-11-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: 131342278423927811; (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)(39400400002)(39850400002)(39860400002)(39840400002)(39380400002)(39410400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(2906002)(110136004)(38730400002)(8656002)(50986999)(54906002)(104016004)(76176999)(105606002)(81156014)(4326008)(50226002)(8936002)(8676002)(81166006)(33646002)(5003940100001)(50466002)(106466001)(48376002)(77096006)(575784001)(85426001)(2351001)(5660300001)(189998001)(86362001)(2950100002)(36756003)(356003)(305945005)(47776003)(6916009)(6666003)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1964; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD025; 1:h8n6xiYs5VT4vzRA2ivCjc6iHdrsqbMbtwswHaFQ9PuoDHdjW5eZqP/Q7URNoGYnlDVH30mfauzDsJ04Y5PY3ypiFLQtSEJw/EJfXc/JolqJuSa8SBgys3HDOyv8fZoEA6VC5p9WXGFD0tqUA4mm4l3RcQLjY0R0kL8o2pNc20EAYJx0UUrF5LvYVPTjsUrWGv1Td8o8wsllUwspB2W5JC7tT1ZHGjeg13zrQ9xtS0vOle+ld/Ybk1y2yxQrkFyPFWnNto/qjPfGZrhFpGvuvvrmVUxFOG5NrQIcgWYSfBRqyT5O8dVXJwQZSWyJa42zzZuM+OWAiVts+yZwMrRQIt73X+gzOagCGVUAjH5bpgJRJj6JqnLqlgbKuKsOSoildeLUUcp3AbqrxlxRZf76Zzp9QAWToymbwgHQ2sTTlluLXmqN4cxgXTqVzynLh0NLBEQKkztmK7Mg9OLvhi8d6gqOhjY5edtRutxMsUKUI4ZHb6MsoJU5fL3aAywB+ud6wK5KQbfb4enHrD52YBSGa5D0WjDufyrgFfAQuYFZIy0hl6Gy63vibzidPfLNqXVuQp6tWz95eWTDHLdq+YuiBjeF4OxH/yr7YW5IHoxoHnSUPM6Y4T5Z7P9yrU318dPKzLDl0C4CHu95nVCeWRGovg== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 4135cf06-c7c6-4754-dc03-08d46d325be9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB1964; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1964; 3:UTGbx1kFrXoBr8e8zaB2IHUE4qCyA9KQ2CvznYcp7aAnQ9XDCAfSMVX3/dSbBa3Lx91pq7+ChogLANRY0KNQce2/6YlT4lq7/lwqz7Tb3LeAa98zMXGq+TVilkn2RTNzmV4i3H/nskZiv//6CA+Vw8vabvU2PChJ46GamOEw29lX7DflOvV+jqpSWDPoa+YgO4az2CNsR5b1ij9SFuCmPDJQ4OQXgF1pYdaQMlS38GKN6IWrxILfY81vOC39WBohIZGKsJDJ5guqtkFBp7OVjxkxiuO7BQ+ZB43lHZIZuvmbLURmYZkvSuQnlE5mG2IYRewWAVQ1qYECZM3XhLkDB+EYilejHB27CP72BGxrWT3rhGK+icwNy1DHSZEeWKqj; 25:zCYtt78QHvkdS2RPH+RjIonCKrAzBGVvDFCPp/9W25DZQLcMISyjMXtlxU5kHi2IgOvlavGoOjLlZStIZKT0IjZa8DX48cnytAFg8SB5I9uVCqLNk+NMF/tWCQ3Ai36SOqWOqK3RsS/lHPjvEjEReluNN/mw9cCIKsqmvk/1kau4JtpjIfk+q+O8mt+jG9XFWh6v0TLdB1zz2CNT4xkVLHoZ4/bH+UgHw3aQyolC/ZJN790vcO1AR63d8try72ZYBjnhCfIdgzmpeGdprdL8/MaWxn3Ve85G1O4vlwnpAs05VeTsmGtwfXl1tTM+kmZ4oi2TaHmgZY2ISvsPYyhXsny634RFjU6ftMrwxJkPBmmH6dCqqzW0VPGzvZ/xvisl2/ZClEZtw2L7xStpabew9o8552ea4qui6tO29Vg8iV50GJauwF6qJkhjOJhfAHySaesLaHO3dBM9Bi821lp+ZQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1964; 31:Q/7wQS1fL+2/BhEroLtTjeOAp+Cucn3RYVs48B0/NPyZy4nY8m9AfpzgbSDAmnCB4BJgKvo2KLo0Hs8MUj0CBhVeTogWkV2cxdnquqU2Yuw1GJxImyB0M04iU7SP8OcFaFepajWxv5KG5FtY2qw98Duv2a/xz1hcI+lfthv8/ydtyJ1vyxv7WxSOTR2mdSWy9X8n2zCNOB8h0NvGG3OqTksdaGGEgamhQQZUfG46ArbQXY/WmSfj4HyfZ2HwkWnc X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(8121501046)(5005006)(13015025)(13017025)(13018025)(13024025)(13023025)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123559025)(20161123563025)(20161123561025)(20161123565025); SRVR:CY1PR0301MB1964; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1964; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1964; 4:f0npj17holX08c9PjUNg00V7dNj2U1QIZo/V5vf6f2jZ8+gfchDd9t1dQGQ3ZzBdfnZFQzBuBzg3efkdngqPKaPa8Qhq/8M1F20DfMqd/XLiN2bNmYhjVDEAMmOHAevnf6PU5yJy7fnnddmTpanEnyVCOGRHNRuwKZ3zj7QCp2DpT4sJX1tb8qMCfmLpq4Er1+23kg0752Xm1tQPc7CGWF/yw2WvtNqdH2sLjEwcvRg9gabA8WHWK4W6jTS322PVOLStPLsFnothTzTnFkY24OSCsyizav38/mmnIPYM7Ztr8CMJ/22H1Qqb9IKs7uuMHrRetJqddG65FJdRLzLL69U99osL/k+2bGJdiM4MwzKpztIqhcCqXij2JVmgX5+RE2TZ7IRmEAyCLhx6iM/b88z6bt7qKN2c9kY+NdefcnQN4pc75jDWUxYKhdLN2H1HrwmlETTH7hRazP09soKnLITR+cclFFOJ/1KfOOtnw8PokaDNCoCsmwnMRAAeJXJEoIlFhk0WCP+nIOSWDMZ2ZFMYBbzYKc7BBr+lduqo4m2mObvKyWPY7Zrr5/LVLBYk8iufBEpHLknyInzsFzU39bOpia3pXZ6hJlCqREKbwUP/WJyY9KTzZ2xncauEQsWje2HO/tZK3yXDmkHwQeCNFNUtfLYKFbBCca419JpJSDgf5DZWPBXkVtqwr2W7wKrbUDVwtUPFqlbg0UHvi0VGzEQzJ7L9/fw9nwWxlpHejvI= X-Forefront-PRVS: 0249EFCB0B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1964; 23:2dcx+QpdYgc4RIJX1NT1P3suEvXa+RmLumeCk3P?= Yb1tto5KJg6HSsV8otAycaeth1mrDOgQAL2Td6b6P+8Wc2PANaGjtXIeeSALxz/1P7Ke3BTpxLJ9Rt9o/y2Jl+NbdKppMsOq3n2O5pDYpn+NdWEi//zKdKzHn4ti9tjvr4aR2Abo0YlPjIgPn+HC4F91drra6a4eSo8IPSrDK0stFRF92PYCDUIOqxcBd9pTxaC174Kr+RrYYfVBM62j6tHg7WCRtKVm8p0OLL0yi2ZOWtjbToQ+fLxJlNRs4cyn3pSGi04ks2Pecwfx7zDTPtxEu/j3xPUWXcK3fLlID77UuFbHtOd332UdL7bHUaZYJESHb5zoM8PQjabpIY67b3eT3S2Ld1M3B38524Llo4ZUuzaATn/Ek2CGtnkxGd6WpWqnvlSk2TckIT2cM0mQ4ebPBIDkY86ZgSUlr5qst0zQrdfJ6cGpsrwawAeck7xh1x/uYkAzahbyS6IMJTgTnIIlOeoRfxz88qZJDJLpVd+Ol0W3r/6JbSPQwmde0/EXvpNELtj40wz4SNXL/L7PL/HcvQL57snFUbAU2DQgmHo/VuFxmuNOG8sEZ5zeWgx9D3/J1VVtUXdUJKFYpTGJcmHKTd/PCeRgbQdHkZ2q4Crpr6HpcemZgX9GzHaZmq2UgmP4nAqm4JcEXCIhTdDtust0lKZUEvBAB9oOMRsshsldR09gHOjXLYZdABZTbJqWW6OolGU+2cQ3VJRaU/z7qMULX0DUXBGGhHsgAJY2Q5XawHPTG2QULDe8ZpHAQ4J/IICfznz2Tfp22r6qBbGvOyM6jB87ujmMczZZyg2BudkdyGazferZj5OTJSfhKpMAg3iRkHpLYuBXvEmGlKHPQOrYrXyDbOuJKnd1sbQC3A9Ap9OgPCp3RDENUKtUIvXN5U37wznKlUJ1AusYhxBq1QyUzP20bT9UyQPamfh6EFy6zWzaF5eyCHCwCDRPXymo7IAbis3CqooSi0pVs9XP1r+WOhB6EWrydg7NYPoXsEEQoclCjNd/YEh3z6WEDPrMVk3v7ocETD6JqjEDAzT4vKq8m/ReQwGxeg1su/s97Jb6g9R+8+MzIfbOYNBBnqJT1jIp6lX37pXA9FzKwKFAxd9TajKfhwWIDYF8AFkXFI9unI0G3hER7ZKn/RWUu7FHRH5LkW37ziEB1NAPuZ765GYXfrSMzKouQTT8/t+SstzsHB6HadNvK7zX/cjm1QaLIvpXnZ44fTVFbKx58sMFo07+I X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1964; 6:ksG4ilLFjDsSVnYWTkkGH8KQDv1MF5VgZAeRoHGcju7Cc0/XVw0QSbkUz11V/PmlU4a93PfnWXdvYbarJcDpxTUCQqYZvIsP0COqg/olL+W9oWb0QzZPHu/SV0FFOENBM3gaqrlVEOSLkhFatgxZVV1hCOumH0MxpgYp4RxxLiCHcTzU/1Eq4ic5vSoeqPkDV8i7NavKyn7M2icA0APeUee2nI6X66utHyhrkZ/zRsaGuk9cvK2swcsaDmBEtwP9tJMni66oKD/L46u12wcA5Amcwz50Ps/ygfiThZ7lLaJ3eCHQUydPDB9+HO32zhPfl4dIpEv80sBGWgS4yaINZ/k9FyYuUnzrgOgpzmDhgBu0+toOuD4k9UqyvfhJwaSuKR94oFY65nVNM/QBATfAVgaYKp2V3QzdhHPXJSLOkVY=; 5:iromah6CoQrglWftYrcoVF49aW6+0h60PRpJHwMpTxc6OTiRNYNStZsgwwhNJCBO8+S2M/fIQ39RMU/FeRhZF6YrJi4Eyg60VjwqEfBT5opMQndJqQcbK8asof6PaPX/sg3LbLajHbnq43hG4rHR8POG+NUkrhlxlF3MZTcyrf7px+Lbrw45hIifS3dxdb1m; 24:xNxy8SNwoPVNOpQCOP1LUx0pSQao5r/m6QYUE/yu1tyl45bHoKEP4/i4xTP/AhdCJdmKY0Kz6DXXDuiSVCbwmyvKQV4fms4DX2WJOt//j14= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1964; 7:HNuOPpETKObLCUb4oyK13ZcE7g5uWfQnHSChmYScE/NXw8v8DhMs4N2swvNF6hXiPuKt92S/MYczcHxaXiKpa+sJRl5BOISorRoRe8mpqI62Crn4Z/4EpMGT4f2S/0pRAESdqbsv/0TREL4gzUcawsPAIZ0EUefnE8ctkMAl5MyB/y42SeAUAOM8VLz9Brb1GiW6gOk/f9zdxlr13ftbOPaDLg5Al6DABAFtSWeADS6zvH4IKVpZ+JG09qeoFyVI3VYB6b7/UeWpObV3tkK5lK4LnzMvqXo51KDgEpHMVmDojsyivOUpAwtNWvVSytUMeLelNmiRCMhbt2Fvn2rLfg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2017 12:37:22.2055 (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: CY1PR0301MB1964 Subject: [dpdk-dev] [PATCH v1 10/22] bus/fslmc: scan for net and sec device 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" This patch will add support in fslmc vfio process to scan and parse the dpni and dpseci object for net and crypto devices. It will add the scanned devices to the fslmc bus. Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/fslmc_vfio.c | 63 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 73db595..0d4c0a2 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -210,6 +210,48 @@ static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj) return v_addr; } +static inline int +dpaa2_compare_dpaa2_dev(const struct rte_dpaa2_device *dev, + const struct rte_dpaa2_device *dev2) +{ + /*not the same family device */ + if (dev->dev_type != DPAA2_MC_DPNI_DEVID || + dev->dev_type != DPAA2_MC_DPSECI_DEVID) + return -1; + + if (dev->object_id == dev2->object_id) + return 0; + else + return 1; +} + +static void +fslmc_bus_add_device(struct rte_dpaa2_device *dev) +{ + struct rte_fslmc_device_list *dev_l; + + dev_l = &rte_fslmc_bus.device_list; + + /* device is valid, add in list (sorted) */ + if (TAILQ_EMPTY(dev_l)) { + TAILQ_INSERT_TAIL(dev_l, dev, next); + } else { + struct rte_dpaa2_device *dev2; + int ret; + + TAILQ_FOREACH(dev2, dev_l, next) { + ret = dpaa2_compare_dpaa2_dev(dev, dev2); + if (ret <= 0) + continue; + + TAILQ_INSERT_BEFORE(dev2, dev, next); + return; + } + + TAILQ_INSERT_TAIL(dev_l, dev, next); + } +} + /* Following function shall fetch total available list of MC devices * from VFIO container & populate private list of devices and other * data structures @@ -218,7 +260,7 @@ 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; + char *temp_obj, *object_type, *mcp_obj, *dev_name; int32_t object_id, i, dev_fd; DIR *d; struct dirent *dir; @@ -348,6 +390,25 @@ int fslmc_vfio_process_group(void) FSLMC_VFIO_LOG(ERR, "DPAA2 VFIO_DEVICE_GET_INFO fail"); goto FAILURE; } + if (!strcmp(object_type, "dpni") || + !strcmp(object_type, "dpseci")) { + struct rte_dpaa2_device *dev; + + dev = malloc(sizeof(struct rte_dpaa2_device)); + if (dev == NULL) + return -1; + + memset(dev, 0, sizeof(*dev)); + /* store hw_id of dpni/dpseci device */ + dev->object_id = object_id; + dev->dev_type = (strcmp(object_type, "dpseci")) ? + DPAA2_MC_DPNI_DEVID : DPAA2_MC_DPSECI_DEVID; + + FSLMC_VFIO_LOG(DEBUG, "DPAA2: Added [%s-%d]\n", + object_type, object_id); + + fslmc_bus_add_device(dev); + } } closedir(d);