From: Chaoyong He <chaoyong.he@corigine.com>
To: stable@dpdk.org
Cc: oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>
Subject: [PATCH 21.11] net/nfp: fix reconfigure logic of set MAC address
Date: Fri, 17 Nov 2023 11:15:00 +0800 [thread overview]
Message-ID: <20231117031500.1609817-5-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20231117031500.1609817-1-chaoyong.he@corigine.com>
[ upstream commit d67022275d3b423850c629036d33fdfadeb874a8 ]
If the reconfigure API exit abnormally, the value in the config bar
will not same with the value stored in the data structure.
Fix this by add a local variable to hold the temporary value and the
logic of store it when no error happen.
Fixes: 2fe669f4bcd2 ("net/nfp: support MAC address change")
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
---
drivers/net/nfp/nfp_common.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index 279c344666..7dce3cf9a9 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -277,7 +277,8 @@ int
nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
{
struct nfp_net_hw *hw;
- uint32_t update, ctrl;
+ uint32_t update;
+ uint32_t new_ctrl;
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) &&
@@ -292,14 +293,17 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
/* Signal the NIC about the change */
update = NFP_NET_CFG_UPDATE_MACADDR;
- ctrl = hw->ctrl;
+ new_ctrl = hw->ctrl;
if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) &&
(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR))
- ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;
- if (nfp_net_reconfig(hw, ctrl, update) < 0) {
+ new_ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;
+ if (nfp_net_reconfig(hw, new_ctrl, update) < 0) {
PMD_INIT_LOG(INFO, "MAC address update failed");
return -EIO;
}
+
+ hw->ctrl = new_ctrl;
+
return 0;
}
--
2.39.1
next prev parent reply other threads:[~2023-11-17 3:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-17 3:14 [PATCH 21.11] net/nfp: fix DMA error after abnormal exit Chaoyong He
2023-11-17 3:14 ` [PATCH 21.11] net/nfp: fix link status interrupt Chaoyong He
2023-11-17 3:14 ` [PATCH 21.11] net/nfp: fix reconfigure logic in PF initialization Chaoyong He
2023-11-17 3:14 ` [PATCH 21.11] net/nfp: fix reconfigure logic in VF initialization Chaoyong He
2023-11-17 3:15 ` Chaoyong He [this message]
2023-11-23 10:48 ` [PATCH 21.11] net/nfp: fix DMA error after abnormal exit Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231117031500.1609817-5-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=oss-drivers@corigine.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).