From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0041.outbound.protection.outlook.com [104.47.2.41]) by dpdk.org (Postfix) with ESMTP id DF08EA492 for ; Tue, 5 Jun 2018 02:38:34 +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=p5fuxBwdfJDzLRxxuaVM6M4I66m9X8ilT5BsgkFWoU4=; b=khbuSjoFvl2lagi3RqaaWWsNanYRpKHPCd02OJVe0b3wc4PXOZTp/donEvX6FoqR1g0Hu+ihvA/NTPlW6zuCdtDoHPSR6kCS7ZZOAjz3Wj5P2C62WOrehr/Urjn6Vp6FAOalR57BPG0ySKZ+qcT48F4pc1/c6aTru0H7hp+PYDM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by DB6PR0501MB2037.eurprd05.prod.outlook.com (2603:10a6:4:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:38:31 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Date: Mon, 4 Jun 2018 17:38:02 -0700 Message-Id: <20180605003811.14448-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605002732.13866-1-yskoh@mellanox.com> References: <20180605002732.13866-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: BYAPR02CA0008.namprd02.prod.outlook.com (2603:10b6:a02:ee::21) To DB6PR0501MB2037.eurprd05.prod.outlook.com (2603:10a6:4:6::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0501MB2037; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2037; 3:N3Jf/rJt27L1o4dPq8ysbtdMkdeK8KvXHaofjM3dOBxmWVDtivpusX68Orn6z0RGim/qYVa7UW6hSScWqD9TJuWPO3NRSJNbpyZu4zJ2zHhC9OwDpWDt4tv2VD5Af/YIxEXePZsJ9BeW3+VgV0/dAWCvDyq1idxfXKRexhIfox/DzquoY7ccwl/1I8wdX4olqTeIOXAANyK8E9dFRZ9OmEpnkPEuWys/xyUcDr/OQKpuL2x1MfuAvp3+LjWzbZs4; 25:0JH/9tRUVPyGZUuiSmbcOKyZk5HJxBzB8ruM2DvQvBZaZVjGZGFGzgKOOg42HtV2HJHd1sLP5dQRJtL63leNOj+uqjCiEE9F8pPl2bYaChfTD1Wmf0FbJygO3mqvQQW9Apa1jI3xZ6lKHft46Z9dr3d8pZT39VKoTUWDDnMDfLCWSip4hxi1Ix73wkFdTgE4awcI5Tr+4VMUsNn2/tKsfda4kNN7Hi3QLO28LlSYHqJOTYzfwGAA0y0zkz2sS9K467mmWrp6HaBDSc4P6oEIhBIWmMGxNCEVSalPgb89LQ43hziEmuKq2ZGEPTHhhNUYEsQwPAdVSrTDD1bIdUzijA==; 31:tOISiU3m18/CeR7/ueQmXUXUYGDqXe6ktnrtKa/Glxs8leh0vv/Qoh+6zh14bWp51AbBPZRA7R/FBIokDBLQHKt4ZKBD6y/ab82telJaH6rKYwdxqwF2GmPcQiFf+2VW4dmLxnQm1nr9tW+aYcL0tuzhnR2zzsHvsb3ADVS6Dcrxb1FrKLHYcBVAEkfGj9aBT/VnJy1ZFuITiLVq9JQjz3KPvOCSIT8fK5fvg8qUgn4= X-MS-TrafficTypeDiagnostic: DB6PR0501MB2037: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2037; 20:oKgUQDO5UTRDnTIlQCD/Us0fiUCMoHe6ZBlrXRBCSlNReKQRAHskUqiku2tZKrFjO4iq9bxvhJPg6vREbFGUEW9zq4Np0/Qj3QZ4OdXMZf6v87EbgKT8icehktJjNfDV6SjYoI1Lyj1KClM0n29WBdHhWo1Sx+Fw9+ic44oT20bZ76NUO64y8KK1sKtR7pZRuNzEAd2MJeizErzA2dM9bByC6rhLHCdwdynDKnl1qwh8G08M5dlBg95BH35OQGndIi2p5TlvHZRP4Nkr7OEHZ4CE0mjSb/pY1WS5wsDj2bgVy/x/l76psoiDdIltJKL1aPoOd90Pgqz7mf55SI1OyD7ISGpnefEJAxtqw228o1a9t0vJdMI1BZiellkoPsCse7ZY9krT00qJTgSuUf5LZj/YVRJluylCTNgBbYyhzTrOH0MtyTSVDDKAHdNe9OxJ8T9SXAyt1gvipKG0aH1aAegFoGLmYyu5z7+qjOEeiV47xW6PMDshacuDcLRT2/2R; 4:l6rBLTlZJU9F03Zh7/k2sPoKxh/GLVaWocPXA2qs616b+IH5q+1zcEppEqFwSiCFCNPyQ3LTwFEA/92jakZrjSl3rIYPKLdU8lVWES9fsP4imLDiqzNGuZRvgnSTNRMn+WMsLiaAVn5kI/y00ocPHIAmO5/9ai7KJqqS7KGW8NEHLwPCFpijexaQy2kCZGQS5Et5NyUeviXI4gsWdQysozaqdHtyLjr+ca+QxSRFT8X8ktH/YZIU2f5/svQXuNWrd6EPtPOWee/Vnm0/xZNqvA== 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)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:DB6PR0501MB2037; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2037; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(366004)(346002)(39380400002)(376002)(189003)(199004)(186003)(68736007)(26005)(69596002)(21086003)(2616005)(476003)(4326008)(486006)(81166006)(81156014)(1076002)(50226002)(386003)(316002)(2870700001)(53936002)(2906002)(956004)(106356001)(105586002)(11346002)(446003)(86362001)(478600001)(6666003)(36756003)(7736002)(23676004)(52116002)(7696005)(305945005)(6916009)(76176011)(66066001)(25786009)(55016002)(8936002)(16526019)(8676002)(2361001)(6116002)(47776003)(3846002)(59450400001)(97736004)(2351001)(5660300001)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2037; 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: =?utf-8?B?MTtEQjZQUjA1MDFNQjIwMzc7MjM6eFcrbittRGUyQXB4dlRPUzNIcjd1NEFQ?= =?utf-8?B?UmtYWDcxSmI4NXpOaVJZWWlUamNSZlZMaVhTSEx1VHV5aHNTTWZDY1R6Y05z?= =?utf-8?B?T2FaaDQ2K0YrUXZkakZIbUVDbWI5aVNscWdodFhzVm9qUlJtOFhWdG9YR2tQ?= =?utf-8?B?RDV0RE13b0xQMjVnZ0VTN0tQTWdKYUxDY3JqaVIyckN0V3JacXlJd255RzdM?= =?utf-8?B?cVpmdDZ2c0RPUUZVSUJaa01CWC81bDNjaU9jQUt1VVE5cWd1UURKWjNwNXJk?= =?utf-8?B?bVB3OGFWNGx4WG1tc2doTEZaRWF2U1NZMlU0ekM5MmV5RC9KWGoyS1VzWDZ2?= =?utf-8?B?aWpSRjJSdVNTRDZRNXlWRmREaUxpS01nSm13U0doR2trVkhvbVl1TEpETTBv?= =?utf-8?B?WDkraU45VXArSkhhRDVkaTBiU1JtZUthUjhDM0NWWlEyT2ZaeTJkMVRuZ1dZ?= =?utf-8?B?OVpBVXRqOE8yd0ovMGt0V0VRUnh0RnJCakR4d0o1VXdYSENiOU1xbHJPU2Nw?= =?utf-8?B?VG1xWERCekpuVjRORjVobVVIbEhqRzBYTGxNOTNSSk80R09qS2Q3K0UxL3Na?= =?utf-8?B?emwrajAxclpBcXBleExZdTExSWVJNVkvTERXN0VnNWdINmx2UTN3MzBlQmhr?= =?utf-8?B?bXErT3JoeWN2MFNpWW1ZUko3VmprWUFlNkFzRmk3VTRoVWdwRFcxOXdBcUhS?= =?utf-8?B?c21ONTF3a213U04rZmNlZXJMZERmcTVRaUFOeDZpL2tMbkcvTUZtS01haTBG?= =?utf-8?B?NGN4bklrYU1RMXc5VlkzR0ZFWFphWDA2YnpiamphcnZhQko5RjdueEhzVWxl?= =?utf-8?B?cllqVkl2aEtkc0YvR0RHeWxZNlZEbWRsSWpkNmI3WWgvTG9MRlVsSjRRQmtB?= =?utf-8?B?SFFNdm9BSUQyVVB2NlArVFR5dG5kVWNYMHQ3bWZrSWVJOFdjZUlVRUFZM0Zw?= =?utf-8?B?bGUrSXpqaTdxYUord3V0OHhqV3BxZi81TlFTZFZoZ2FXY3c2THN3VnpacmZ0?= =?utf-8?B?QWlOeUV4SXl1a1JYYS9udm9yeGIwR3VRQXNtL3hWUVRRVlpyZ3FIVVljeDhz?= =?utf-8?B?blNkQml2a1lHanp1UEUySVZ1bms2UWMxTGhHZjRWSjFreUZzTEtmc3JERnpy?= =?utf-8?B?eCtDSTRUU1U3VDBrK0RCdHUyZUYxYzlPbXNXcnp5cVpCdU9vM2pId0RWaFlX?= =?utf-8?B?ZERWenFjL3lOT3lnY0N2SHIxdlRDOUpxZ3h5QWo4alNFT2NSOWZaUFU5OTk3?= =?utf-8?B?bGNFVCtNak04NVM2NkJyWUVxRlZhSmFJU0p4SGdaZzcxMWt3aU9NQUE5ZVhI?= =?utf-8?B?a0ZZMkVGN051blQxSitlQTR3dEI5bmdwTDEyc1I0dlZkbUlQZnhXN1hLeVdG?= =?utf-8?B?a2Y1THE0WWREN2RBZlNFRTA3M3pvY3ArcjJuVGpnTVRBSFAvdlQ4ODdwSkFG?= =?utf-8?B?OCs0Sk1iRktKUnZ0RzBwOW9YZEJMSkpFZ2l5U1VGMk9IRWlZcnBHcjlKZ1JM?= =?utf-8?B?UGU0c1I5WVpnS3VmdUtFM2NjczJaeDdBc3dsSW1EV3BpNjdWTVJKelRDdnBR?= =?utf-8?B?ckFIWEkwcjJjSmUzd2JwYzFRSmY2WXZ2dzFvNjl2WDJvQjh4ZkpvUytEOU1J?= =?utf-8?B?SFpuUHl1K2F1UDZJMXBJczAycVNhMDMwVXZFbVNFamVaV0pNblZqaTQ2Z1VW?= =?utf-8?Q?izeVQgLLhUXvWqsPaO9WgojRVLhHKkXAaP4Vq2gUp?= X-Microsoft-Antispam-Message-Info: qgkUTaFgORQ7Jq74AkMtNUvpJV2qv+Ex5NPsCB/C8bf4jhgbeOsyBskEr55CXYb+OV3Wwp6eCzleurfv2IImMmiv+T3jXibxZdgFOSEB+Rwtisej3Bdmfv0wjvnWRaFqb9/3WJ6J2NJ8anHKEn86/VZQcRvUGBhxTEuXoIQp6XVV2/1KyLUqUyni5zoMnMqa X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2037; 6:Y6N9TBTCLAzrGjCDDhol/7HUjjoZ8uwaBhO9CzBfvy0WC25Emgq1uNkPWTqKsOXtio1Lgob+u5onzlWGVdJyu1bRmqJZY5FmgnoJMqUKleovyJp+WUsjwLQv6c25uMH8XfwwVrn+SDGiFATmkzVgIpJvDWMEAnbHnvWhIW/QEtEGRSR/ASJ7t/PEus8anVwZ7AdIrVJ1RmBysLQwSyO/eNQKtLwQGEgvcVKBObaVmGMf0FFaBxYDtCmWq5j5SMAUb3mFhFmZtLZ57o/f+8ALmHQs8ZdBgCOvkjzZTMvgrpcPxN7G1u4Kdk68crkhqv7s8UiM+zvz1Xu51TWcvmLq7nOKkqZbh077pqRDvzwKukfK9eWS6fqoh3mBV/9J0hhuw53JPtQ3xCE1cBdTbr9p05p10YugEka9qySZPRtLerLFVJEe1U97odf02VUZ77P1AMXppNcWcN481eOhToFwnA==; 5:OgZiKLWWeP5LlqZmcxYvLkb9+VWZ98i38Tu/A1xolrsMF1eJi7sfe/78SId9e97FHk6pMmaH7hrs02tmKe7QM5hymTXvSMgsAaWFAK8xtGVzhL1JWr5cK/tb4atUvFuVfvKTwMrKE5sRV1EtVdVjDDCud6tAKgPSVTN1BIYqxAY=; 24:hIKDN5VCGZM3VaJyMR956lwrJ1Pg2+kFdesq5A2M6B7d+iS87upBCd92ZJzWZ0Mw3AxCvhbzABGLrgYhSYSP/V18FiiMeNC4HQ8k/MUFn3o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2037; 7:YL40KV86Yp0bKLkC0OL/GQoy6Fry2Saw+JghgalQx2xiym3iYzdbRKRwWrjij6PkJo2nVkAPxRgaZdYWrm0mrDVXvXQKH0BunO1VCjYvNBEdwXE2/qNjdc84yGkpuDBLhvCybX3xtfcVoqfvKmYhU3V8XruSb6ZHvPc7UrbwERAkyzHy7Mder9+4IoWNbw5NfbK3I3EjwK/iGtRjUAvwiNTwqLcWhHpAoqHXwhBsL77rGjvqh5ckOuQ16lXYL1wD X-MS-Office365-Filtering-Correlation-Id: 086b0f8a-bd44-4fdb-1ba5-08d5ca7caaac X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:38:31.9575 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 086b0f8a-bd44-4fdb-1ba5-08d5ca7caaac X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2037 Subject: [dpdk-stable] [PATCH v2 30/67] net/mlx5: remove kernel version check 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: Tue, 05 Jun 2018 00:38:35 -0000 From: Nélio Laranjeiro [ upstream commit f47ba80080ab81ad513f843407bec7178fed8857 ] Kernel version check was introduced in commit 3a49ffe38a95 ("net/mlx5: fix link status query") due to a bug fixed by commit ef09a7fc7620 ("net/mlx5: fix inconsistent link status query") This patch restore the previous behavior as described in Linux API. Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_ethdev.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index b78756efc..7ae4e8577 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -46,11 +46,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include @@ -756,20 +754,15 @@ mlx5_force_link_status_change(struct rte_eth_dev *dev, int status) int mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused) { - struct utsname utsname; - int ver[3]; int ret; struct rte_eth_link dev_link = dev->data->dev_link; - if (uname(&utsname) == -1 || - sscanf(utsname.release, "%d.%d.%d", - &ver[0], &ver[1], &ver[2]) != 3 || - KERNEL_VERSION(ver[0], ver[1], ver[2]) < KERNEL_VERSION(4, 9, 0)) - ret = mlx5_link_update_unlocked_gset(dev); - else + ret = mlx5_link_update_unlocked_gset(dev); + if (ret) { ret = mlx5_link_update_unlocked_gs(dev); - if (ret) - return ret; + if (ret) + return ret; + } /* If lsc interrupt is disabled, should always be ready for traffic. */ if (!dev->data->dev_conf.intr_conf.lsc) { mlx5_link_start(dev); -- 2.11.0