[dpdk-stable] patch 'net/sfc/base: use simpler EF10 family conditional check' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 68409f9a6cb68aa0157b828c971a251a2738112c Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko at solarflare.com>
Date: Tue, 28 Apr 2020 14:37:24 +0100
Subject: [PATCH] net/sfc/base: use simpler EF10 family conditional check

[ upstream commit f201b886b74f60886477188a9b7510102a712780 ]

Fixes: 4f12e20c85dc ("net/sfc/base: introduce EVB module for SR-IOV")
Fixes: 18c8e84d7726 ("net/sfc/base: support proxy auth operations for SR-IOV")

Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/base/ef10_evb.c  | 4 ++--
 drivers/net/sfc/base/efx_evb.c   | 4 ++--
 drivers/net/sfc/base/efx_proxy.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c
index 1788a2c96a..cde2196f18 100644
--- a/drivers/net/sfc/base/ef10_evb.c
+++ b/drivers/net/sfc/base/ef10_evb.c
@@ -9,7 +9,7 @@
 
 #if EFSYS_OPT_EVB
 
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+#if EFX_OPTS_EF10()
 
 	__checkReturn	efx_rc_t
 ef10_evb_init(
@@ -549,5 +549,5 @@ ef10_evb_vport_stats(
 			EFX_STATS_UPLOAD, 0));
 }
 
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
+#endif /* EFX_OPTS_EF10() */
 #endif /* EFSYS_OPT_EVB */
diff --git a/drivers/net/sfc/base/efx_evb.c b/drivers/net/sfc/base/efx_evb.c
index dd64bc7854..5fa0d99809 100644
--- a/drivers/net/sfc/base/efx_evb.c
+++ b/drivers/net/sfc/base/efx_evb.c
@@ -28,7 +28,7 @@ static const efx_evb_ops_t	__efx_evb_dummy_ops = {
 };
 #endif /* EFSYS_OPT_SIENA */
 
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+#if EFX_OPTS_EF10()
 static const efx_evb_ops_t	__efx_evb_ef10_ops = {
 	ef10_evb_init,			/* eeo_init */
 	ef10_evb_fini,			/* eeo_fini */
@@ -44,7 +44,7 @@ static const efx_evb_ops_t	__efx_evb_ef10_ops = {
 	ef10_evb_vport_reconfigure,	/* eeo_vport_reconfigure */
 	ef10_evb_vport_stats,		/* eeo_vport_stats */
 };
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
+#endif /* EFX_OPTS_EF10() */
 
 	__checkReturn	efx_rc_t
 efx_evb_init(
diff --git a/drivers/net/sfc/base/efx_proxy.c b/drivers/net/sfc/base/efx_proxy.c
index 791105a5a0..ecf703b03d 100644
--- a/drivers/net/sfc/base/efx_proxy.c
+++ b/drivers/net/sfc/base/efx_proxy.c
@@ -23,7 +23,7 @@ static const efx_proxy_ops_t	__efx_proxy_dummy_ops = {
 };
 #endif /* EFSYS_OPT_SIENA */
 
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+#if EFX_OPTS_EF10()
 static const efx_proxy_ops_t			__efx_proxy_ef10_ops = {
 	ef10_proxy_auth_init,			/* epo_init */
 	ef10_proxy_auth_fini,			/* epo_fini */
@@ -35,7 +35,7 @@ static const efx_proxy_ops_t			__efx_proxy_ef10_ops = {
 	ef10_proxy_auth_exec_cmd,		/* epo_exec_cmd */
 	ef10_proxy_auth_get_privilege_mask,	/* epo_get_privilege_mask */
 };
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
+#endif /* EFX_OPTS_EF10() */
 
 	__checkReturn	efx_rc_t
 efx_proxy_auth_init(
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:50.355580804 +0100
+++ 0145-net-sfc-base-use-simpler-EF10-family-conditional-che.patch	2020-05-19 14:04:44.468652941 +0100
@@ -1,11 +1,12 @@
-From f201b886b74f60886477188a9b7510102a712780 Mon Sep 17 00:00:00 2001
+From 68409f9a6cb68aa0157b828c971a251a2738112c Mon Sep 17 00:00:00 2001
 From: Andrew Rybchenko <arybchenko at solarflare.com>
 Date: Tue, 28 Apr 2020 14:37:24 +0100
 Subject: [PATCH] net/sfc/base: use simpler EF10 family conditional check
 
+[ upstream commit f201b886b74f60886477188a9b7510102a712780 ]
+
 Fixes: 4f12e20c85dc ("net/sfc/base: introduce EVB module for SR-IOV")
 Fixes: 18c8e84d7726 ("net/sfc/base: support proxy auth operations for SR-IOV")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
 ---
@@ -15,7 +16,7 @@
  3 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c
-index a1528508ea..f290339f2f 100644
+index 1788a2c96a..cde2196f18 100644
 --- a/drivers/net/sfc/base/ef10_evb.c
 +++ b/drivers/net/sfc/base/ef10_evb.c
 @@ -9,7 +9,7 @@
@@ -35,7 +36,7 @@
 +#endif /* EFX_OPTS_EF10() */
  #endif /* EFSYS_OPT_EVB */
 diff --git a/drivers/net/sfc/base/efx_evb.c b/drivers/net/sfc/base/efx_evb.c
-index 9725ba1f45..17318b7e11 100644
+index dd64bc7854..5fa0d99809 100644
 --- a/drivers/net/sfc/base/efx_evb.c
 +++ b/drivers/net/sfc/base/efx_evb.c
 @@ -28,7 +28,7 @@ static const efx_evb_ops_t	__efx_evb_dummy_ops = {
@@ -57,7 +58,7 @@
  	__checkReturn	efx_rc_t
  efx_evb_init(
 diff --git a/drivers/net/sfc/base/efx_proxy.c b/drivers/net/sfc/base/efx_proxy.c
-index 5b4e98c381..24baa5a3a4 100644
+index 791105a5a0..ecf703b03d 100644
 --- a/drivers/net/sfc/base/efx_proxy.c
 +++ b/drivers/net/sfc/base/efx_proxy.c
 @@ -23,7 +23,7 @@ static const efx_proxy_ops_t	__efx_proxy_dummy_ops = {