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 D6EF3A04F3 for ; Thu, 19 Dec 2019 15:36:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CA6321BF88; Thu, 19 Dec 2019 15:36:57 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id DD27C1BF88 for ; Thu, 19 Dec 2019 15:36:56 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id 20so5735355wmj.4 for ; Thu, 19 Dec 2019 06:36:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Z0LKq1v7g7iuKbS8qmoXBIqT+p+/mP+W83o/mkTHjk=; b=j7io+vcvLx8KXLv18HuqHD/DZob8ko998T+rluLeL3/xMJTSeZrm0Ktl+xfiroMZIq V2UJnwoC5PpoVl6g5ZY9Htz+JMbzG+L08X75uUBK+HhIhQe2s614WtRAZby5zURx23VK 5rPgprsghR7Tyvw6Wv5MSz2WEmVqRWaKuw8HSDh1cjwLJS0QL/qd15DX0pLgOYH/Ns/r STU5t+pF9OMsqu1bs2ozPso1HFXKjJN1Akd4f1MRHynb5Rp0e8sUs/J3y91PL4CWTKY7 k2nueBO3eCJPRpGVY5pzIYqX4VA03O3Mri4Bi16hNpvQkDc7VkL+Gitn1no0d+x23ktE iqyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Z0LKq1v7g7iuKbS8qmoXBIqT+p+/mP+W83o/mkTHjk=; b=AcTYoTzLKjZeYcvKpWnGOwqIsPukqZYJ7p9y76IOc3XkPyGXOua3Bx+s0oUKkHJc9P fQHgY6fv/cqyEX4LDHXDIevnwrcWZW4a+lJLJg76M45120IKsB83Q2siRx9OpB0Tav8F Ht3mcRVOGMGAzjrtbvmDZi6XC/Q4HXCZu3eKTWzIfNvO+5m2qeVnB7ZRPr7bMiN+21FJ 4EgsvdyPYXnbC4/eMkN+VTP+IQns4i/uPk/zoFxw4Udyr+khVenupfO/LSG16xY/vbBL qaCj3pNz/opa65sfc8Bty8ouWFsPlMVU+9aO7tl2+7jOutPu77FL9tImKgnnmJmk4B06 di3g== X-Gm-Message-State: APjAAAUmmnrL5XXS5qf+EZvG8JWt1Y29GAqT33Nl2HZcpfoBfgYIafv3 N6NwR6/gHdisIHEs4RcB2Gg= X-Google-Smtp-Source: APXvYqx4UnO1rLvq56unjnjuEzZ2kPfB6lzvT5qO6GnH3thbm0VWbRX3z5Q/suCYPELtkH9PWiZNhw== X-Received: by 2002:a7b:c5cd:: with SMTP id n13mr10260464wmk.172.1576766216615; Thu, 19 Dec 2019 06:36:56 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p18sm6582458wmb.8.2019.12.19.06.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:36:56 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Thu, 19 Dec 2019 14:33:13 +0000 Message-Id: <20191219143447.21506-46-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix multicast filter programming' has been queued to LTS release 17.11.10 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 17.11.10 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/21/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 322082805c54103e66376de8059e71751ce7e5be 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 a41a428982..cbeb97b88e 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1488,6 +1488,10 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev, } vnic->mc_addr_cnt = i; + if (vnic->mc_addr_cnt) + vnic->flags |= BNXT_VNIC_INFO_MCAST; + else + vnic->flags &= ~BNXT_VNIC_INFO_MCAST; allmulti: return bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index c4f743db05..3b94c5c96b 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -269,20 +269,17 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, HWRM_PREP(req, CFA_L2_SET_RX_MASK); req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id); - /* FIXME add multicast flag, when multicast adding options is supported - * by ethtool. - */ if (vnic->flags & BNXT_VNIC_INFO_BCAST) mask |= HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST; if (vnic->flags & BNXT_VNIC_INFO_UNTAGGED) mask |= HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_VLAN_NONVLAN; + if (vnic->flags & BNXT_VNIC_INFO_PROMISC) mask |= HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS; - if (vnic->flags & BNXT_VNIC_INFO_ALLMULTI) + + if (vnic->flags & BNXT_VNIC_INFO_ALLMULTI) { mask |= HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST; - if (vnic->flags & BNXT_VNIC_INFO_MCAST) - mask |= HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST; - if (vnic->mc_addr_cnt) { + } else if (vnic->flags & BNXT_VNIC_INFO_MCAST) { mask |= HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST; req.num_mc_entries = rte_cpu_to_le_32(vnic->mc_addr_cnt); req.mc_tbl_addr = rte_cpu_to_le_64(vnic->mc_list_dma_addr); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:28.175642390 +0000 +++ 0046-net-bnxt-fix-multicast-filter-programming.patch 2019-12-19 14:32:26.009295922 +0000 @@ -1,8 +1,10 @@ -From 9f9e759bb682595fa796e516afff157a0ba93301 Mon Sep 17 00:00:00 2001 +From 322082805c54103e66376de8059e71751ce7e5be 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. @@ -11,7 +13,6 @@ no longer valid now. Fixes: d69851df12b2 ("net/bnxt: support multicast filter and set MAC addr") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde @@ -21,10 +22,10 @@ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index e305ad4163..02eacf7965 100644 +index a41a428982..cbeb97b88e 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -2053,6 +2053,10 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev, +@@ -1488,6 +1488,10 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev, } vnic->mc_addr_cnt = i; @@ -36,11 +37,11 @@ allmulti: return bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index 2a7e0d6d15..011cd05ae0 100644 +index c4f743db05..3b94c5c96b 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c -@@ -295,20 +295,17 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, - HWRM_PREP(req, CFA_L2_SET_RX_MASK, BNXT_USE_CHIMP_MB); +@@ -269,20 +269,17 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, + HWRM_PREP(req, CFA_L2_SET_RX_MASK); req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id); - /* FIXME add multicast flag, when multicast adding options is supported