From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,
Long Wu <long.wu@corigine.com>,
Peng Zhang <peng.zhang@corigine.com>,
Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v2 06/10] net/nfp: add check logic for port up/down function
Date: Sat, 12 Oct 2024 10:41:03 +0800 [thread overview]
Message-ID: <20241012024107.3795935-7-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20241012024107.3795935-1-chaoyong.he@corigine.com>
The 'nfp_eth_set_configured()' function is not always success, so
need to check the return value of it.
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
.../net/nfp/flower/nfp_flower_representor.c | 18 +++++++++++++-----
drivers/net/nfp/nfp_ethdev.c | 4 +++-
drivers/net/nfp/nfp_net_common.c | 5 ++++-
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index d1558b905c..eb0a02874b 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -83,6 +83,7 @@ nfp_flower_repr_dev_infos_get(__rte_unused struct rte_eth_dev *dev,
static int
nfp_flower_repr_dev_start(struct rte_eth_dev *dev)
{
+ int ret;
uint16_t i;
struct nfp_net_hw_priv *hw_priv;
struct nfp_flower_representor *repr;
@@ -92,8 +93,11 @@ nfp_flower_repr_dev_start(struct rte_eth_dev *dev)
hw_priv = dev->process_private;
app_fw_flower = repr->app_fw_flower;
- if (repr->repr_type == NFP_REPR_TYPE_PHYS_PORT)
- nfp_eth_set_configured(hw_priv->pf_dev->cpp, repr->nfp_idx, 1);
+ if (repr->repr_type == NFP_REPR_TYPE_PHYS_PORT) {
+ ret = nfp_eth_set_configured(hw_priv->pf_dev->cpp, repr->nfp_idx, 1);
+ if (ret < 0)
+ return ret;
+ }
nfp_flower_cmsg_port_mod(app_fw_flower, repr->port_id, true);
@@ -109,6 +113,7 @@ static int
nfp_flower_repr_dev_stop(struct rte_eth_dev *dev)
{
uint16_t i;
+ int ret = 0;
struct nfp_net_hw_priv *hw_priv;
struct nfp_flower_representor *repr;
struct nfp_app_fw_flower *app_fw_flower;
@@ -119,15 +124,18 @@ nfp_flower_repr_dev_stop(struct rte_eth_dev *dev)
nfp_flower_cmsg_port_mod(app_fw_flower, repr->port_id, false);
- if (repr->repr_type == NFP_REPR_TYPE_PHYS_PORT)
- nfp_eth_set_configured(hw_priv->pf_dev->cpp, repr->nfp_idx, 0);
+ if (repr->repr_type == NFP_REPR_TYPE_PHYS_PORT) {
+ ret = nfp_eth_set_configured(hw_priv->pf_dev->cpp, repr->nfp_idx, 0);
+ if (ret == 1)
+ ret = 0;
+ }
for (i = 0; i < dev->data->nb_rx_queues; i++)
dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
for (i = 0; i < dev->data->nb_tx_queues; i++)
dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
- return 0;
+ return ret;
}
static int
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 2fe6b1a292..302149e9dc 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -495,7 +495,9 @@ nfp_net_start(struct rte_eth_dev *dev)
}
/* Configure the physical port up */
- nfp_eth_set_configured(pf_dev->cpp, net_hw->nfp_idx, 1);
+ ret = nfp_eth_set_configured(pf_dev->cpp, net_hw->nfp_idx, 1);
+ if (ret < 0)
+ goto error;
for (i = 0; i < dev->data->nb_rx_queues; i++)
dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 86a1fbfaf2..80d60515d8 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -2427,6 +2427,7 @@ nfp_net_ctrl_bar_size_set(struct nfp_pf_dev *pf_dev)
int
nfp_net_stop(struct rte_eth_dev *dev)
{
+ int ret;
struct nfp_net_hw *hw;
struct nfp_net_hw_priv *hw_priv;
@@ -2439,7 +2440,9 @@ nfp_net_stop(struct rte_eth_dev *dev)
nfp_net_stop_tx_queue(dev);
nfp_net_stop_rx_queue(dev);
- nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 0);
+ ret = nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 0);
+ if (ret < 0)
+ return ret;
return 0;
}
--
2.39.1
next prev parent reply other threads:[~2024-10-12 2:42 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-10 9:17 [PATCH 00/10] modify some logic of NFP PMD Chaoyong He
2024-10-10 9:17 ` [PATCH 01/10] net/nfp: use strlcpy for copying string Chaoyong He
2024-10-10 15:08 ` Stephen Hemminger
2024-10-10 9:17 ` [PATCH 02/10] net/nfp: fix malloc name problem in secondary process Chaoyong He
2024-10-10 15:07 ` Stephen Hemminger
2024-10-11 2:31 ` Chaoyong He
2024-10-10 9:17 ` [PATCH 03/10] net/nfp: simplify some function parameters Chaoyong He
2024-10-10 15:08 ` Stephen Hemminger
2024-10-10 9:17 ` [PATCH 04/10] net/nfp: improve the logic readability Chaoyong He
2024-10-10 15:10 ` Stephen Hemminger
2024-10-11 2:36 ` Chaoyong He
2024-10-10 9:17 ` [PATCH 05/10] net/nfp: fix problem caused by configure function Chaoyong He
2024-10-10 15:13 ` Stephen Hemminger
2024-10-10 9:17 ` [PATCH 06/10] net/nfp: add check logic for port up/down function Chaoyong He
2024-10-10 15:14 ` Stephen Hemminger
2024-10-10 9:17 ` [PATCH 07/10] net/nfp: fix problem caused by commit end function Chaoyong He
2024-10-10 15:15 ` Stephen Hemminger
2024-10-10 9:17 ` [PATCH 08/10] net/nfp: fix problem caused by FEC set Chaoyong He
2024-10-10 15:15 ` Stephen Hemminger
2024-10-10 9:17 ` [PATCH 09/10] net/nfp: modify the comment of some control messages Chaoyong He
2024-10-10 15:15 ` Stephen Hemminger
2024-10-10 9:17 ` [PATCH 10/10] net/nfp: fix memory leak in VF initialization logic Chaoyong He
2024-10-10 15:19 ` Stephen Hemminger
2024-10-11 2:38 ` Chaoyong He
2024-10-12 2:40 ` [PATCH v2 00/10] modify some logic of NFP PMD Chaoyong He
2024-10-12 2:40 ` [PATCH v2 01/10] net/nfp: use strlcpy for copying string Chaoyong He
2024-10-12 2:40 ` [PATCH v2 02/10] net/nfp: fix malloc name problem in secondary process Chaoyong He
2024-10-12 2:45 ` Stephen Hemminger
2024-10-12 2:47 ` Chaoyong He
2024-10-12 2:41 ` [PATCH v2 03/10] net/nfp: simplify some function parameters Chaoyong He
2024-10-12 2:41 ` [PATCH v2 04/10] net/nfp: improve the logic readability Chaoyong He
2024-10-12 2:41 ` [PATCH v2 05/10] net/nfp: fix problem caused by configure function Chaoyong He
2024-10-12 2:41 ` Chaoyong He [this message]
2024-10-12 2:41 ` [PATCH v2 07/10] net/nfp: fix problem caused by commit end function Chaoyong He
2024-10-12 2:41 ` [PATCH v2 08/10] net/nfp: fix problem caused by FEC set Chaoyong He
2024-10-12 2:41 ` [PATCH v2 09/10] net/nfp: modify the comment of some control messages Chaoyong He
2024-10-12 2:41 ` [PATCH v2 10/10] net/nfp: fix memory leak in VF initialization logic Chaoyong He
2024-10-13 2:49 ` [PATCH v2 00/10] modify some logic of NFP PMD Ferruh Yigit
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=20241012024107.3795935-7-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=long.wu@corigine.com \
--cc=oss-drivers@corigine.com \
--cc=peng.zhang@corigine.com \
--cc=stephen@networkplumber.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).