From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D48951B117 for ; Wed, 21 Nov 2018 17:05:58 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B755C02C734; Wed, 21 Nov 2018 16:05:58 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35532608E7; Wed, 21 Nov 2018 16:05:57 +0000 (UTC) From: Kevin Traynor To: Vijay Srivastava Cc: Andrew Rybchenko , dpdk stable Date: Wed, 21 Nov 2018 16:03:59 +0000 Message-Id: <20181121160440.9014-9-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 21 Nov 2018 16:05:58 +0000 (UTC) Subject: [dpdk-stable] patch 'net/sfc/base: add check for TUNNEL module in NIC reset API' has been queued to stable release 18.08.1 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, 21 Nov 2018 16:05:59 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From e3cf8013ae94a41d6ec9b0b60032dd651472844a Mon Sep 17 00:00:00 2001 From: Vijay Srivastava Date: Mon, 10 Sep 2018 10:33:11 +0100 Subject: [PATCH] net/sfc/base: add check for TUNNEL module in NIC reset API [ upstream commit f933b46a0a95dd3a7fd5d206a24649d847fffbb6 ] Fixes: 17551f6dffcc ("net/sfc/base: add API to control UDP tunnel ports") Signed-off-by: Vijay Srivastava Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/efx_nic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/base/efx_nic.c b/drivers/net/sfc/base/efx_nic.c index 6314ae2ff..0e8ed9c2a 100644 --- a/drivers/net/sfc/base/efx_nic.c +++ b/drivers/net/sfc/base/efx_nic.c @@ -550,5 +550,5 @@ efx_nic_reset( EFSYS_ASSERT(enp->en_mod_flags & EFX_MOD_PROBE); /* - * All modules except the MCDI, PROBE, NVRAM, VPD, MON + * All modules except the MCDI, PROBE, NVRAM, VPD, MON, TUNNEL * (which we do not reset here) must have been shut down or never * initialized. @@ -561,4 +561,7 @@ efx_nic_reset( mod_flags &= ~(EFX_MOD_MCDI | EFX_MOD_PROBE | EFX_MOD_NVRAM | EFX_MOD_VPD | EFX_MOD_MON); +#if EFSYS_OPT_TUNNEL + mod_flags &= ~EFX_MOD_TUNNEL; +#endif /* EFSYS_OPT_TUNNEL */ EFSYS_ASSERT3U(mod_flags, ==, 0); if (mod_flags != 0) { -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:13.850817242 +0000 +++ 0009-net-sfc-base-add-check-for-TUNNEL-module-in-NIC-rese.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,10 +1,11 @@ -From f933b46a0a95dd3a7fd5d206a24649d847fffbb6 Mon Sep 17 00:00:00 2001 +From e3cf8013ae94a41d6ec9b0b60032dd651472844a Mon Sep 17 00:00:00 2001 From: Vijay Srivastava Date: Mon, 10 Sep 2018 10:33:11 +0100 Subject: [PATCH] net/sfc/base: add check for TUNNEL module in NIC reset API +[ upstream commit f933b46a0a95dd3a7fd5d206a24649d847fffbb6 ] + Fixes: 17551f6dffcc ("net/sfc/base: add API to control UDP tunnel ports") -Cc: stable@dpdk.org Signed-off-by: Vijay Srivastava Signed-off-by: Andrew Rybchenko