From: Zerun Fu <zerun...@corigine.com>
Get the currently supported speed value from NSP. And the VF
can not get the speed capacity now.
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 | 121 ++++++++++++++++++++++++++++++
drivers/net/nfp/nfp_net_common.c | 9 +--
drivers/net/nfp/nfp_net_common.h | 3 +
drivers/net/nfp/nfpcore/nfp_nsp.c | 17 +++++
drivers/net/nfp/nfpcore/nfp_nsp.h | 55 ++++++++++++++
5 files changed, 199 insertions(+), 6 deletions(-)
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index ef0b0dcd48..591c2de53b 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -1270,6 +1270,116 @@ nfp_net_hwinfo_set(uint8_t function_id,
return 0;
}
+const uint32_t nfp_eth_media_table[NFP_MEDIA_LINK_MODES_NUMBER] = {
+ [NFP_MEDIA_W0_RJ45_10M] = RTE_ETH_LINK_SPEED_10M,
+ [NFP_MEDIA_W0_RJ45_10M_HD] = RTE_ETH_LINK_SPEED_10M_HD,
+ [NFP_MEDIA_W0_RJ45_100M] = RTE_ETH_LINK_SPEED_100M,
+ [NFP_MEDIA_W0_RJ45_100M_HD] = RTE_ETH_LINK_SPEED_100M_HD,
+ [NFP_MEDIA_W0_RJ45_1G] = RTE_ETH_LINK_SPEED_1G,
+ [NFP_MEDIA_W0_RJ45_2P5G] = RTE_ETH_LINK_SPEED_2_5G,
+ [NFP_MEDIA_W0_RJ45_5G] = RTE_ETH_LINK_SPEED_5G,
+ [NFP_MEDIA_W0_RJ45_10G] = RTE_ETH_LINK_SPEED_10G,
+ [NFP_MEDIA_1000BASE_CX] = RTE_ETH_LINK_SPEED_1G,
+ [NFP_MEDIA_1000BASE_KX] = RTE_ETH_LINK_SPEED_1G,
+ [NFP_MEDIA_10GBASE_KX4] = RTE_ETH_LINK_SPEED_10G,
+ [NFP_MEDIA_10GBASE_KR] = RTE_ETH_LINK_SPEED_10G,
+ [NFP_MEDIA_10GBASE_CX4] = RTE_ETH_LINK_SPEED_10G,
+ [NFP_MEDIA_10GBASE_CR] = RTE_ETH_LINK_SPEED_10G,
+ [NFP_MEDIA_10GBASE_SR] = RTE_ETH_LINK_SPEED_10G,
+ [NFP_MEDIA_10GBASE_ER] = RTE_ETH_LINK_SPEED_10G,
+ [NFP_MEDIA_25GBASE_KR] = RTE_ETH_LINK_SPEED_25G,
+ [NFP_MEDIA_25GBASE_KR_S] = RTE_ETH_LINK_SPEED_25G,
+ [NFP_MEDIA_25GBASE_CR] = RTE_ETH_LINK_SPEED_25G,
+ [NFP_MEDIA_25GBASE_CR_S] = RTE_ETH_LINK_SPEED_25G,
+ [NFP_MEDIA_25GBASE_SR] = RTE_ETH_LINK_SPEED_25G,
+ [NFP_MEDIA_40GBASE_CR4] = RTE_ETH_LINK_SPEED_40G,
+ [NFP_MEDIA_40GBASE_KR4] = RTE_ETH_LINK_SPEED_40G,
+ [NFP_MEDIA_40GBASE_SR4] = RTE_ETH_LINK_SPEED_40G,
+ [NFP_MEDIA_40GBASE_LR4] = RTE_ETH_LINK_SPEED_40G,
+ [NFP_MEDIA_50GBASE_KR] = RTE_ETH_LINK_SPEED_50G,
+ [NFP_MEDIA_50GBASE_SR] = RTE_ETH_LINK_SPEED_50G,
+ [NFP_MEDIA_50GBASE_CR] = RTE_ETH_LINK_SPEED_50G,
+ [NFP_MEDIA_50GBASE_LR] = RTE_ETH_LINK_SPEED_50G,
+ [NFP_MEDIA_50GBASE_ER] = RTE_ETH_LINK_SPEED_50G,
+ [NFP_MEDIA_50GBASE_FR] = RTE_ETH_LINK_SPEED_50G,
+ [NFP_MEDIA_100GBASE_KR4] = RTE_ETH_LINK_SPEED_100G,
+ [NFP_MEDIA_100GBASE_SR4] = RTE_ETH_LINK_SPEED_100G,
+ [NFP_MEDIA_100GBASE_CR4] = RTE_ETH_LINK_SPEED_100G,
+ [NFP_MEDIA_100GBASE_KP4] = RTE_ETH_LINK_SPEED_100G,
+ [NFP_MEDIA_100GBASE_CR10] = RTE_ETH_LINK_SPEED_100G,
+ [NFP_MEDIA_10GBASE_LR] = RTE_ETH_LINK_SPEED_10G,
+ [NFP_MEDIA_25GBASE_LR] = RTE_ETH_LINK_SPEED_25G,
+ [NFP_MEDIA_25GBASE_ER] = RTE_ETH_LINK_SPEED_25G
+};
+
+static int
+nfp_net_speed_capa_get_real(struct nfp_eth_media_buf *media_buf,
+ struct nfp_pf_dev *pf_dev)
+{
+ uint32_t i;
+ uint32_t j;
+ uint32_t offset;
+ uint32_t speed_capa = 0;
+ uint64_t supported_modes;
+
+ for (i = 0; i < RTE_DIM(media_buf->supported_modes); i++) {
+ supported_modes = media_buf->supported_modes[i];
+ offset = i * UINT64_BIT;
+ for (j = 0; j < UINT64_BIT; j++) {
+ if (supported_modes == 0)
+ break;
+
+ if ((supported_modes & 1) != 0) {
+ if ((j + offset) >=
NFP_MEDIA_LINK_MODES_NUMBER) {
+ PMD_DRV_LOG(ERR, "Invalid offset of
media table.");
+ return -EINVAL;
+ }
+
+ speed_capa |= nfp_eth_media_table[j + offset];
+ }
+
+ supported_modes = supported_modes >> 1;
+ }
+ }
+
+ pf_dev->speed_capa = speed_capa;
+
+ return pf_dev->speed_capa == 0 ? -EINVAL : 0;
+}
+
+static int
+nfp_net_speed_capa_get(struct nfp_pf_dev *pf_dev,
+ uint32_t port_id)
+{
+ int ret;
+ struct nfp_nsp *nsp;
+ struct nfp_eth_media_buf media_buf;
+
+ media_buf.eth_index = pf_dev->nfp_eth_table->ports[port_id].eth_index;
+ pf_dev->speed_capa = 0;
+
+ nsp = nfp_nsp_open(pf_dev->cpp);
+ if (nsp == NULL) {
+ PMD_DRV_LOG(ERR, "Couldn't get NSP.");
+ return -EIO;
+ }
+
+ ret = nfp_nsp_read_media(nsp, &media_buf, sizeof(media_buf));
+ nfp_nsp_close(nsp);
+ if (ret != 0) {
+ PMD_DRV_LOG(ERR, "Failed to read media.");
+ return ret;
+ }
+
+ ret = nfp_net_speed_capa_get_real(&media_buf, pf_dev);
+ if (ret < 0) {
+ PMD_DRV_LOG(ERR, "Speed capability is invalid.");
+ return ret;
+ }
+
+ return 0;
+}
+
static int
nfp_pf_init(struct rte_pci_device *pci_dev)
{
@@ -1396,6 +1506,17 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
pf_dev->pci_dev = pci_dev;
pf_dev->nfp_eth_table = nfp_eth_table;
+ /* Get the speed capability */
+ for (i = 0; i < nfp_eth_table->count; i++) {
+ id = nfp_function_id_get(pf_dev, i);
+ ret = nfp_net_speed_capa_get(pf_dev, id);
+ if (ret != 0) {
+ PMD_INIT_LOG(ERR, "Failed to get speed capability.");
+ ret = -EIO;
+ goto sym_tbl_cleanup;
+ }
+ }
+
/* Configure access to tx/rx vNIC BARs */
addr = nfp_qcp_queue_offset(dev_info, 0);
cpp_id = NFP_CPP_ISLAND_ID(0, NFP_CPP_ACTION_RW, 0, 0);
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index eb480667c4..ed410a7313 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -1208,12 +1208,9 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ;
}
- dev_info->speed_capa = RTE_ETH_LINK_SPEED_1G |
- RTE_ETH_LINK_SPEED_10G |
- RTE_ETH_LINK_SPEED_25G |
- RTE_ETH_LINK_SPEED_40G |
- RTE_ETH_LINK_SPEED_50G |
- RTE_ETH_LINK_SPEED_100G;
+ /* Only PF supports getting speed capability. */
+ if (hw->pf_dev != NULL)
+ dev_info->speed_capa = hw->pf_dev->speed_capa;
return 0;
}
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index 305b221a15..aec3c51bdf 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -106,6 +106,9 @@ struct nfp_pf_dev {
/** Multiple PF configuration */
struct nfp_multi_pf multi_pf;
+
+ /** Supported speeds bitmap */
+ uint32_t speed_capa;
};
#define NFP_NET_FLOW_LIMIT 1024
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c
b/drivers/net/nfp/nfpcore/nfp_nsp.c
index e57176adb3..f67572be87 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp.c
+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c
@@ -728,3 +728,20 @@ nfp_nsp_hwinfo_set(struct nfp_nsp *state,
return nfp_nsp_command_buf(state, &hwinfo_set);
}
+
+int
+nfp_nsp_read_media(struct nfp_nsp *state,
+ void *buf,
+ size_t size)
+{
+ struct nfp_nsp_command_buf_arg media = {
+ {
+ .code = SPCODE_READ_MEDIA,
+ .option = size,
+ },
+ .out_buf = buf,
+ .out_size = size,
+ };
+
+ return nfp_nsp_command_buf(state, &media);
+}
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h
b/drivers/net/nfp/nfpcore/nfp_nsp.h
index f99ca941d5..41e8402154 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp.h
+++ b/drivers/net/nfp/nfpcore/nfp_nsp.h
@@ -172,6 +172,9 @@ uint32_t nfp_nsp_config_idx(struct nfp_nsp *state);
int nfp_nsp_hwinfo_set(struct nfp_nsp *state,
const void *buf,
size_t size);
+int nfp_nsp_read_media(struct nfp_nsp *state,
+ void *buf,
+ size_t size);
static inline bool
nfp_eth_can_support_fec(struct nfp_eth_table_port *eth_port)
@@ -221,4 +224,56 @@ int nfp_hwmon_read_sensor(struct nfp_cpp *cpp, enum
nfp_nsp_sensor_id id,
uint32_t *val);
bool nfp_nsp_fw_loaded(struct nfp_nsp *state);
+/* The buf used to receive bitmap of link modes */
+struct nfp_eth_media_buf {
+ uint8_t eth_index;
+ uint8_t reserved[7];
+ uint64_t supported_modes[2];
+ uint64_t reserved_2[2];
+};
+
+/* Link modes about RJ45 haven't been used, so there's no mapping to them */
+enum nfp_link_mode_list {
+ NFP_MEDIA_W0_RJ45_10M,
+ NFP_MEDIA_W0_RJ45_10M_HD,
+ NFP_MEDIA_W0_RJ45_100M,
+ NFP_MEDIA_W0_RJ45_100M_HD,
+ NFP_MEDIA_W0_RJ45_1G,
+ NFP_MEDIA_W0_RJ45_2P5G,
+ NFP_MEDIA_W0_RJ45_5G,
+ NFP_MEDIA_W0_RJ45_10G,
+ NFP_MEDIA_1000BASE_CX,
+ NFP_MEDIA_1000BASE_KX,
+ NFP_MEDIA_10GBASE_KX4,
+ NFP_MEDIA_10GBASE_KR,
+ NFP_MEDIA_10GBASE_CX4,
+ NFP_MEDIA_10GBASE_CR,
+ NFP_MEDIA_10GBASE_SR,
+ NFP_MEDIA_10GBASE_ER,
+ NFP_MEDIA_25GBASE_KR,
+ NFP_MEDIA_25GBASE_KR_S,
+ NFP_MEDIA_25GBASE_CR,
+ NFP_MEDIA_25GBASE_CR_S,
+ NFP_MEDIA_25GBASE_SR,
+ NFP_MEDIA_40GBASE_CR4,
+ NFP_MEDIA_40GBASE_KR4,
+ NFP_MEDIA_40GBASE_SR4,
+ NFP_MEDIA_40GBASE_LR4,
+ NFP_MEDIA_50GBASE_KR,
+ NFP_MEDIA_50GBASE_SR,
+ NFP_MEDIA_50GBASE_CR,
+ NFP_MEDIA_50GBASE_LR,
+ NFP_MEDIA_50GBASE_ER,
+ NFP_MEDIA_50GBASE_FR,
+ NFP_MEDIA_100GBASE_KR4,
+ NFP_MEDIA_100GBASE_SR4,
+ NFP_MEDIA_100GBASE_CR4,
+ NFP_MEDIA_100GBASE_KP4,
+ NFP_MEDIA_100GBASE_CR10,
+ NFP_MEDIA_10GBASE_LR,
+ NFP_MEDIA_25GBASE_LR,
+ NFP_MEDIA_25GBASE_ER,
+ NFP_MEDIA_LINK_MODES_NUMBER
+};
+
#endif /* __NSP_NSP_H__ */
--
2.39.1
