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 C26CAA04F3 for ; Thu, 19 Dec 2019 15:36:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B0E591BF80; Thu, 19 Dec 2019 15:36:56 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 6DB901BF87 for ; Thu, 19 Dec 2019 15:36:55 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id q10so6197076wrm.11 for ; Thu, 19 Dec 2019 06:36:55 -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=VSkG4QBo4xv6cgNr5zjXudNRJJrbFaES7pOezvPkquU=; b=PWVDGRkANzYEzVHWxPq5Zb0IJ9taUwrSZbr0NNYx/sYY34Tou65JNcrjZUrdCrfpiF fAT0tRWWKAtvXbb9H1yJYtAR1kZuvhmDezGibIBFF7KqTnthX5QFRGSNliwB2xdfXeMS mwPmXetoLNyt1WIRbJ2R8QHx5H9OiPxfHVrWPADesacCx89Asv8umzng6yVO/WVi/i4n 3bUm1liRok04mTdJPhGcCpuKJ8Lea7YoV4rfpN0PzSgaiqzX9/7YAgYnbFRe554Zv1BU tdfMX3xbq7gutqpnv5TLVH4TqgRGi/3ZLFfstgeW9nZhhyTBsbtrBiMC3hmrDa7jcUfN z7iw== 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=VSkG4QBo4xv6cgNr5zjXudNRJJrbFaES7pOezvPkquU=; b=QHhn1UuhH6D3NfqwyqwLFP91Efbdbbgr+4enr0zUgOTZfYHiaWIj87scNsayVUHOKk /jesB1VLo2mVHBTNSJ6gFzwfQ4vEwBHTS70gowgSAAG2HEgFTTWepLtAHfutp2tQ9Lmj yEvIPoyDHOmd/0+4EUlKRgIUiyLPnxvsMqB3oNURqS6RZOVpsEGWnNvWNzmeBb+3wmT9 NHRa81o/OvSNuqM+kLVBELS2Q0GSayms/N5ZwDAnfsOs84ybUL02S7a1Nu9tCkWTjA7y Vqg/hHN9hXPGpjfedW0JhCbGjCFnJ3DQGwEE0bSzQhrDwuNgvR1xFwchHR4zeRs8HPnv FvHA== X-Gm-Message-State: APjAAAULkJI5svnvnPQuzgfJmiiDiarGFxcz5zNytOGm/D1M2Vm+AVBu 2bkv0sf0/KsJ+FadTwKr4Qs= X-Google-Smtp-Source: APXvYqxnwUc4hXU3yCo+msXd4Pf9ILY8ejRT3q/Z8xQnwZZGAOjqT1WI48EwY0NLfkwtZvp0U0YMLQ== X-Received: by 2002:a5d:428c:: with SMTP id k12mr9734629wrq.57.1576766214952; Thu, 19 Dec 2019 06:36:54 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e6sm6490297wru.44.2019.12.19.06.36.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:36:54 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Date: Thu, 19 Dec 2019 14:33:12 +0000 Message-Id: <20191219143447.21506-45-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 setting default MAC address' 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 65c9e9ffb20fdc3af9a4c41c43ffc82ebe653430 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 2 Oct 2019 16:25:50 -0700 Subject: [PATCH] net/bnxt: fix setting default MAC address [ upstream commit 988562f0b7a6085fa9fa1b8c68efacd722c60c31 ] Driver was incorrectly programming the MAC with the already configured one instead of the newly requested MAC by user. Also, fix to restore the old mac address back to the default vnic filter if the mac update operation fails. Fixes: 68f589f2c728 ("net/bnxt: fix setting primary MAC address") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index ef49f98833..a41a428982 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1446,15 +1446,18 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr) rc = bnxt_hwrm_clear_l2_filter(bp, filter); if (rc) break; - memcpy(filter->l2_addr, bp->mac_addr, ETHER_ADDR_LEN); + memcpy(filter->l2_addr, addr, ETHER_ADDR_LEN); memset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN); filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX; filter->enables |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR | HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK; rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter); - if (rc) + if (rc) { + memcpy(filter->l2_addr, bp->mac_addr, + ETHER_ADDR_LEN); break; + } filter->mac_index = 0; RTE_LOG(DEBUG, PMD, "Set MAC addr\n"); } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:28.135271934 +0000 +++ 0045-net-bnxt-fix-setting-default-MAC-address.patch 2019-12-19 14:32:25.981295367 +0000 @@ -1,8 +1,10 @@ -From 988562f0b7a6085fa9fa1b8c68efacd722c60c31 Mon Sep 17 00:00:00 2001 +From 65c9e9ffb20fdc3af9a4c41c43ffc82ebe653430 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 2 Oct 2019 16:25:50 -0700 Subject: [PATCH] net/bnxt: fix setting default MAC address +[ upstream commit 988562f0b7a6085fa9fa1b8c68efacd722c60c31 ] + Driver was incorrectly programming the MAC with the already configured one instead of the newly requested MAC by user. @@ -10,7 +12,6 @@ vnic filter if the mac update operation fails. Fixes: 68f589f2c728 ("net/bnxt: fix setting primary MAC address") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde @@ -20,31 +21,30 @@ 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 7cd3213558..2c9eaaa2ef 100644 +index ef49f98833..a41a428982 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -1904,7 +1904,7 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, - if (filter->mac_index != 0) - continue; - -- memcpy(filter->l2_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN); -+ memcpy(filter->l2_addr, addr, RTE_ETHER_ADDR_LEN); - memset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN); - filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX | - HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST; -@@ -1913,8 +1913,11 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, +@@ -1446,15 +1446,18 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr) + rc = bnxt_hwrm_clear_l2_filter(bp, filter); + if (rc) + break; +- memcpy(filter->l2_addr, bp->mac_addr, ETHER_ADDR_LEN); ++ memcpy(filter->l2_addr, addr, ETHER_ADDR_LEN); + memset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN); + filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX; + filter->enables |= + HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR | HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK; - rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter); - if (rc) + if (rc) { + memcpy(filter->l2_addr, bp->mac_addr, -+ RTE_ETHER_ADDR_LEN); - return rc; ++ ETHER_ADDR_LEN); + break; + } - - memcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN); - PMD_DRV_LOG(DEBUG, "Set MAC addr\n"); + filter->mac_index = 0; + RTE_LOG(DEBUG, PMD, "Set MAC addr\n"); + } -- 2.20.1