From: Shahaf Shuler <shahafs@mellanox.com>
To: Mordechay Haimovsky <motih@mellanox.com>,
Yongseok Koh <yskoh@mellanox.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>, "stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] net/mlx5: fix compilation issues on old kernels
Date: Mon, 23 Jul 2018 07:57:41 +0000 [thread overview]
Message-ID: <DB7PR05MB44263046A34D95E44F82299FC3560@DB7PR05MB4426.eurprd05.prod.outlook.com> (raw)
In-Reply-To: <1531675899-27007-1-git-send-email-motih@mellanox.com>
Sunday, July 15, 2018 8:32 PM, Mordechay Haimovsky:
> Subject: [PATCH] net/mlx5: fix compilation issues on old kernels
>
> 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 <motih@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
Applied to next-net-mlx, thanks.
> ---
> 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 {
> --
> 1.8.3.1
prev parent reply other threads:[~2018-07-23 7:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-15 17:31 Moti Haimovsky
2018-07-23 7:57 ` Shahaf Shuler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DB7PR05MB44263046A34D95E44F82299FC3560@DB7PR05MB4426.eurprd05.prod.outlook.com \
--to=shahafs@mellanox.com \
--cc=dev@dpdk.org \
--cc=motih@mellanox.com \
--cc=stable@dpdk.org \
--cc=yskoh@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).