From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0077.outbound.protection.outlook.com [104.47.1.77]) by dpdk.org (Postfix) with ESMTP id 03007200 for ; Tue, 5 Jun 2018 02:12:55 +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=OZ08DF4CTmEzcno+ucV3/0eKDLPcyCyFElB1calcy+kyhUj3SqteFL5Pw4ueON4u0x6EwKjexhi8L9QDiEucCGKZVlpq5dytE3nq0IWyBCauFB/TuxLMaZE7usNBfrNEgAApGF0ZsHuTp1K0eSQJMfL5luzh2gI5xusuQ8qnrcU= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) 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:12:51 +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:10:52 -0700 Message-Id: <20180605001129.13184-31-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-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: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:ogf+wy8zyRg1W/Ey8hlykYEKBQuFKsKP0tZDKZIWMnyz/SpJXSro/17LLEijmphEfyNgJFcNHv0SL7Ru4Vas5qALRuZdtXbmDAJRLyGl7Pb1+KhGl9raPV5FW41/k64pKMxh0cZrJ+DNKuC4Mq8tLerJ3jWQixuMJ6wTiT6nDHynKy8oqxYl9s11RC58kjGBO8o6woWDB+SmIR00nwITn9UFTyYDchjrRBT06OEXmWeWVJBwJG9gxuhhCHXzML1H; 25:3/rBrHXt7e6KXWyEMZdVupX9Ryppk5uheN4hU/DL1xSGbbdDsmjYiRAiweM6quIz4Uge2tjtyfOpglKbf9OTEWdMZwyfXkZ36uRcGo3UqrxY3VVFIvOyhWlmYEH0qaTfXo2er597CBsJlulp7hk+z3Mjn+/kTupwR9D4+oOfIig2ill/iR+osk7Hb4YXL39EHZ24Xze/Ria8OwUFKn8PH3mv1gcRkKEoSGhQ+nMl1uv/UpUTO/bgL/7ZiNI5QyV2qh7DQXa1+XQiYXbYz3Zjf6Th4G2wwxabXRjroXgb5/L4g5ao0pscqk7MweRAXXLitLLAn9FJYaFJ1t/wfBz1SQ==; 31:KynUfJ7omb2iEwx3qOCljeepYNaWkAzROM9cyFqfVOcncuCySfp0TUT5MQFhWAuMRwqfZ4vwPd5nP3z85p7ybQi5fiuBOOZn9PHeNZrboeKuQr2V0Pn9vbpkmGVwXHGNqW4kaoBRYksjcwoXbBafBQZPwvBguPK9Rcbs8GdOqn4FznDRyWaLXIw8id3EBoxU1k23mGm8ruccjMJBjFtUSoV/PV7wZ1QbRW55F+yB0Jw= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:0m1biMxq9c1ApoEQutIP7sbQ0V11PCHdQLpkORpbhg1Y68tB6ygHpEqyLt1nkrrK/eoQVbb33igCfuvALJagLLQywYbViENuNpkJBGPE3Bfl0ZOV+D8mE2C3QTMZoelWcuJdaXx76QiyB7rnjcFhIjv7Pa0LMQmX1uWcH9weKOCzMq3/cN3vtF2VqNevlPndMDmqg4GGbXd3RptremgIqGhpNhI7/k3cha/Hze8oVFeFY7R5yOHsl0c+5cMQgacyQlFLBN7PHsvTzC6xkRJ0utAJOEmKFGYG3UqNPHIG1EZ2fX5O5VLuVvfiBh0JufLBmvv7/xf2VTV+bcogZ5/pk4w0Vjkjc+drs++hap7IACiUtnlp+XNHBykzWB1j7U/agCZvyv0/ZQawTixpBHa6MF6PG1xnKJo4fJY356RN3/0Rgs6vMUQoUFT7xwduWykpMFP9u31uR3jtWi/wQie5xMsuiboLIwRifos9fxFZ7Gnlo40swBIK0h73idrNH/2d; 4:/u11Ok6XtwW9Ip05S4kAzfRTrMLeGeWwaqyxY3ACjwpFhJWnSGuuDg4vlzmTDWHVQitExOY77atkydzwz+78QaMZkYxZSrzivBc+ONAmO+uf0cbzD5h9o89uiM16dwy3aVq8jNSzSpvr6xJV2KYH6Yy0cbQXxUB1ufDnEtRoA//uxO4q1cb2VNV78tIFriqMj3vfyh8za0dkFCVk4ZuKxx2TT4CHQ2cfM8Xiv31Q7by2GDk7b0x/IKbpKUjhywSkoTGLvZw9WMoS7jGni840Ag== 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)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(81156014)(76176011)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(23676004)(386003)(446003)(11346002)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(2870700001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(105586002)(69596002)(68736007)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; 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?MTtBTTVQUjA1MDFNQjIwMzY7MjM6NGtzVEtqOEpYQlhTNGdEWERHeEt1c3Zz?= =?utf-8?B?cm0rMHhmT242RWpMYVpLVklmRW5lVk9ISGZERnJyOXpOV05uMitpZi9ONnZX?= =?utf-8?B?Z0c0cExXRGNONnFzVXFEb1lSYnU4bHpVcVpvWjk5aS9oSTlTL0F1MHF1Z21Q?= =?utf-8?B?dHZDVVBnWXdVNWdIbXFpZWNtOG81c0crL1RYR1cybDRqVFVlN0pKSHlkWkNG?= =?utf-8?B?R3IwQXptSnk2NDJFUmk1T0FXRDEwVno4bDdRb1JQdllDYjlIQXdEa0ZWSUtE?= =?utf-8?B?ZUtQTmZKT294V1ZCdVdEWHlVK3A2NDAxcWNaSzlMMlRZa3pLcjRjZEFtSkRB?= =?utf-8?B?anBSMXA3TWNlSG1wSWxjaU8vSnVyWnkvTi9VTUM4OHhHdXV3VmRKRVdqbEdw?= =?utf-8?B?WS9hRUJKbGNJUDhWaUQrVDhBb1RBcS8rRmlGaFpSUzMwcFQvZkxxRGRwMFV6?= =?utf-8?B?THFWOE1ZNi9ybzVMekpCUWVXSTJTUXI4TjErRjJReTRoUmk1MDNSZmpZeHdH?= =?utf-8?B?ZkplQWxuYVA5QVRDUFlRaWMyUHNxVmJxeWdXNE1OQUdiakFRRVRQdzJyRmZS?= =?utf-8?B?QUg3NzcvbFBhdHN5OXJJNXNRRFptanJnWkhGVU1Dd011dVhjV2x3OWloczlj?= =?utf-8?B?UEFQMlkwUE8yUHR5UUQrNU5CWUczaklHTGNNQWhWeXhNVjhQNlNadzhPQW5U?= =?utf-8?B?dVhpbFIvdDFRd0YzOHJlQjA4SWY5YWExVkJDTE9MYVMyLzVuQVBkSlZQWTZO?= =?utf-8?B?TGpaVHRRZ01ZcU5hTDZ5Ni9kRGRGVEE0alJCbHVSamN2eGdTSjJ2NkJabFJl?= =?utf-8?B?bklHTXNNa2FJRFdVRTBzNG9tNUhieisvL3A3RjcxQWhkL2JPNktPY1BXTzZh?= =?utf-8?B?aGVhRmc1VnlKVS9iYW5RR2xCUXVjUU40Ty9yUTNIYlJxcDFJb3R0amwxTERK?= =?utf-8?B?VlZ3ajducGZRREpUdUo0dlN4YisyUHlCR3hBb0JYSlIzNFVXRnFBTTZPdUtR?= =?utf-8?B?bUVNL1lUZ1QzandqYW1wMG1LbUtjdThmQVpHeHJKUzNKajhscGxQWUYwd1VS?= =?utf-8?B?YkNvdmJVbmZjZXpiVmRpRm5mL29GZldsSUVGcEJZQjZtK1lma1hnV2R6b3Vm?= =?utf-8?B?cVRZbkRPdG1BNnlRRm9WQ25kalJMOFUrcHNqcGxud1hmL2JoSkJtSUV0VFRo?= =?utf-8?B?SWkwTlZ6bm4wSFNiZE1iTFBMUTA3Z3lWSktHWGg5cEMrLzYvdmRKSW12VkIr?= =?utf-8?B?VXZuMjlScThmakw4Yzk5dEpJYThpbnhKVFNCZDAraGpOVTZoUUdMaWZ3cTFE?= =?utf-8?B?QTc4RFNiRFlBRXNCWHVnWGJkZXZIWm8vL2dIRjFPVFRMM3FBN0I1dWdibTVx?= =?utf-8?B?TE1Gd1hkQ1kvc2Q5Znc3dXAxWTNuQUd3TFg4TkdxYWhMaHo3djhYODg2K1Jk?= =?utf-8?B?UllHcWlUb2tSRThtOERGVjF1Q3Zxcmd1ZEtRV24yTTNPOFpZMHkvZ3pqZ1Vx?= =?utf-8?B?aStSeXpWdlg3TFludUQ1WVZMQ1M4MndLelBnaXFLR0N1R0tZcjAyYm4rNXFs?= =?utf-8?B?SWl2RFRic2lYdDlmMnBLYWdhZ3hIMloycUZJM1lxMkxWU1NwSko1TEU0MlVQ?= =?utf-8?B?RlNUVytaM1RJU0RobmRXRlVkSjU1Zm1VWXY2dlNxd2VWWHVZZWxyMWdpNTF4?= =?utf-8?Q?sJ9yg7sRUA5SscrWXop6i5ZYKFElBasLz3j3iqDdL?= X-Microsoft-Antispam-Message-Info: P82/9VMtdAsBOCVXGUQ2JcNJf+VvbtnGdOnUCQ8FaDUwb8YDfnrbVgEhNusY3jEJJuoRxGzmprFfkFRdc4MAw+kIzfbvTCsazdxhYUnsPf9y5qMB0yHAXNKDYe5VUzJMo9JrbqLZ4MukEFBa0ZSBRVhRdBXVN9PhViKyhELblLY982TSzD7CGG0h0z1NAdxi X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:SPHDLd4Zh0qc6/lf77zsH6Sbubrv2hD7fzn+TZGM9l3duQbe0Fpt2EbzmGiDn9bv5s+JT4hEeXcsPSHxQm+YTMhMGYKf5U8InMt+ojaBNZKlbOcy5a4sFu+fkHkyuump/JJrc6PWl/h7iZNfntVG0XNhgtgoN7lfbwcXbwOUoUgWw607C4G0YzRKUmDiOVf9JGqbBCxYAj9n4zHXwQCyKGMXKVPdjDQlTpccFtdZHVCjT0ZMJfYoi6marzPFVMNEUKpD9p8LspKNMwc+bnAcRW0YcgU0eoOGVUTKwR+6Pmm2Jcq7FCSb/Z7tNxOQQpo4cQKhsNt2/+CkszYapOFNoBkDSpiVyW+Z3wwAVonOjBZSxPWf67suqwGPPs3PCPe6f5yREod0phYeTPStaAPqjYwSPeiJGp3HKdR1199kcmlK2A5Wi2iPKlpfV/Mi1S1A37Ue8PLGGwSy0WQ6J7wE8Q==; 5:HfQpUrCVH3nWPrQHGAxEvSWM92N4aKyBaFS9zSvhWZ9T3Cr3k27f/KdIyhtcPhw3b+nO9vj5GT2yBfo6NmjnjCJHZtT33p4cqZ0UcJBckTY5pMPJQWgWD873QPPMC0INLyJWrnLG0spgpFnt/jYGK9bz1Hcxrj6aV1JXT/VtTvg=; 24:L5HlFMRYMGfnjhAKCBCaGTCLDuqIB4KbWfvTQGnQohJ1lhZbJyPKaJunwstlKP+ZPdblNT6bbad5+pBxN1i7/AaYMXywL+PzomR/5BaPpcE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:O4UnWKEEyI0Nq4LJ4pWmPWjuxpUy9WwXTQTWz5wahSGxnknR/nRm1Yq7onnlwh1rT5VNOmpBKsjwmFIKn8NABIh9IvqSh0K1WPSvpKctJYRRmHeAD8eOTUxdw0qh5yhrAeN02gqX5lQl/4mgMWew/hwWkakECaFMiQmKkETdYUU1Oo003Qhrwcl00iosOWxpareCWqBCgaPNGHkkbEuJstwzx/InoK0dSwfR2YbwvbkXZczRsbgdW06Izsxs7rYU X-MS-Office365-Filtering-Correlation-Id: 18641d3f-4676-4299-d219-08d5ca7914e0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:12:51.9174 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18641d3f-4676-4299-d219-08d5ca7914e0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 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:12:55 -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