From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 03169A0032 for ; Fri, 18 Feb 2022 13:40:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3C3A41142; Fri, 18 Feb 2022 13:40:46 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 1E6134113F for ; Fri, 18 Feb 2022 13:40:46 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id az26-20020a05600c601a00b0037c078db59cso6311994wmb.4 for ; Fri, 18 Feb 2022 04:40:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WYMgXOFkR93eLT+ewPrJwfPRy/oQZ/2A+Wbni4h9ndU=; b=q0hrtAGV4EoT1GkDDpqu+kJrguMHmJLUn6OkLUAf8x45DRX7SNkDP+SjWlcXE1ruhw xyPBh72lOBYQsAtmmV4K8hyheeitMkEBqEkAM9a3exXCHMYON+uxo8FOBP0inD4VsNPr /DIYg547jF02cw76GHEli7urF24pJJwccM+JtzHRQV97CJ/0yS6meCdfZi8hOxJpavts 9KSZYZ9OWCWDAs09I/X5Xg4Jpsw8ZsYS3LN2Tn7dT+qytOwkeeNBBYyzLX52ugolbJmn cxMmdOJDAx6/6YrtL55VTWivUG/BgION6aZveJx87JqcOItQhsFuuCoToah5OSdRFBEV fVtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WYMgXOFkR93eLT+ewPrJwfPRy/oQZ/2A+Wbni4h9ndU=; b=CzyZIvINN4EiVPb6DQyfRPBQm9jHYNEyktB4iTRnz4zChPFxP69oMHXHW2avEzeI3v OTuzFiOWj5457/N6+9d7NfvX6ZLa+QOU/6Gnp6tUjF/g/XQyvj1aRihcOZs2VKTYtxgw VYt70vqsVvD+2HCu76BUVmXg8DvBQx8m1uGYXH20yt8Ah1JUD+lscFQQMx7mL+yZFLhM +mJcTJF0eClVcLhHMaQ5p97rXev2Dx0nDngyeW6e4ICa9YYxqhZtY5i6q/+vlh3vmcJi /RrD7cqiTvRYamfeKllncfVtDchZBE5YnH11kIVGe7iVU11Fo2l7qtG+P4Ca53lh2ZME LRxQ== X-Gm-Message-State: AOAM532cyKxfQW83rY8kxJq/a+b5bb8z4+NKFRArunH7wzj/7V+MYujD 5rovKclhFeFnlEyrL3v02W4awR2bvV5w6ld7 X-Google-Smtp-Source: ABdhPJzRRvL547+MxhDFNlhYBlz7IdmUh9y0ozeqhVfAC1z50hhirPIO5U3KE+lpzx4FwhSV7T9P0g== X-Received: by 2002:a7b:c94e:0:b0:37b:ea2f:788c with SMTP id i14-20020a7bc94e000000b0037bea2f788cmr7063698wml.14.1645188045854; Fri, 18 Feb 2022 04:40:45 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id b2sm19947925wri.35.2022.02.18.04.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:40:45 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix multicast MAC restore during reset recovery' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:37:53 +0000 Message-Id: <20220218123931.1749595-24-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3ea46b608a05d7bd8ea3472cd29ea1a9fe25fd3a Thanks. Luca Boccassi --- >From 3ea46b608a05d7bd8ea3472cd29ea1a9fe25fd3a Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 4 Jan 2022 14:08:08 +0530 Subject: [PATCH] net/bnxt: fix multicast MAC restore during reset recovery [ upstream commit 04689bdb65adf1121321dda9052cb4063476a2d3 ] During reset recovery, driver is not restoring the multicast mac addresses. Added code to restore them during reset recovery. Fixes: b02f1573cd07 ("net/bnxt: restore MAC filters during reset recovery") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index f0b678fc97..6c224583c6 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4065,6 +4065,18 @@ static int bnxt_restore_mac_filters(struct bnxt *bp) return 0; } +static int bnxt_restore_mcast_mac_filters(struct bnxt *bp) +{ + int ret = 0; + + ret = bnxt_dev_set_mc_addr_list_op(bp->eth_dev, bp->mcast_addr_list, + bp->nb_mc_addr); + if (ret) + PMD_DRV_LOG(ERR, "Failed to restore multicast MAC addreeses\n"); + + return ret; +} + static int bnxt_restore_filters(struct bnxt *bp) { struct rte_eth_dev *dev = bp->eth_dev; @@ -4086,7 +4098,13 @@ static int bnxt_restore_filters(struct bnxt *bp) return ret; ret = bnxt_restore_vlan_filters(bp); - /* TODO restore other filters as well */ + if (ret) + return ret; + + ret = bnxt_restore_mcast_mac_filters(bp); + if (ret) + return ret; + return ret; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.083097207 +0000 +++ 0024-net-bnxt-fix-multicast-MAC-restore-during-reset-reco.patch 2022-02-18 12:37:37.574789329 +0000 @@ -1 +1 @@ -From 04689bdb65adf1121321dda9052cb4063476a2d3 Mon Sep 17 00:00:00 2001 +From 3ea46b608a05d7bd8ea3472cd29ea1a9fe25fd3a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 04689bdb65adf1121321dda9052cb4063476a2d3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 50ffa30577..bac96001a4 100644 +index f0b678fc97..6c224583c6 100644 @@ -23 +24 @@ -@@ -4261,6 +4261,18 @@ static int bnxt_restore_mac_filters(struct bnxt *bp) +@@ -4065,6 +4065,18 @@ static int bnxt_restore_mac_filters(struct bnxt *bp) @@ -42 +43 @@ -@@ -4282,7 +4294,13 @@ static int bnxt_restore_filters(struct bnxt *bp) +@@ -4086,7 +4098,13 @@ static int bnxt_restore_filters(struct bnxt *bp)