Adding support to configure link attributes like speed,
duplex, negotiation.
Signed-off-by: Harman Kalra <hkalra@marvell.com>
---
drivers/net/thunderx/base/nicvf_mbox.c | 16 +++++
drivers/net/thunderx/base/nicvf_mbox.h | 14 ++++
drivers/net/thunderx/nicvf_ethdev.c | 88 ++++++++++++++++++++++++--
drivers/net/thunderx/nicvf_struct.h | 9 +++
4 files changed, 122 insertions(+), 5 deletions(-)
@@ -423,6 +423,22 @@ nicvf_mbox_set_link_up_down(struct nicvf *nic, bool enable)
mbx.lbk.enable = enable;
return nicvf_mbox_send_msg_to_pf(nic, &mbx);
}
+
+
+int
+nicvf_mbox_change_mode(struct nicvf *nic, struct change_link_mode *cfg)
+{
+ struct nic_mbx mbx = { .msg = { 0 } };
+
+ mbx.mode.msg = NIC_MBOX_MSG_CHANGE_MODE;
+ mbx.mode.vf_id = nic->vf_id;
+ mbx.mode.speed = cfg->speed;
+ mbx.mode.duplex = cfg->duplex;
+ mbx.mode.autoneg = cfg->autoneg;
+ mbx.mode.qlm_mode = cfg->qlm_mode;
+ return nicvf_mbox_send_msg_to_pf(nic, &mbx);
+}
+
void
nicvf_mbox_shutdown(struct nicvf *nic)
{
@@ -41,6 +41,7 @@
#define NIC_MBOX_MSG_LOOPBACK 0x16 /* Set interface in loopback */
#define NIC_MBOX_MSG_RESET_STAT_COUNTER 0x17 /* Reset statistics counters */
#define NIC_MBOX_MSG_SET_LINK 0x21 /* Set link up/down */
+#define NIC_MBOX_MSG_CHANGE_MODE 0x22 /* Change mode */
#define NIC_MBOX_MSG_CFG_DONE 0xF0 /* VF configuration done */
#define NIC_MBOX_MSG_SHUTDOWN 0xF1 /* VF is being shutdown */
#define NIC_MBOX_MSG_RESET_XCAST 0xF2 /* Reset DCAM filtering mode */
@@ -178,6 +179,17 @@ struct set_link_state {
bool enable;
};
+/* Change link mode */
+struct change_link_mode_msg {
+ uint8_t msg;
+ uint8_t vf_id;
+ uint8_t qlm_mode;
+ bool autoneg;
+ uint8_t duplex;
+ uint32_t speed;
+
+};
+
struct nic_mbx {
/* 128 bit shared memory between PF and each VF */
union {
@@ -196,6 +208,7 @@ union {
struct set_loopback lbk;
struct reset_stat_cfg reset_stat;
struct set_link_state set_link;
+ struct change_link_mode_msg mode;
};
};
@@ -225,5 +238,6 @@ void nicvf_mbox_shutdown(struct nicvf *nic);
void nicvf_mbox_cfg_done(struct nicvf *nic);
void nicvf_mbox_link_change(struct nicvf *nic);
void nicvf_mbox_reset_xcast(struct nicvf *nic);
+int nicvf_mbox_change_mode(struct nicvf *nic, struct change_link_mode *cfg);
#endif /* __THUNDERX_NICVF_MBOX__ */
@@ -55,6 +55,82 @@ RTE_LOG_REGISTER_SUFFIX(nicvf_logtype_mbox, mbox, NOTICE);
RTE_LOG_REGISTER_SUFFIX(nicvf_logtype_init, init, NOTICE);
RTE_LOG_REGISTER_SUFFIX(nicvf_logtype_driver, driver, NOTICE);
+#define NICVF_QLM_MODE_SGMII 7
+#define NICVF_QLM_MODE_XFI 12
+
+enum nicvf_link_speed {
+ NICVF_LINK_SPEED_SGMII,
+ NICVF_LINK_SPEED_XAUI,
+ NICVF_LINK_SPEED_RXAUI,
+ NICVF_LINK_SPEED_10G_R,
+ NICVF_LINK_SPEED_40G_R,
+ NICVF_LINK_SPEED_RESERVE1,
+ NICVF_LINK_SPEED_QSGMII,
+ NICVF_LINK_SPEED_RESERVE2,
+ NICVF_LINK_SPEED_UNKNOWN = 255
+};
+
+static inline uint32_t
+nicvf_parse_link_speeds(uint32_t link_speeds)
+{
+ uint32_t link_speed = NICVF_LINK_SPEED_UNKNOWN;
+
+ if (link_speeds & RTE_ETH_LINK_SPEED_40G)
+ link_speed = NICVF_LINK_SPEED_40G_R;
+
+ if (link_speeds & RTE_ETH_LINK_SPEED_10G) {
+ link_speed = NICVF_LINK_SPEED_XAUI;
+ link_speed |= NICVF_LINK_SPEED_RXAUI;
+ link_speed |= NICVF_LINK_SPEED_10G_R;
+ }
+
+ if (link_speeds & RTE_ETH_LINK_SPEED_5G)
+ link_speed = NICVF_LINK_SPEED_QSGMII;
+
+ if (link_speeds & RTE_ETH_LINK_SPEED_1G)
+ link_speed = NICVF_LINK_SPEED_SGMII;
+
+ return link_speed;
+}
+
+static inline uint8_t
+nicvf_parse_eth_link_duplex(uint32_t link_speeds)
+{
+ if ((link_speeds & RTE_ETH_LINK_SPEED_10M_HD) ||
+ (link_speeds & RTE_ETH_LINK_SPEED_100M_HD))
+ return RTE_ETH_LINK_HALF_DUPLEX;
+ else
+ return RTE_ETH_LINK_FULL_DUPLEX;
+}
+
+static int
+nicvf_apply_link_speed(struct rte_eth_dev *dev)
+{
+ struct nicvf *nic = nicvf_pmd_priv(dev);
+ struct rte_eth_conf *conf = &dev->data->dev_conf;
+ struct change_link_mode cfg;
+ if (conf->link_speeds == RTE_ETH_LINK_SPEED_AUTONEG)
+ /* TODO: Handle this case */
+ return 0;
+
+ cfg.speed = nicvf_parse_link_speeds(conf->link_speeds);
+ cfg.autoneg = (conf->link_speeds & RTE_ETH_LINK_SPEED_FIXED) ? 1 : 0;
+ cfg.duplex = nicvf_parse_eth_link_duplex(conf->link_speeds);
+ cfg.qlm_mode = ((conf->link_speeds & RTE_ETH_LINK_SPEED_1G) ?
+ NICVF_QLM_MODE_SGMII :
+ (conf->link_speeds & RTE_ETH_LINK_SPEED_10G) ?
+ NICVF_QLM_MODE_XFI : 0);
+
+ if (cfg.speed != NICVF_LINK_SPEED_UNKNOWN &&
+ (cfg.speed != nic->speed || cfg.duplex != nic->duplex)) {
+ nic->speed = cfg.speed;
+ nic->duplex = cfg.duplex;
+ return nicvf_mbox_change_mode(nic, &cfg);
+ } else {
+ return 0;
+ }
+}
+
static void
nicvf_link_status_update(struct nicvf *nic,
struct rte_eth_link *link)
@@ -1728,6 +1804,13 @@ nicvf_dev_start(struct rte_eth_dev *dev)
return -EBUSY;
}
+ /* Apply new link configurations if changed */
+ ret = nicvf_apply_link_speed(dev);
+ if (ret) {
+ PMD_INIT_LOG(ERR, "Failed to set link configuration\n");
+ return ret;
+ }
+
ret = nicvf_vf_start(dev, nic, rbdrsz);
if (ret != 0)
return ret;
@@ -1921,11 +2004,6 @@ nicvf_dev_configure(struct rte_eth_dev *dev)
return -EINVAL;
}
- if (conf->link_speeds & RTE_ETH_LINK_SPEED_FIXED) {
- PMD_INIT_LOG(INFO, "Setting link speed/duplex not supported");
- return -EINVAL;
- }
-
if (conf->dcb_capability_en) {
PMD_INIT_LOG(INFO, "DCB enable not supported");
return -EINVAL;
@@ -113,4 +113,13 @@ struct nicvf {
struct nicvf *snicvf[MAX_SQS_PER_VF];
} __rte_cache_aligned;
+struct change_link_mode {
+ bool enable;
+ uint8_t qlm_mode;
+ bool autoneg;
+ uint8_t duplex;
+ uint32_t speed;
+
+};
+
#endif /* _THUNDERX_NICVF_STRUCT_H */