From patchwork Sun Jul 15 17:31:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moti Haimovsky X-Patchwork-Id: 43091 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 689A02C38; Sun, 15 Jul 2018 19:33:15 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80047.outbound.protection.outlook.com [40.107.8.47]) by dpdk.org (Postfix) with ESMTP id 65CD12C24; Sun, 15 Jul 2018 19:33:13 +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=7Ye+z4EJHat3DsHU2p9yiO3b1OtfA9Ss/3GO+W5i+Bw=; b=cMQw4MwoG+PVQ6RUq7iROXm1lm2icJKf5CtcPFYu0NVst8gaIH+Peq66t61pjxeTURvb6TqXJ56GW4GhELFxeFSe+t4n2ZTP+2/wVmw0fsJYPF1k3zFMde4lF7qb+BLMM6PJSe5Ta0PARuRhDbJiaAxqt5TW2+gRFJUg+wNWrdI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from localhost.localdomain (37.142.13.130) by AM0PR05MB4436.eurprd05.prod.outlook.com (2603:10a6:208:5a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.18; Sun, 15 Jul 2018 17:33:10 +0000 From: Moti Haimovsky To: shahafs@mellanox.com, yskoh@mellanox.com Cc: dev@dpdk.org, stable@dpdk.org, Moti Haimovsky Date: Sun, 15 Jul 2018 20:31:39 +0300 Message-Id: <1531675899-27007-1-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: DB6PR0202CA0010.eurprd02.prod.outlook.com (2603:10a6:4:29::20) To AM0PR05MB4436.eurprd05.prod.outlook.com (2603:10a6:208:5a::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d829025f-e55e-4c45-0216-08d5ea790960 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB4436; X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 3:D/LaxSHf1tdopzRlRuPukJZ285SqwquqpD1cI2gyPvyWhWqjbgT/4dL3IcDQ2f68HU5j9v81haiecyrleVr+jlothwMfPPnZFy7rdOR8Og9V2noM0HGS/COc2BorpmaQSctsM/J6OWW2FFmgl6gBgds/0YjNhiUOAU2cTjE9eOsWx/ozABoPPlf6CK0llyYLJNePVPsO4ylSWUcJOw1pJ7eLnYGJV0ysATOiL8hVlK1CqCxsAWLSDcw4+pvR3Eul; 25:+DZum5YCGxcdgZbotdwmH8pU4FE4cYWY/QXhmFD6u0bhCIv3EBFJ22EvTONTRCR54micic5lkAzdtTkpoB1X7Xv+C5hmM2Aa2Ip/7MQ9eZRlmyhXe/UFrjV2oFhzlOlewZO75r2/dq7IdvBoC2ZbOjPfYVeDD+qQb6bReiXvjYGFbOj09NkHPF93QMRoCN88R9wNmsTV05PmqzkM+48rTPj9NYB9X4gcrIgk+woeqcb0nMTljomzwu1nl9+YSH8z0anUIk2NAfQgn0jEZmzrGTwaKhpO7ct/KxuUff8Q4syjIkovoquohOc2PKe5NXt/HYyYPzF0eDw9Juj2tKUPVg==; 31:AmMQVAP5u2Wr9rsZtewj3BcouLkLTQNjPXyyfsI5iHyTaWcLBM7dyV89mllv7rn2SNbppva7Wy90wRTIJyNB/yBTVTE/YCv28mPgu+VbpSiFz/Nr+AGkwydDs4Crv3ncaw4orvqVAKwNGdNeXlGBROc0OfjFESy4GMPehDPrf9AVZdf+nt0FMHk3vf/wUzwWQCa1UP3R734FEUPJXJXvkNL0B8MhThhlan0V/4MyhHo= X-MS-TrafficTypeDiagnostic: AM0PR05MB4436: X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 20:jG5SgDWL0TSSyx4YIPqGHHhrtgHqCUCOqXh1ISDR8MOQyhaOykqV09tAogGcZglt8uJU39A1l/tfReOFJAOeRgDnHOwlgijSf+SUKibxLGj8OimgTYxEkpXh4Kh0LDjcWIKieGYjI9wk6Y/a3lgfi7aBhjsbUEfeDOTXRRzauuIvtE3848oxwAIuQgS/wv4D/fNDTdViEPz3iJacjqFK2uACsFzFl0iK28Q0rDcqS/XSaBbIcfDMMyohVFvQiyKi1OzWhb6IPfXOEpR+b+KtnPFAf15GuNixppHyWbugFz5OXpXiLnfvD3/pUy2hIkIEx28BFgfLCX/KdZEKXIkdDgE3KU+2S2VtJnsOh7yhDKq87m79Zr8mQrnN+clZVU8qcd9qNh+VHynlB8FUdGMYIuvKdodOUk39RWM79vTrKtqzUmAHkmT++WR0cMQ5jg8LjDc4xok035gyK9i+APBZgPPSp2n9Ymm/8gKPl5l4aRbEZglVH6CmgUBxmsk5WiZN; 4:ZtN3a70w4ooG6r7AnhK7lP/5zf5aelmiMEhc7PmQAccxeIT/LJCqAvIfE5suGSi1s+TXWvuAsw+zmsBDVu7YvE4DbzApavrS1t1JymqlRV9yV93P3OQqgrYzd/SCn4GelQ4jLxQyQBpDunkOXJrUmuz2I51+opeLl4tuDsGI8HS9YDXQgkqrBRQWVbbhqkbOBoWf+gGXFyHekXMwq7lV1iInxDrQ1REKxS5VORG/pNLF+ECAjXzDIRLmkmCiuZ3i+Hf759uZBI2nRBPKG/rGmA== 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)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM0PR05MB4436; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB4436; X-Forefront-PRVS: 07349BFAD2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(396003)(376002)(346002)(136003)(39860400002)(366004)(189003)(199004)(81156014)(8676002)(3846002)(51416003)(6506007)(16586007)(386003)(85306007)(48376002)(50226002)(486006)(50466002)(105586002)(25786009)(450100002)(52116002)(6116002)(316002)(106356001)(81166006)(478600001)(47776003)(2616005)(305945005)(956004)(2906002)(26005)(16526019)(476003)(8936002)(36756003)(7736002)(1857600001)(66066001)(5660300001)(6486002)(14444005)(68736007)(86362001)(6512007)(53936002)(97736004)(107886003)(6666003)(4326008)(6636002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4436; H:localhost.localdomain; 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; AM0PR05MB4436; 23:5l+5odtahoPM17ap0SilpCwGrG1oo1sQ6SaxGHay5?= Ph4KT4kquWx6VFstnceIRHeayP6ZHA8tOqB23LHD17VQ9sIZO8ra/w8EhFLEohHU+9K4U/7RlBT3UdZUmLRpUWCkUSERaUFT5ZeIOzMYl5bzV4i4/+kfVvVIhDJ9mP5a7CYzS7LMRgpL30xTK9lXWbo6txpEJvtBNe6xsdzSubJ38JoYBZJwLJwe7mzNTWpQXCpmrN+CFUpIjcy8SkqPvf9dHBpJuZIO3wtcu6Zw+0JYgnjazC1llS1OLs1yey3rayrENZZcoLGDmSCu4KthG/9GnVWbl1tfd41iwh/1IMZjr5sQMJDDAEIqR75LJ0CX12+Wp6jv9rOMp3/z58Y2aFykxeVyQ34D2OoOXcHdwhoIbmGnLZY7Cs4JwsPFttbw5ZoW3gDN/WiJvDIiKD462Z9cuJVe2iAcNyYyX4ZNw+X/YiBCxYy63cWTrLal/rDPTS40gkBcqyv700SI9jEJIX1znLJG0rSAWhnOI9FvfZtV0iw/0dzlUE9LRX9/Ikdet+UMopcoClcy8C424WtE1R6kxvjDP06e+bgKFdlAqwUOHEXl9UG+7ZVwChqGxvEiN1KUCCibAc1lyTBpWxoftCQikfa34befBmD0/NIVuryse8r7/VvN0RElM0mYTpz/WpinIY9RIk1qJaV+VhIQ/Uqxt00kGm6uXEWJ6oMMMXnmjP4ZH/7nGqfJsf3BUfy6HqzZyu6K2hmdqzsUiD6O3ntAPHKoiOhlcdO2r9k1Kt3hjCgnkzc10FAn4PzTL0ffNQIQYNiWfFmCEo58R4VAseX1EeRQXBSX/kBdPELJ+9TkqAy0u2klZH4Sxj8PYL0493GBX6zt+gOGHq5u96EW91zOVESgi8VFYOFVF7N70e8unMpxJYU6eXCMxSV0x09acOB2aGh9g7FgCxwG26gFcOeRDCPArs4dyXF2Rz6rw7+2DhCnogQP1JHR2nweh+zXJ5wEVZjWY/Fgaf9Qde9X4Ma72gwvTSZTCCZJ7Wx81QrZXlRIiK8yzR26KNBTEt1SNYP2OwQHaUzKp5oEPCcopoyLzRzN0OCcO6zkJ+SiKKs7XL3Iy/SO+I+LaKr6Ra/MKR0UP7JcWP3qeOtQaQ3UQrRnTuIRrR1nNDXZchVZ/F/8Czxbkjfqwb59zirjnzwk7N+TNVlqwg3tK5wsaVI3asMwDED1UJIlntyHyqEPvacnw== X-Microsoft-Antispam-Message-Info: RO+nxUyZTjjhkJ6FF8qRmvU8yOvFdBcuI+042mEM7zzqtew2ZtQc+sQZvVgecXjHPXzfkFF1mjchLCQ99fGJiHav2kGMCXBpa+ODddrxZByvSBeVuSOPcKxTh4beCOhzE4iaSeRAMrzKSO1x2hrZbF710TPcmtvfGtbfVK2gtXcd6sq4IGmt5CeGASrMMnXvWp96h+r7YGdPpmZExnloc3dFXBSOaahp/nJ1UlPJb6rYatdLmXWcXmwVk6zwDMmncjJFH359z/JVX5V8N+EVtv55ZYw4xpEksGe2p2vJD9F/Y78r2mTPxS3V117mMdTyxHnzaLLEs8Y+uafuoQrhZ7rMBxiuiS8f+HBlKmAQNnY= X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 6:4zDIdI/hU0Oa1e7ps0Nl4FWyoMmwKJjcmYUk/7Rup7vNmWt6RVLr5yxrFP/d/IHKW8pejdEXN7kyjdZOLXUhNSxubvNFekCm4hnJbgwQuVJAXM2zL5mbQxGKYi1ZjGcVA8uvmHgMaONEcEIASOVJ47NSlBuSvee7L97mo2mLpYUGvfpCBmyH7xFhj/RjD2x2+g8ttzKrAelDsJc2r5WOutU9Q1bNLjRq1CNkDpsKrYBcOjGPnOR+VL5HbvMiKmjB8SnuHBwBKaUOBWhWd+08CGnWDTFx5gIcX43HM1rMU6VohRDOELOu0qLfb27pZYHjxe+g68TY8iwo3gvZvArZ9m32k5nvDc4KRuyYow2cXWwPECVgx6c/ckb8TFMZ8YjDSEH+8k3PffmpSMrHZ2Up3INbpjwBTkokqxOhu5CESbiWMcu++LT5b7eUxX5+7+Mz/WVJ2O1ee4WYtDLLfbodRg==; 5:NOiIpGTC4eslOA0baEiD7bYAhIPGp+sPQe7p3S0IWXldB+ChrmIBumO9LKEQmb9bbaKLo4E4mlkL3zy//M4CAetvd1NjjmOX1krYUCTQQJ0bsXOKn5VICuqb8KIkxlIuC3fuXCPA8sxWr3c5QvZQxokmNodW9sReiyTe8aguSKc=; 24:ZIgy+6535K2rahZltzEVn1b40piOSHXPqZ6ho9B8/gG7R4VzgiihJz7cyLAMev/VzwjuSPPN+ylqDJ1lYrmLoC+w5jWwY7mTa2m0ondm/RA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4436; 7:/W6gl4RHxs12tLomu2/1jhf1TnhTWDD+S5ksiXQB+k3Z4+9wWluwm4pHYKZ/0KLhn30cFOSJhsE7kfk1ojM5MTe2mG9B9+lyr10MHeOFgT2FWW9sdjF27CZvbni3n8jOBHK790kRRroo9t6vk4Bc04BRj96fgxOcKNofSEHvW8Bhoyl60yPotOlnFI2I8jsgflqw3l07EnIhM31hRrjOqiiW0ZrOjEmwtwBDx6yIVQt7tjjh3MrRtgrDJgABDzrl X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2018 17:33:10.3116 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d829025f-e55e-4c45-0216-08d5ea790960 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4436 Subject: [dpdk-dev] [PATCH] net/mlx5: fix compilation issues on old kernels 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 commit fixes compilation errors due to missing definitions found when compiling mlx5 PMD from DPDK 17.11-LTS on Ubuntu 12.4 with kernel 3.15. Fixes: 75ef62a94301 ("net/mlx5: fix link speed capability information") Fixes: 5bfc9fc112dd ("net/mlx5: use static assert for compile-time sanity checks") Cc: stable@dpdk.org Signed-off-by: Moti Haimovsky Acked-by: Shahaf Shuler --- drivers/net/mlx5/Makefile | 45 ++++++++++++++++++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_defs.h | 5 +++++ drivers/net/mlx5/mlx5_ethdev.c | 26 ++++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index d86c6bb..156c130 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -197,6 +197,51 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh linux/if_link.h \ enum IFLA_PHYS_PORT_NAME \ $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_SUPPORTED_40000baseKR4_Full \ + /usr/include/linux/ethtool.h \ + define SUPPORTED_40000baseKR4_Full \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_SUPPORTED_40000baseCR4_Full \ + /usr/include/linux/ethtool.h \ + define SUPPORTED_40000baseCR4_Full \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_SUPPORTED_40000baseSR4_Full \ + /usr/include/linux/ethtool.h \ + define SUPPORTED_40000baseSR4_Full \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_SUPPORTED_40000baseLR4_Full \ + /usr/include/linux/ethtool.h \ + define SUPPORTED_40000baseLR4_Full \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_SUPPORTED_56000baseKR4_Full \ + /usr/include/linux/ethtool.h \ + define SUPPORTED_56000baseKR4_Full \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_SUPPORTED_56000baseCR4_Full \ + /usr/include/linux/ethtool.h \ + define SUPPORTED_56000baseCR4_Full \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_SUPPORTED_56000baseSR4_Full \ + /usr/include/linux/ethtool.h \ + define SUPPORTED_56000baseSR4_Full \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_SUPPORTED_56000baseLR4_Full \ + /usr/include/linux/ethtool.h \ + define SUPPORTED_56000baseLR4_Full \ + $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_STATIC_ASSERT \ + /usr/include/assert.h \ + define static_assert \ + $(AUTOCONF_OUTPUT) # Create mlx5_autoconf.h or update it in case it differs from the new one. diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index f6ec415..439cc15 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -128,4 +128,9 @@ /* Cache size of mempool for Multi-Packet RQ. */ #define MLX5_MPRQ_MP_CACHE_SZ 32 +/* Definition of static_assert found in /usr/include/assert.h */ +#ifndef HAVE_STATIC_ASSERT +#define static_assert _Static_assert +#endif + #endif /* RTE_PMD_MLX5_DEFS_H_ */ diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 6e44d5f..4b2231f 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -42,6 +42,32 @@ #include "mlx5_rxtx.h" #include "mlx5_utils.h" +/* Supported speed values found in /usr/include/linux/ethtool.h */ +#ifndef HAVE_SUPPORTED_40000baseKR4_Full +#define SUPPORTED_40000baseKR4_Full (1 << 23) +#endif +#ifndef HAVE_SUPPORTED_40000baseCR4_Full +#define SUPPORTED_40000baseCR4_Full (1 << 24) +#endif +#ifndef HAVE_SUPPORTED_40000baseSR4_Full +#define SUPPORTED_40000baseSR4_Full (1 << 25) +#endif +#ifndef HAVE_SUPPORTED_40000baseLR4_Full +#define SUPPORTED_40000baseLR4_Full (1 << 26) +#endif +#ifndef HAVE_SUPPORTED_56000baseKR4_Full +#define SUPPORTED_56000baseKR4_Full (1 << 27) +#endif +#ifndef HAVE_SUPPORTED_56000baseCR4_Full +#define SUPPORTED_56000baseCR4_Full (1 << 28) +#endif +#ifndef HAVE_SUPPORTED_56000baseSR4_Full +#define SUPPORTED_56000baseSR4_Full (1 << 29) +#endif +#ifndef HAVE_SUPPORTED_56000baseLR4_Full +#define SUPPORTED_56000baseLR4_Full (1 << 30) +#endif + /* Add defines in case the running kernel is not the same as user headers. */ #ifndef ETHTOOL_GLINKSETTINGS struct ethtool_link_settings {