From: Zerun Fu <zerun...@corigine.com>
Add support for querying current RX/TX pause frame
switch mode from the device.
Signed-off-by: Zerun Fu <zerun...@corigine.com>
Reviewed-by: Long Wu <long...@corigine.com>
Reviewed-by: Peng Zhang <peng.zh...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
---
drivers/net/nfp/nfp_ethdev.c | 1 +
drivers/net/nfp/nfp_net_common.c | 41 +++++++++++++++++++++++++++
drivers/net/nfp/nfp_net_common.h | 2 ++
drivers/net/nfp/nfpcore/nfp_nsp.h | 2 ++
drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 11 +++++++
5 files changed, 57 insertions(+)
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 4fae2e5540..452e16e126 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -428,6 +428,7 @@ static const struct eth_dev_ops nfp_net_eth_dev_ops = {
.udp_tunnel_port_add = nfp_udp_tunnel_port_add,
.udp_tunnel_port_del = nfp_udp_tunnel_port_del,
.fw_version_get = nfp_net_firmware_version_get,
+ .flow_ctrl_get = nfp_net_flow_ctrl_get,
};
static inline void
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 4efcdff76f..44b2d6dd4f 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -2073,3 +2073,44 @@ nfp_net_stop(struct rte_eth_dev *dev)
return 0;
}
+
+static enum rte_eth_fc_mode
+nfp_net_get_pause_mode(struct nfp_eth_table_port *eth_port)
+{
+ enum rte_eth_fc_mode mode;
+
+ if (eth_port->rx_pause_enabled) {
+ if (eth_port->tx_pause_enabled)
+ mode = RTE_ETH_FC_FULL;
+ else
+ mode = RTE_ETH_FC_RX_PAUSE;
+ } else {
+ if (eth_port->tx_pause_enabled)
+ mode = RTE_ETH_FC_TX_PAUSE;
+ else
+ mode = RTE_ETH_FC_NONE;
+ }
+
+ return mode;
+}
+
+int
+nfp_net_flow_ctrl_get(struct rte_eth_dev *dev,
+ struct rte_eth_fc_conf *fc_conf)
+{
+ struct nfp_net_hw *net_hw;
+ struct nfp_eth_table *nfp_eth_table;
+ struct nfp_eth_table_port *eth_port;
+
+ net_hw = nfp_net_get_hw(dev);
+ if (net_hw->pf_dev == NULL)
+ return -EINVAL;
+
+ nfp_eth_table = net_hw->pf_dev->nfp_eth_table;
+ eth_port = &nfp_eth_table->ports[dev->data->port_id];
+
+ /* Currently only RX/TX switch are supported */
+ fc_conf->mode = nfp_net_get_pause_mode(eth_port);
+
+ return 0;
+}
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index 1f9001c81d..5a65d166e0 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -238,6 +238,8 @@ int nfp_net_firmware_version_get(struct rte_eth_dev *dev,
char *fw_version, size
bool nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version);
struct nfp_net_hw *nfp_net_get_hw(const struct rte_eth_dev *dev);
int nfp_net_stop(struct rte_eth_dev *dev);
+int nfp_net_flow_ctrl_get(struct rte_eth_dev *dev,
+ struct rte_eth_fc_conf *fc_conf);
#define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\
((struct nfp_app_fw_nic *)app_fw_priv)
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h
b/drivers/net/nfp/nfpcore/nfp_nsp.h
index fe52dffeb7..dc1eb55a1f 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp.h
+++ b/drivers/net/nfp/nfpcore/nfp_nsp.h
@@ -139,6 +139,8 @@ struct nfp_eth_table {
bool supp_aneg; /**< Support auto negotiation */
bool override_changed; /**< Media reconfig pending */
+ bool rx_pause_enabled; /**< Switch of RX pause frame */
+ bool tx_pause_enabled; /**< Switch of TX pause frame */
uint8_t port_type; /**< One of %PORT_* */
/** Sum of lanes of all subports of this port */
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
index 75f6d40fea..ca8bc8f550 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
@@ -33,6 +33,8 @@
#define NSP_ETH_STATE_ANEG GENMASK_ULL(25, 23)
#define NSP_ETH_STATE_FEC GENMASK_ULL(27, 26)
#define NSP_ETH_STATE_ACT_FEC GENMASK_ULL(29, 28)
+#define NSP_ETH_STATE_TX_PAUSE RTE_BIT64(31)
+#define NSP_ETH_STATE_RX_PAUSE RTE_BIT64(32)
#define NSP_ETH_CTRL_CONFIGURED RTE_BIT64(0)
#define NSP_ETH_CTRL_ENABLED RTE_BIT64(1)
@@ -186,6 +188,15 @@ nfp_eth_port_translate(struct nfp_nsp *nsp,
dst->act_fec = FIELD_GET(NSP_ETH_STATE_ACT_FEC, state);
dst->supp_aneg = FIELD_GET(NSP_ETH_PORT_SUPP_ANEG, port);
+
+ if (nfp_nsp_get_abi_ver_minor(nsp) < 37) {
+ dst->tx_pause_enabled = true;
+ dst->rx_pause_enabled = true;
+ return;
+ }
+
+ dst->tx_pause_enabled = FIELD_GET(NSP_ETH_STATE_TX_PAUSE, state);
+ dst->rx_pause_enabled = FIELD_GET(NSP_ETH_STATE_RX_PAUSE, state);
}
static void
--
2.39.1
