From: Peng Zhang <peng.zh...@corigine.com>
When using the multiple PF firmware, add the new
operations and update the port start and stop
function.
Signed-off-by: Peng Zhang <peng.zh...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Long Wu <long...@corigine.com>
---
drivers/net/nfp/flower/nfp_flower.c | 21 ++++++++++++
drivers/net/nfp/flower/nfp_flower.h | 1 +
.../net/nfp/flower/nfp_flower_representor.c | 34 ++++++++++++++++++-
3 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/drivers/net/nfp/flower/nfp_flower.c
b/drivers/net/nfp/flower/nfp_flower.c
index fd0a454432..df7a150a99 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -23,6 +23,20 @@
#define CTRL_VNIC_NB_DESC 512
+int
+nfp_flower_pf_stop(struct rte_eth_dev *dev)
+{
+ struct nfp_net_hw_priv *hw_priv;
+ struct nfp_flower_representor *repr;
+
+ repr = dev->data->dev_private;
+ hw_priv = dev->process_private;
+ nfp_flower_cmsg_port_mod(repr->app_fw_flower, repr->port_id, false);
+ (void)nfp_eth_set_configured(hw_priv->pf_dev->cpp, repr->nfp_idx, 0);
+
+ return nfp_net_stop(dev);
+}
+
int
nfp_flower_pf_start(struct rte_eth_dev *dev)
{
@@ -34,6 +48,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
struct nfp_net_hw *net_hw;
struct rte_eth_conf *dev_conf;
struct rte_eth_rxmode *rxmode;
+ struct nfp_net_hw_priv *hw_priv;
struct nfp_flower_representor *repr;
repr = dev->data->dev_private;
@@ -84,6 +99,12 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
return -EIO;
}
+ hw_priv = dev->process_private;
+ if (hw_priv->pf_dev->multi_pf.enabled) {
+ (void)nfp_eth_set_configured(hw_priv->pf_dev->cpp,
repr->nfp_idx, 1);
+ nfp_flower_cmsg_port_mod(repr->app_fw_flower, repr->port_id,
true);
+ }
+
for (i = 0; i < dev->data->nb_rx_queues; i++)
dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
for (i = 0; i < dev->data->nb_tx_queues; i++)
diff --git a/drivers/net/nfp/flower/nfp_flower.h
b/drivers/net/nfp/flower/nfp_flower.h
index 1dc868fb68..a257366656 100644
--- a/drivers/net/nfp/flower/nfp_flower.h
+++ b/drivers/net/nfp/flower/nfp_flower.h
@@ -116,6 +116,7 @@ bool nfp_flower_pf_dispatch_pkts(struct nfp_net_rxq *rxq,
uint16_t nfp_flower_pf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
int nfp_flower_pf_start(struct rte_eth_dev *dev);
+int nfp_flower_pf_stop(struct rte_eth_dev *dev);
uint32_t nfp_flower_pkt_add_metadata(struct nfp_app_fw_flower *app_fw_flower,
struct rte_mbuf *mbuf, uint32_t port_id);
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c
b/drivers/net/nfp/flower/nfp_flower_representor.c
index c096862a0f..6e957b125f 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -523,6 +523,38 @@ static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops
= {
.fw_version_get = nfp_net_firmware_version_get,
};
+static const struct eth_dev_ops nfp_flower_multiple_pf_repr_dev_ops = {
+ .dev_infos_get = nfp_flower_repr_dev_infos_get,
+
+ .dev_start = nfp_flower_pf_start,
+ .dev_configure = nfp_net_configure,
+ .dev_stop = nfp_flower_pf_stop,
+ .dev_close = nfp_flower_repr_dev_close,
+
+ .rx_queue_setup = nfp_net_rx_queue_setup,
+ .tx_queue_setup = nfp_net_tx_queue_setup,
+
+ .link_update = nfp_flower_repr_link_update,
+
+ .stats_get = nfp_flower_repr_stats_get,
+ .stats_reset = nfp_flower_repr_stats_reset,
+
+ .promiscuous_enable = nfp_net_promisc_enable,
+ .promiscuous_disable = nfp_net_promisc_disable,
+
+ .mac_addr_set = nfp_flower_repr_mac_addr_set,
+ .fw_version_get = nfp_net_firmware_version_get,
+
+ .flow_ops_get = nfp_flow_ops_get,
+ .mtr_ops_get = nfp_net_mtr_ops_get,
+
+ .xstats_get = nfp_net_xstats_get,
+ .xstats_reset = nfp_net_xstats_reset,
+ .xstats_get_names = nfp_net_xstats_get_names,
+ .xstats_get_by_id = nfp_net_xstats_get_by_id,
+ .xstats_get_names_by_id = nfp_net_xstats_get_names_by_id,
+};
+
static const struct eth_dev_ops nfp_flower_repr_dev_ops = {
.dev_infos_get = nfp_flower_repr_dev_infos_get,
@@ -782,7 +814,7 @@ nfp_flower_multiple_pf_repr_init(struct rte_eth_dev
*eth_dev,
repr = eth_dev->data->dev_private;
hw_priv = repr_init->hw_priv;
- eth_dev->dev_ops = &nfp_flower_pf_repr_dev_ops;
+ eth_dev->dev_ops = &nfp_flower_multiple_pf_repr_dev_ops;
eth_dev->rx_pkt_burst = nfp_net_recv_pkts;
eth_dev->tx_pkt_burst = nfp_flower_pf_xmit_pkts;
eth_dev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR |
--
2.39.1
