From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70050.outbound.protection.outlook.com [40.107.7.50]) by dpdk.org (Postfix) with ESMTP id E55C62674 for ; Wed, 15 Aug 2018 19:03: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=VRMmxVwsrlLCVfFBiGg507YRiyuM9k9uenfcDRS0Rdw=; b=Uq2NDQb9WPHful6o88amm2Myhh8wdN9v/dtjQEJqLUk4Ogj1p4zxxs4vQKx0aPJB84tbOfYFwEB83jdHid+PTyFpxrzDnNHcLINFATOxGBf7US5szxb/Jv1+POtdIbXa4GOmzBCp1lVTx3q9VwwesZbulq6Ce+Twmg0gWsGfWY4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=motih@mellanox.com; Received: from localhost.localdomain (37.142.13.130) by AM6PR05MB4440.eurprd05.prod.outlook.com (2603:10a6:209:43::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.20; Wed, 15 Aug 2018 17:03:11 +0000 From: Moti Haimovsky To: yskoh@mellanox.com Cc: Moti Haimovsky , stable@dpdk.org Date: Wed, 15 Aug 2018 20:02:50 +0300 Message-Id: <1534352570-12902-1-git-send-email-motih@mellanox.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: VI1P193CA0015.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::25) To AM6PR05MB4440.eurprd05.prod.outlook.com (2603:10a6:209:43::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5bfc13ec-feb1-4bf5-e761-08d602d0fbf1 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4440; X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4440; 3:7yvGY3HFRpZppwV3Q5OutiM+heMIY2I+sEMCWOi18pYixzAct+6cR0vAOLsxNloCHa+IYqreVj/Ef6qMwbyzxpN4BzK8YfxtEoMRY90HKmQl5/nQIxB3kbKUZ7bO8UJuKZC69uObRp/EuEage3khgxdq3OV9o1KKbtKGd8NICcamkj3BRNNWtLSO6ndHLBGl17rWrVm8Y50imGmVilg9Xrg1wH7imFTrihSAOjF3A3anjzQO84Dl9egwje7VoThT; 25:qdUpi4qVSXkSmdCjfVEVem93o85292GvsVgbirHlZkaUJ3b6iDJHXgj17at1SPl5pdF+jGSKZoZApVSXo7rNEpaY91P8XykFZ558YBMhlo8GcCGNKOPBytMwPP2KkRB1R8dzue+CUNkmsH3Rr0M5eJQd21PHnJNNWDEo2/RQHds7sU1Cts7ZN0mZ4n5Y439YdAjJaRNjDj9/0o/2HzGCPJEJDSx7x94csdC4eP5f5iHuyzADaWRIr9bDeUbhCj6moOGxOjH3dyy+VDvDHGfCAW6n/lJ/WlMHuxh4WcAY/KCXOwAgOFYDWeTwRxG8CwLAjCcbCOzrtb9q8X/lyCrBnA==; 31:u9P+Ves54REEmty5oJTYD0Uh3W9rkWMBZJ/qTRNcLN0cPCHNwj85FejoZX68aS0BKcNGZa0kn6a7A/lAXCnqj9uxYBV1EPQQbpu2MDij4MmnxL6CPrFiMmMQNUpPC5MGjDsWGmdrTxcZN9umRZcZzIdietjhF+0LnhpIymtz+kSI982ona7+Bji3ew3r8GyOhYA4DHQyi078Q0tw1+dYU6jyBsvdaghxE8DIBjdtk3s= X-MS-TrafficTypeDiagnostic: AM6PR05MB4440: X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4440; 20:ENCzau4AolBJZm4+MBZhoG2fs0FQDQ0o8iJIZxG2TPPrRSIZofSQW185OYPYzgj/Wk1Qwa5AkuwoPqkrhCetAjegcZhlkbNYCoaqaYJ//jQed5gz1PxhsRb3aLpmFFp/DB4oaKu30Wbq7cPWgEBW/Y8Ld2TXV4y4GNj+M186Hloorm7zFxBOULSlp5l5nd9rC/lVGtAUKWzq6XKCQitIWruySr94oqglibANcKm18ZnYUMZcbClvmpbBdZbh9aaIYC1iAhso2bPwgo03lleKnm0oWCnYcOt3nc4xT3LCuFSeUDPI2NYpssjua546lDBuHroXLNZU8D6RdiH0Is2f6ysUi7JxpypoC3MdZtmJQzCe0GSBDYnfqh/BYfngwPx0ELbHOvyN3O5zowhMKWfhKnSsDXPcr0+d9hKkMtRvhTXK/tkoctPUfNu4IvmKYOCHBg91yLvXs1dJRRRD0c90qFFD8RpZS0WXhRRcot9WDOvbQ6rNV2hjm2qZl0V44tmu; 4:Olk5LPPLwlqP85jvw8SEVVRdPq9dQRAFZdFNBQJod60VBUEmeiYmbLI+VV2dfeybdBSyGTIs96j3uDT7tdEkZs3Uh/tRAef/AxDjB38XZK4/qj/EJSihsL4zyCAnQB/cd5q1vLbbH6ShPSWJsAMoBoZWpByo2ZeyZWiOtVFlI7QlNf02hv1w4O3CK43FqOYUzoL8P7ixvICuASTb99IbRyzM+ijlChUdmPXvpNPh4mfJBGaBj2tP63iQNPFaPsr4/chqP6vpmwyawe1zgrcekw== 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)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM6PR05MB4440; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4440; X-Forefront-PRVS: 07658B8EA3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(396003)(346002)(136003)(376002)(39860400002)(366004)(189003)(199004)(34206002)(68736007)(50226002)(8936002)(14444005)(50466002)(48376002)(4326008)(25786009)(476003)(486006)(51416003)(386003)(53936002)(26005)(52116002)(86362001)(575784001)(1857600001)(6506007)(37006003)(956004)(16526019)(16586007)(316002)(2616005)(106356001)(97736004)(2906002)(305945005)(7736002)(6486002)(3846002)(6116002)(6512007)(105586002)(36756003)(47776003)(66066001)(8676002)(81166006)(6636002)(6666003)(81156014)(2351001)(5660300001)(2361001)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4440; 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; AM6PR05MB4440; 23:G2zEvbDg7D32juGiL0R0XsEsFEIDHq76jtBEbSYks?= =?us-ascii?Q?OeoMCglZXQ+fskug9SJSGp5gun0If7I+heVOdFs3qCZEgO9hmXfLCWU+bQ2j?= =?us-ascii?Q?9ubtd2Fts9ZVqjmVYDeKaMth5tRAe2fEM3RYuCfVAP/NN8PkTAn9NEsnspno?= =?us-ascii?Q?gjsnZoTcS4U8ggQbo4rM21yCpFMWFYrSzOJs+tdjNQ+3eK/8pwThDnUbHVOz?= =?us-ascii?Q?7AseCnrtQ7oI4Eu6d+an9VgAHat6RJ5smB7hNo8x1Gbpr5JZSAbExGI2QsUX?= =?us-ascii?Q?ElKjJWBamdzfIKZrZIRiOPxbRfYxqUr9TeEIEND4OH84wJAqqVAlzefvoT7m?= =?us-ascii?Q?nZHenjSjAVAx9f3pRRP4ESE9VwOZHad4kVKsPnQ33XKaEqnuOMb5XiLWpSKe?= =?us-ascii?Q?bm9AabLBhY5SiQDpC/vI3zLRAek/DQbLbto+1aYp9FX3s9+dLdWCy+y6Wo3K?= =?us-ascii?Q?24F2FIsjvFlRxPXujJP52fgzut6h1XdvPAedSF17m+JRAsZwoe+bV2fw6PX3?= =?us-ascii?Q?CVCMjB5H0s0O8PiwQVyZY6r54ovFulHNCpknX25AJscRM4u68Zy26/maUo+K?= =?us-ascii?Q?19ZyvEwzGW7MkoL3rGeGASgk+0bHYNqGoRoAlV5T02ydEGqsEGmvWkcKCgmL?= =?us-ascii?Q?KWGyEMYP4Z8sysYGS9Fnt7mnsG5OBJQaeebb9or16SjMIzIvxLvhXfmS1IAh?= =?us-ascii?Q?qvvl4688w0Tcm9Uv8o7Iy6XBfK+yvkjYMC7DlCFFPHW+TyQAIxK06IMAC7iN?= =?us-ascii?Q?Wrw6hnpW5CRRlRBJpiZyT1yflCU+DGvRs3qaSVx4tBndkPmurzHWiVgSOqn+?= =?us-ascii?Q?VY0edTgfTDyMuro/CXtbepv4fgLhh61ASXZD+5nGxL/BvYsSuDgv3tbb1vMh?= =?us-ascii?Q?Ms5JqmmhG93MTOnRRl21+ZKTDkNYrR00YGqLaxbvcJS4jWqsT6TxfPRO/d+n?= =?us-ascii?Q?syI3MSiFDRC2ky3QTq7n1sPt+e2JK4P+asiQRvPXZESdEfIQkDIk7wX5euf0?= =?us-ascii?Q?HreEr26MgtKQDJz9avlaTTMvPI/AbhiaJnrJIj7lL1vvMJzcrAxsHxdxZrwj?= =?us-ascii?Q?pZ8jIDx7FucBFec7V/W31ojyuQ9b4r5M+LrVthaFJY9z18R9x4fMdvVf8yIF?= =?us-ascii?Q?K+RfDkqU25wSnYObQ4En8BkmV5gOlWQ+b71CeYP4G+b6dMIyV4EqLmOybdqK?= =?us-ascii?Q?sCp0ICRYsssGYnpE4Eu7AXIt1tdzEyyf+XXXNpCeu0u3RmVtAyZ7E1xMSAxD?= =?us-ascii?Q?77mLbjvF94R2Rrgca0SKH/04zA4bbIxuZ2exMwN?= X-Microsoft-Antispam-Message-Info: oFU+baWKkSOfFEphETBXvuL5g0WMu+MqVEqKHgBdcrYDyqjiYAL6rDrs6j3+fDYNm3+5eTf83V7xinIj9sM9aObyZw4yTM8xKetHuoycBjT2AF5Xoyt040PNPFC76tq0eqFbUiDVv1O68C5MV32P1JzEuPox3Cyh+5ZS33tPhiPF25AEfELt3eWfKAA8LBaUf4vhFrYksQAB9IFGZMAbkvTlYsf3zeNOXQkjITcVZwlE9kqzNDZCnpJFWlUGenXyqdkNH4KEMiPQctkPRravKvlI+yTpWleXxZYi4WCrN4JPh/FKjYN2BRZsFzg0fpCIkguVyvP2v/bKk5gpwSmqa4tk+PfZ8qCOgq0TCLTztO8= X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4440; 6:SSFWmg0Z6FMj5qT/Z3Q8PPgXP+q7q1ve3RmsExTC8GEcOfwjXItPQB5gOX91XmQQ0iKPHCx+UEB9mjbCtjGxD7ZJZeWAiyKDsqvODwc/iLftCYThSsQaZGMKMOhbXAmlhwXhEUu0GslSOVRdgp9wIzt7JpPrllKmnALpVCqp1xyjuHb2ggFZ1hPV3lgbHPe0QS4D7gCRl4eykwsVxhehe68/irGuPvwPT/ubutZNRefaBGmSw5I2mJPcto26QgyKjf6ml1g6X0VNhPldoqWwsigyPHSfRDz+povyvRz9Ted3v8bo1IXRchkLOEFIENLw4ppzzLbX3tGgUoWIXqglzKoz/tm30FlO0J6NZla18vJUP2VggDLMF2ODRQNURky8c8k8xyiFvHeiHpNtR8qo+JQ5nl2yWz340L5J5C/3m7GEZlB8jgYc+RuWv92LRjeWTAn3ndL9TWCKk17uiI0KaA==; 5:DgNJTDYRKOqetSPxJdxCYY2NW96nzcpsI3UDrPwAuyIC2V+Giq5aMguwqUdVuSyHrZIst0T1GHdSiVZPgvtUMNyIp6XjlB45YEzYQbixb0rc6kY1UeYiO+retuZCRuGb3JV6w8QSToovMXLAcvZhJu3fk0srqMp0peXwZOq73A0=; 7:hjHDBH2YbxFaHjLObM4KNX/GZfg5wp/0JJhMATGqt1009St9gJPjE0ezIVllhmQGitEvMo0DBzkzf7ooyr6wR1xSp8fK/WV1IRrvEAMyKksPO4BQLG3QE0PIX13nbhFr+T080tnv1WFpFGc06YZjKxM1SrDX4O+/ex5VykTPJrZY3+19kG4bcJ3dmxFVvtTZgkcYi+/4pbELOGsHd7vf+pu8zdi0JTlK3DFmogM9/7dFO891TiWIbGNwwbHZFPxn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2018 17:03:11.6328 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5bfc13ec-feb1-4bf5-e761-08d602d0fbf1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4440 Subject: [dpdk-stable] [PATCH] net/mlx5: fix build with old kernels 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: Wed, 15 Aug 2018 17:03:14 -0000 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 6f0d51a..c62ad11 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -147,6 +147,51 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh infiniband/verbs.h \ type 'struct ibv_counter_set_init_attr' \ $(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 e9cda9a..9c64bb3 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -124,4 +124,9 @@ */ #define MLX5_UAR_OFFSET (1ULL << 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 5edc751..e441483 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -66,6 +66,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 { -- 1.8.3.1