From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1BBAFA04B5 for ; Tue, 3 Dec 2019 19:28:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1118D1BE80; Tue, 3 Dec 2019 19:28:36 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 972A41BF80 for ; Tue, 3 Dec 2019 19:28:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Iuv8MdWpjUwjnlHkEVX0yKqtsFDS+TDGlIn6n6zqmoQ=; b=ZGJ58J1z0KAWmUzea1k+nlq9NlK1cYtxVrij/0SsRZaCleg9YVeF96VuEgkeavdctcLrQ4 3+MyRHl1X/WD42Nyvw1agyuta/SBeOcCsDtn6vEj08Hc6Yk6mdkRi8O7+Dg85N4hMFhcK5 Ri8j9FD7fQul9PMQRiEgvSWUZ+X4cyQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-432-LALpGA7VPZSsiRhNxYVM7Q-1; Tue, 03 Dec 2019 13:28:29 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72475800D4C; Tue, 3 Dec 2019 18:28:28 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 657625C240; Tue, 3 Dec 2019 18:28:27 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Tue, 3 Dec 2019 18:26:40 +0000 Message-Id: <20191203182714.17297-31-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: LALpGA7VPZSsiRhNxYVM7Q-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bnxt: fix multicast filter programming' has been queued to LTS release 18.11.6 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/19. 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 rebasi= ng (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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/48ff9349952ec92529= 454ea85130af5e1354b872 Thanks. Kevin. --- >From 48ff9349952ec92529454ea85130af5e1354b872 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 2 Oct 2019 16:26:00 -0700 Subject: [PATCH] net/bnxt: fix multicast filter programming [ upstream commit 9f9e759bb682595fa796e516afff157a0ba93301 ] Fixed multicast filter programming and allmulti programming. Fixed to skip programming multicast macs if the user requests allmulti mode. Also removed a comment in bnxt_hwrm_cfa_l2_set_rx_mask() which is no longer valid now. Fixes: d69851df12b2 ("net/bnxt: support multicast filter and set MAC addr") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 4 ++++ drivers/net/bnxt/bnxt_hwrm.c | 11 ++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.= c index 2f3e067ed..76228ae8d 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1592,4 +1592,8 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_= dev, =20 =09vnic->mc_addr_cnt =3D i; +=09if (vnic->mc_addr_cnt) +=09=09vnic->flags |=3D BNXT_VNIC_INFO_MCAST; +=09else +=09=09vnic->flags &=3D ~BNXT_VNIC_INFO_MCAST; =20 allmulti: diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index a57e5cf36..1bd8d3d9f 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -254,18 +254,15 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, =09req.vnic_id =3D rte_cpu_to_le_16(vnic->fw_vnic_id); =20 -=09/* FIXME add multicast flag, when multicast adding options is supported -=09 * by ethtool. -=09 */ =09if (vnic->flags & BNXT_VNIC_INFO_BCAST) =09=09mask |=3D HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST; =09if (vnic->flags & BNXT_VNIC_INFO_UNTAGGED) =09=09mask |=3D HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_VLAN_NONVLAN; + =09if (vnic->flags & BNXT_VNIC_INFO_PROMISC) =09=09mask |=3D HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS; -=09if (vnic->flags & BNXT_VNIC_INFO_ALLMULTI) + +=09if (vnic->flags & BNXT_VNIC_INFO_ALLMULTI) { =09=09mask |=3D HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST; -=09if (vnic->flags & BNXT_VNIC_INFO_MCAST) -=09=09mask |=3D HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST; -=09if (vnic->mc_addr_cnt) { +=09} else if (vnic->flags & BNXT_VNIC_INFO_MCAST) { =09=09mask |=3D HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST; =09=09req.num_mc_entries =3D rte_cpu_to_le_32(vnic->mc_addr_cnt); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:53.619247346 +0000 +++ 0031-net-bnxt-fix-multicast-filter-programming.patch=092019-12-03 17:29= :51.754749870 +0000 @@ -1 +1 @@ -From 9f9e759bb682595fa796e516afff157a0ba93301 Mon Sep 17 00:00:00 2001 +From 48ff9349952ec92529454ea85130af5e1354b872 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9f9e759bb682595fa796e516afff157a0ba93301 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index e305ad416..02eacf796 100644 +index 2f3e067ed..76228ae8d 100644 @@ -27 +28 @@ -@@ -2054,4 +2054,8 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth= _dev, +@@ -1592,4 +1592,8 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth= _dev, @@ -37 +38 @@ -index 2a7e0d6d1..011cd05ae 100644 +index a57e5cf36..1bd8d3d9f 100644 @@ -40 +41 @@ -@@ -296,18 +296,15 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, +@@ -254,18 +254,15 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp,