From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20043.outbound.protection.outlook.com [40.107.2.43]) by dpdk.org (Postfix) with ESMTP id 09F2C44C3 for ; Mon, 13 Aug 2018 22:42:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0aipcuVbOZKH6GXLXVuLtmF11a216XIlO02Jh+vNirE=; b=OqfZksuB4IXcPe/jFeKCjTkWLhuTNGgNZG6y8re1M0suy3IvMrA/AVc/h7V6imGro14qerrQMvK8sQD1Dg3HIdXDZTOsE2ir9UxDgdwG9Ry1dKC6A7Y/lqFCP0lkbWAStpB+N1P8pwpqYopf4ZG3T31NYYu8BT71Y5UG5xE+RSA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.18; Mon, 13 Aug 2018 20:42:30 +0000 From: Yongseok Koh To: Rasesh Mody Cc: dpdk stable Date: Mon, 13 Aug 2018 13:42:04 -0700 Message-Id: <20180813204213.25436-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: MWHPR19CA0084.namprd19.prod.outlook.com (2603:10b6:320:1f::22) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1149df74-96fc-47a2-7d90-08d6015d4a48 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB3980; X-Microsoft-Exchange-Diagnostics: 1; DB3PR0502MB3980; 3:bxRIEo4xpnmVNTimVgG+z64UcRgjzvkvjWR7OdemmV0ZDX1I298Y5+GDCpMZ0Z2ORC2fdV+Bdm0FLe2fZsTdGxp88SYGzak5GdZQwqdEmF1F83sUl6LouoENuXJXYOkqvGgiCnDH7CLYq49qs9N++JLRHPoHPGoMKPLCR4Hov2evI83wdh6etTA8HFzkgEtF2tD1nnpY949UAlINnquBfbo4My+uCwN2nNDuN946ptFubk/yGiVXCOeEMqBqcWP2; 25:eeXz+Lsyrf0dSrFx/2W2u2V8BD2Fobi1sb0OOMor8H7mE+LbYjfitOTJNefGChcxQt5dxorlRifzsm7d1Sh2zqh6q52GswA4bM8PbYUmYNsd8yFiEkfaK4x7PtlyYQTkelXPndz3fysyEM+MRxFLh4yeKGk8Yj4LUfeZYtULeL7Ts9+6U6WUv/g079y7Glg3Ho2VpE5No2Y5pK1vPCzhsN3s9y/tBFCFvj1+eXhbbfgI/+cIhokABi1AyHPOh9dhJEGSkVIDvpFvk5KDnHNHxUMJf5vPNYuNZRBf8uIePWFYZ2h3CkontYtsXj8y9csbOwYYSckF2/+RO5sVGeqysQ==; 31:dY6fYwa6vSq1vwBuOIBUhW7/WOcCw5hJ9BXVnjQ6AvOJnUb/HORnIEj7Az7qrTqwZG1+qRaPMxmT2EBlgXaFuo2SULSJ4aHARCNiyFgN8b6Y+o6Vb0+7LnI2Dl9PVCMC+omQvU8zUOudrtC/YyW3zTr4gqduuwhy4y3gHzPTTv3BApFykVaO0dfknfNmI21nk3++9aiGM9JlhR24oZDRT7jpnmTC/hc3JCzln6Jrr/w= X-MS-TrafficTypeDiagnostic: DB3PR0502MB3980: X-Microsoft-Exchange-Diagnostics: 1; DB3PR0502MB3980; 20:F1OMTZdCrnWqsivGkm/W2MKV0r5UdKhXyKJoyooIZPu9ytO+vzjB5EQIK7LWsA6aPlLtMt+Fa9y17voJkugK2YGZAU2njkJuozxQxQPYQyX/BzK5z/YG6zZjx55Tuo3Ei1rxJCzNXjwa4Plp+30KM0m4hW/692EF0BYRbZm44da/d/OYTgp1HD07VjqudphZaWFI4rnIPHQlSBcGT1g3wR+WYP+gaVKBLSIocMyrGkPzUQa3gv+bZGXYK7SCrATUKoPnI47roFB35pGg467tskrVjP6SMm4OrfMurl72E60/zbjE6AHXwBrz0gSJe/+n44F0IA2HJmlJgFO9VqVUjTpNgvtbhDidOJAD07S7co/XbAoaKhKW/LhunFVE21Y2xDUBMNtHwvwn+4RrNNrS8FbrmAyf4ZJdoTW1Y9mFxrhPcLd/8r3NuWQSRFgc5s08NguRlC5hUjLet7dIMEqYTSu6H8rPdojaPhB+LCjhdzth97LWVQ1SiqKGWhcSY3/2; 4:2FxF2PkbFhg7QdZA2foh5bBXNG4ZbTaju+S4nO2eMl195cO8bwbSGa7dwjlKcg3yc8H/sBECF8tkA41IXonPfmMsbb2TlGkO0ynBU+PzKve29hTg/jtXHv6EQFRq1PqFSKmUih6A9cMOBeooDIJrqw+3YBegKK9IyDUDC9YU/LOEpPswFhVn1siZPvTDvGq25aIq5WQuYlWjb5ZoGrivGlD107WNvNVNr8PSb6d2Wm7cX3ebkrK81IKQHs+YtST7GWvJ7Dlu6x6B6puT2MqSgw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301033)(93006095)(93001095)(3002001)(3231311)(944501410)(52105095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DB3PR0502MB3980; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3980; X-Forefront-PRVS: 07630F72AD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(136003)(366004)(39860400002)(376002)(189003)(199004)(28163001)(69234005)(105586002)(106356001)(97736004)(16526019)(26005)(186003)(2616005)(956004)(14444005)(36756003)(50466002)(486006)(69596002)(21086003)(6916009)(476003)(53936002)(53376002)(48376002)(386003)(7736002)(6666003)(1720100001)(66066001)(305945005)(47776003)(478600001)(7696005)(53546011)(51416003)(25786009)(52116002)(4326008)(966005)(55016002)(6306002)(16586007)(86362001)(575784001)(5660300001)(3846002)(8676002)(6116002)(8936002)(316002)(81166006)(68736007)(50226002)(1076002)(2906002)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3980; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB3PR0502MB3980; 23:kGb+Y5x9yjtqGVpoH0wl6tODykrBKZqb/Rat2VI?= =?us-ascii?Q?QQtUOBSuWSMR/UbezloxQ8s8XKJIQLc5sPVov+26xsgohc9eO1ZuVR/i5zbk?= =?us-ascii?Q?4SgyS/ALQT9UMW0G7MsE4pd321O2rzK09c2jeSUK1ft48pxJU80SQryCKX40?= =?us-ascii?Q?riJjV0NL9QJdXyVhWw6OLd3SvssEyLQst/a+0VDWMxmzmcVNiMwr7MtemlOI?= =?us-ascii?Q?nwdgrw+OaXJaNBg6Kpi7tzUGWKF+nNhJRTulOFpNIvKyIL7Z2jLUFipEYvU9?= =?us-ascii?Q?DQscLqkF8XrENtLcgrROL/tckVyoxkHpHxLSlHR5Xso6i7b/M099iERAc13/?= =?us-ascii?Q?9s2ytVyuT+BJz3Qx9xTlLdUCQ85VqG0/+KxJpFketlPOaJSeRay/X9HWHHH7?= =?us-ascii?Q?UdtSirZ1SLsypfYNTHTCgOriFnjwFXjtyhVPTKuSFd+DIFhLy+WzVORnLDSy?= =?us-ascii?Q?rL9JUDGRH4KTGJ6ufUoHoyb00AkAAQeoPQv1nfULZK9TYiNHsLIgH0Hn3l0M?= =?us-ascii?Q?gwX0np3A0TzvFA/Nn+KTGVKKSGPx9/9B87QQDQSxcUkJksZx9Y2HDdCHje28?= =?us-ascii?Q?2p5N8+JIlIoa37q6c0szIqGfB+6sFNQQKdVApdouv68vuGqvJEHfH3s248xR?= =?us-ascii?Q?/riWMg3DCtKc4i25EzalucN7qu+kJiPDUtT40n4vB2O6mifwtGvix9Tln97v?= =?us-ascii?Q?0rPwWiCy7Yjo6Z+fxEIl7bichcP5yspf4Uh/4+Y1kXSUGOEnwt6fD0KzadYC?= =?us-ascii?Q?39MrRmDqEBkcqzFH7ftutfUFPYD0wNNsnQeTeGdx2esCOIcmivGbfsviLdfg?= =?us-ascii?Q?Exm9UHqk7cMLisH+2DORw9gwXmDg2WBtMpTlL2mXJ3uy+pECmgK4bGk0iYyB?= =?us-ascii?Q?2KgGRyChDdXAxY6ux9uD8jnPd2TdsPPs0gfAAz1NDTa9JooYqiVkYawDZlP+?= =?us-ascii?Q?R9iFxNrJ8X22Avau4GJQ3Jy33ntJZ0PhDokQNoIOD1hO13LgHyI/fVl1Lg0W?= =?us-ascii?Q?GlBZqdeziQSAtcZpSW5orGmM5PleixIdQXmvkWasL5wC/Z42KgH2MOfMLW4z?= =?us-ascii?Q?uQwo3o+whO9XuklChkpRN2FMUe0eMr4SXVrFYRPzGmjDo5EdRXX84TTxfkIq?= =?us-ascii?Q?zgpkizCGd7Rc7SqLG2eGCYD8xeMcuaD7Qz76mDwga6n90uiyoZAXk8LMRiHA?= =?us-ascii?Q?h4l5fQ1Gyk3ByDI2SMEahWpKD13MY+chUUWStXmzqN/mo2eadh54zTHQX8du?= =?us-ascii?Q?hRC1jjHitvuaKANNc8sTbHIYf9TR/OCaw4qvS/gbMl4FXZ8DzSklhnhoWxR3?= =?us-ascii?Q?sjaFhUCEbNP9Hbgb6EfrwWCugC4AklGTWeq6eKMdOfIQDmdiYQXKqj9IxlX/?= =?us-ascii?Q?+lM3DXw=3D=3D?= X-Microsoft-Antispam-Message-Info: t+stTJBf8Mt8aDhi0YYfnuzi415uovglT9DTidGxdXB2dU/TodTCb/XbLZAsz67EwGfCArfD5RedRktPBnrRRaG2lIqhYKrCmp3orzjGPByGzReytYq+zjgQp5dUqvRGyUsEdihh1G0LSgZ+pfsOHguwraHev8EWBNhTRfkXhZ5INtRa3NRTe7XN+PnsyYkcKWCQIrGg4LAE6l44ODEJIQsdKd1Ado/pMDMPf4aT3LJo6rZAfy1D4Vc31xGD+Vh8UDs7eTC8mwrVuAE5XVss60sj3ZmYpyP45ERt4rwoCTzzXkFVfRaz12slCWGGmoElji68B9F1nP8sn9yNUKsBd6p5jKf+BbwdPJlEWbf2vIk= X-Microsoft-Exchange-Diagnostics: 1; DB3PR0502MB3980; 6:wjR5P709F3xsrKlfqwwUNURwEa0HJ4+R4cYVj8Rv8PrBznX24+SatISq1tcoHLfCEzKU1aGdpKSYaCTYZ568Ragf3Bo8qZ29U8k7YAn1Q5en/RIGMVE0pnCFVs0b4Lf+RVDUMWCH079L7/5KzYLl96vCU/IKKH7ATMl2xPquKOimKDdTDH/oI85XUUF6CB7UMYXdxt7dzRnmemtPhzeH3BW3caCNqgqClJtUfLrgPJdW2hlqRUqYlep/axswkt4rjDT4lxprzlNGV+Qn4qT4pDF6EyI0StyZqjuF8sgPekJQa8vDKCJ4R40Q9JahZMbsv0Jh5GJ1rzAnQGITccHMZ91EoEV7jO5SEYEECf+Ms1XBUuYzZUs9Dlvw9a2MXb1lzJMTWeVMKu0tCblzHke0pc+D6fPWzlpu/B/y1DPeRhL9gHORbgVi+wg1YceCK6YKNTyr93xly0Vdf/1c/QJwEQ==; 5:AhZ7Rb53lFF/S4ByyghJkPVsFdm/yU9Qud8/OxvV6INsxICn8BcwKtJqyURyVQIsPycghQABMhV9pjooBClvlfeH4G5iYabJKTIPuo6t4Yyb9b0nTnb6eJuIKm/YaGsSv1lb9nffSD6gSZ0Ca+Jiiq+AnGJ79xMJX74GNMrXV7Y=; 7:nIPcYWxSnFg2ItHyQB0k90PKOUglQmV3+IVRifTajMD5Axli4HdHt3N6OmVLj4aGtpkg/Ai+agpbcWr21fhM6A/ZbP9h3a7FMQyhBKpz+O3aHLUYYIlYlH6Ku03H3GvbC7mcneROasyBniWsPM2UMkr3WojJbFu1FNdoOfFl7N4fMKbporrX1YoxGPh85GkpjfdAsN3YvmzgPUPZFZ+f+jG6tB0kcefZzNZvT9VRR0zN+P6t2KKl5OeDz3IBR9az SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2018 20:42:30.1308 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1149df74-96fc-47a2-7d90-08d6015d4a48 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3980 Subject: [dpdk-stable] patch 'net/bnx2x: fix poll link status' has been queued to LTS release 17.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2018 20:42:33 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/15/18. So please shout if anyone has objections. Thanks. Yongseok --- >>From 5bc1ab14417b3712b18f0c4516b14b3ba16c5628 Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Thu, 2 Aug 2018 21:42:45 -0700 Subject: [PATCH] net/bnx2x: fix poll link status [ upstream commit 6041aa619f9adc35edf0ea8f4dca5d09d320459a ] The PMD has been modified to invoke the polling function in the link management code which detects the peer speed/mode, configure the link and update the status accordingly. This patch is the fix for the link down issue seen when we do dev_stop() and dev_start() from an application. Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Rasesh Mody --- drivers/net/bnx2x/bnx2x.c | 18 ------- drivers/net/bnx2x/bnx2x.h | 1 + drivers/net/bnx2x/bnx2x_ethdev.c | 105 +++++++++++++++++++++++++++++---------- drivers/net/bnx2x/bnx2x_ethdev.h | 3 +- 4 files changed, 83 insertions(+), 44 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index cc5f28a0f..01035fbcf 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -125,7 +125,6 @@ int bnx2x_nic_load(struct bnx2x_softc *sc); static int bnx2x_handle_sp_tq(struct bnx2x_softc *sc); static void bnx2x_handle_fp_tq(struct bnx2x_fastpath *fp, int scan_fp); -static void bnx2x_periodic_stop(struct bnx2x_softc *sc); static void bnx2x_ack_sb(struct bnx2x_softc *sc, uint8_t igu_sb_id, uint8_t storm, uint16_t index, uint8_t op, uint8_t update); @@ -1971,9 +1970,6 @@ bnx2x_nic_unload(struct bnx2x_softc *sc, uint32_t unload_mode, uint8_t keep_link PMD_DRV_LOG(DEBUG, "Starting NIC unload..."); - /* stop the periodic callout */ - bnx2x_periodic_stop(sc); - /* mark driver as unloaded in shmem2 */ if (IS_PF(sc) && SHMEM2_HAS(sc, drv_capabilities_flag)) { val = SHMEM2_RD(sc, drv_capabilities_flag[SC_FW_MB_IDX(sc)]); @@ -7001,16 +6997,6 @@ void bnx2x_link_status_update(struct bnx2x_softc *sc) } } -static void bnx2x_periodic_start(struct bnx2x_softc *sc) -{ - atomic_store_rel_long(&sc->periodic_flags, PERIODIC_GO); -} - -static void bnx2x_periodic_stop(struct bnx2x_softc *sc) -{ - atomic_store_rel_long(&sc->periodic_flags, PERIODIC_STOP); -} - static int bnx2x_initial_phy_init(struct bnx2x_softc *sc, int load_mode) { int rc, cfg_idx = bnx2x_get_link_cfg_idx(sc); @@ -7045,10 +7031,6 @@ static int bnx2x_initial_phy_init(struct bnx2x_softc *sc, int load_mode) bnx2x_link_report(sc); } - if (!CHIP_REV_IS_SLOW(sc)) { - bnx2x_periodic_start(sc); - } - sc->link_params.req_line_speed[cfg_idx] = req_line_speed; return rc; } diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 17075d384..c93f148bf 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -1930,6 +1930,7 @@ void bnx2x_link_status_update(struct bnx2x_softc *sc); int bnx2x_complete_sp(struct bnx2x_softc *sc); int bnx2x_set_storm_rx_mode(struct bnx2x_softc *sc); void bnx2x_periodic_callout(struct bnx2x_softc *sc); +void bnx2x_periodic_stop(void *param); int bnx2x_vf_get_resources(struct bnx2x_softc *sc, uint8_t tx_count, uint8_t rx_count); void bnx2x_vf_close(struct bnx2x_softc *sc); diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c index 95861a06e..d3f2efba1 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -13,6 +13,7 @@ #include #include +#include /* * The set of PCI devices this driver supports @@ -78,26 +79,31 @@ static const struct rte_bnx2x_xstats_name_off bnx2x_xstats_strings[] = { offsetof(struct bnx2x_eth_stats, pfc_frames_received_lo)} }; -static void +static int bnx2x_link_update(struct rte_eth_dev *dev) { struct bnx2x_softc *sc = dev->data->dev_private; + struct rte_eth_link link; PMD_INIT_FUNC_TRACE(); + bnx2x_link_status_update(sc); + memset(&link, 0, sizeof(link)); mb(); - dev->data->dev_link.link_speed = sc->link_vars.line_speed; + link.link_speed = sc->link_vars.line_speed; switch (sc->link_vars.duplex) { case DUPLEX_FULL: - dev->data->dev_link.link_duplex = ETH_LINK_FULL_DUPLEX; + link.link_duplex = ETH_LINK_FULL_DUPLEX; break; case DUPLEX_HALF: - dev->data->dev_link.link_duplex = ETH_LINK_HALF_DUPLEX; + link.link_duplex = ETH_LINK_HALF_DUPLEX; break; } - dev->data->dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds & + link.link_autoneg = !(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED); - dev->data->dev_link.link_status = sc->link_vars.link_up; + link.link_status = sc->link_vars.link_up; + + return rte_eth_linkstatus_set(dev, &link); } static void @@ -106,8 +112,6 @@ bnx2x_interrupt_action(struct rte_eth_dev *dev) struct bnx2x_softc *sc = dev->data->dev_private; uint32_t link_status; - PMD_DEBUG_PERIODIC_LOG(INFO, "Interrupt handled"); - bnx2x_intr_legacy(sc, 0); if (sc->periodic_flags & PERIODIC_GO) @@ -125,10 +129,41 @@ bnx2x_interrupt_handler(void *param) struct rte_eth_dev *dev = (struct rte_eth_dev *)param; struct bnx2x_softc *sc = dev->data->dev_private; + PMD_DEBUG_PERIODIC_LOG(INFO, "Interrupt handled"); + bnx2x_interrupt_action(dev); rte_intr_enable(&sc->pci_dev->intr_handle); } +static void bnx2x_periodic_start(void *param) +{ + struct rte_eth_dev *dev = (struct rte_eth_dev *)param; + struct bnx2x_softc *sc = dev->data->dev_private; + int ret = 0; + + atomic_store_rel_long(&sc->periodic_flags, PERIODIC_GO); + bnx2x_interrupt_action(dev); + if (IS_PF(sc)) { + ret = rte_eal_alarm_set(BNX2X_SP_TIMER_PERIOD, + bnx2x_periodic_start, (void *)dev); + if (ret) { + PMD_DRV_LOG(ERR, "Unable to start periodic" + " timer rc %d", ret); + assert(false && "Unable to start periodic timer"); + } + } +} + +void bnx2x_periodic_stop(void *param) +{ + struct rte_eth_dev *dev = (struct rte_eth_dev *)param; + struct bnx2x_softc *sc = dev->data->dev_private; + + atomic_store_rel_long(&sc->periodic_flags, PERIODIC_STOP); + + rte_eal_alarm_cancel(bnx2x_periodic_start, (void *)dev); +} + /* * Devops - helper functions can be called from user application */ @@ -182,6 +217,10 @@ bnx2x_dev_start(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); + /* start the periodic callout */ + if (sc->periodic_flags & PERIODIC_STOP) + bnx2x_periodic_start(dev); + ret = bnx2x_init(sc); if (ret) { PMD_DRV_LOG(DEBUG, "bnx2x_init failed (%d)", ret); @@ -222,6 +261,9 @@ bnx2x_dev_stop(struct rte_eth_dev *dev) bnx2x_interrupt_handler, (void *)dev); } + /* stop the periodic callout */ + bnx2x_periodic_stop(dev); + ret = bnx2x_nic_unload(sc, UNLOAD_NORMAL, FALSE); if (ret) { PMD_DRV_LOG(DEBUG, "bnx2x_nic_unload failed (%d)", ret); @@ -304,20 +346,16 @@ bnx2x_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete { PMD_INIT_FUNC_TRACE(); - int old_link_status = dev->data->dev_link.link_status; - - bnx2x_link_update(dev); - - return old_link_status == dev->data->dev_link.link_status ? -1 : 0; + return bnx2x_link_update(dev); } static int bnx2xvf_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { - int old_link_status = dev->data->dev_link.link_status; struct bnx2x_softc *sc = dev->data->dev_private; + int ret = 0; - bnx2x_link_update(dev); + ret = bnx2x_link_update(dev); bnx2x_check_bull(sc); if (sc->old_bulletin.valid_bitmap & (1 << CHANNEL_DOWN)) { @@ -326,7 +364,7 @@ bnx2xvf_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_comple dev->data->dev_link.link_status = ETH_LINK_DOWN; } - return old_link_status == dev->data->dev_link.link_status ? -1 : 0; + return ret; } static int @@ -580,6 +618,17 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf) return ret; } + /* schedule periodic poll for slowpath link events */ + if (IS_PF(sc)) { + ret = rte_eal_alarm_set(BNX2X_SP_TIMER_PERIOD, + bnx2x_periodic_start, (void *)eth_dev); + if (ret) { + PMD_DRV_LOG(ERR, "Unable to start periodic" + " timer rc %d", ret); + return -EINVAL; + } + } + eth_dev->data->mac_addrs = (struct ether_addr *)sc->link_params.mac_addr; PMD_DRV_LOG(INFO, "pcie_bus=%d, pcie_device=%d", @@ -594,18 +643,20 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf) if (IS_VF(sc)) { rte_spinlock_init(&sc->vf2pf_lock); - if (bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_mbx_msg), - &sc->vf2pf_mbox_mapping, "vf2pf_mbox", - RTE_CACHE_LINE_SIZE) != 0) - return -ENOMEM; + ret = bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_mbx_msg), + &sc->vf2pf_mbox_mapping, "vf2pf_mbox", + RTE_CACHE_LINE_SIZE); + if (ret) + goto out; sc->vf2pf_mbox = (struct bnx2x_vf_mbx_msg *) sc->vf2pf_mbox_mapping.vaddr; - if (bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_bulletin), - &sc->pf2vf_bulletin_mapping, "vf2pf_bull", - RTE_CACHE_LINE_SIZE) != 0) - return -ENOMEM; + ret = bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_bulletin), + &sc->pf2vf_bulletin_mapping, "vf2pf_bull", + RTE_CACHE_LINE_SIZE); + if (ret) + goto out; sc->pf2vf_bulletin = (struct bnx2x_vf_bulletin *) sc->pf2vf_bulletin_mapping.vaddr; @@ -613,10 +664,14 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf) ret = bnx2x_vf_get_resources(sc, sc->max_tx_queues, sc->max_rx_queues); if (ret) - return ret; + goto out; } return 0; + +out: + bnx2x_periodic_stop(eth_dev); + return ret; } static int diff --git a/drivers/net/bnx2x/bnx2x_ethdev.h b/drivers/net/bnx2x/bnx2x_ethdev.h index 967d6dc50..a53d437de 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.h +++ b/drivers/net/bnx2x/bnx2x_ethdev.h @@ -58,7 +58,6 @@ #define wmb() rte_wmb() #define rmb() rte_rmb() - #define MAX_QUEUES sysconf(_SC_NPROCESSORS_CONF) #define BNX2X_MIN_RX_BUF_SIZE 1024 @@ -72,6 +71,8 @@ /* Maximum number of Rx packets to process at a time */ #define BNX2X_RX_BUDGET 0xffffffff +#define BNX2X_SP_TIMER_PERIOD US_PER_S /* 1 second */ + #endif /* MAC address operations */ -- 2.11.0