X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Focteontx2%2Fotx2_link.c;h=8f5d0eed92b65cd624acc2661f57fa1f7c32df33;hb=46c6714ffd4326cd9ea884a9812a459a444f464a;hp=4128f56d9081761446f8d4a8a625958e2c50d291;hpb=7b1b04079174e8a6843fcb53d1de792bf09fdf03;p=dpdk.git diff --git a/drivers/net/octeontx2/otx2_link.c b/drivers/net/octeontx2/otx2_link.c index 4128f56d90..8f5d0eed92 100644 --- a/drivers/net/octeontx2/otx2_link.c +++ b/drivers/net/octeontx2/otx2_link.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include "otx2_ethdev.h" @@ -41,12 +41,35 @@ nix_link_status_print(struct rte_eth_dev *eth_dev, struct rte_eth_link *link) otx2_info("Port %d: Link Up - speed %u Mbps - %s", (int)(eth_dev->data->port_id), (uint32_t)link->link_speed, - link->link_duplex == ETH_LINK_FULL_DUPLEX ? + link->link_duplex == RTE_ETH_LINK_FULL_DUPLEX ? "full-duplex" : "half-duplex"); else otx2_info("Port %d: Link Down", (int)(eth_dev->data->port_id)); } +void +otx2_eth_dev_link_status_get(struct otx2_dev *dev, + struct cgx_link_user_info *link) +{ + struct otx2_eth_dev *otx2_dev = (struct otx2_eth_dev *)dev; + struct rte_eth_link eth_link; + struct rte_eth_dev *eth_dev; + + if (!link || !dev) + return; + + eth_dev = otx2_dev->eth_dev; + if (!eth_dev) + return; + + rte_eth_linkstatus_get(eth_dev, ð_link); + + link->link_up = eth_link.link_status; + link->speed = eth_link.link_speed; + link->an = eth_link.link_autoneg; + link->full_duplex = eth_link.link_duplex; +} + void otx2_eth_dev_link_status_update(struct otx2_dev *dev, struct cgx_link_user_info *link) @@ -69,9 +92,12 @@ otx2_eth_dev_link_status_update(struct otx2_dev *dev, eth_link.link_status = link->link_up; eth_link.link_speed = link->speed; - eth_link.link_autoneg = ETH_LINK_AUTONEG; + eth_link.link_autoneg = RTE_ETH_LINK_AUTONEG; eth_link.link_duplex = link->full_duplex; + otx2_dev->speed = link->speed; + otx2_dev->duplex = link->full_duplex; + /* Print link info */ nix_link_status_print(eth_dev, ð_link); @@ -79,16 +105,16 @@ otx2_eth_dev_link_status_update(struct otx2_dev *dev, rte_eth_linkstatus_set(eth_dev, ð_link); /* Set the flag and execute application callbacks */ - _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); + rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); } static int lbk_link_update(struct rte_eth_link *link) { - link->link_status = ETH_LINK_UP; - link->link_speed = ETH_SPEED_NUM_100G; - link->link_autoneg = ETH_LINK_FIXED; - link->link_duplex = ETH_LINK_FULL_DUPLEX; + link->link_status = RTE_ETH_LINK_UP; + link->link_speed = RTE_ETH_SPEED_NUM_100G; + link->link_autoneg = RTE_ETH_LINK_FIXED; + link->link_duplex = RTE_ETH_LINK_FULL_DUPLEX; return 0; } @@ -105,7 +131,7 @@ cgx_link_update(struct otx2_eth_dev *dev, struct rte_eth_link *link) link->link_status = rsp->link_info.link_up; link->link_speed = rsp->link_info.speed; - link->link_autoneg = ETH_LINK_AUTONEG; + link->link_autoneg = RTE_ETH_LINK_AUTONEG; if (rsp->link_info.full_duplex) link->link_duplex = rsp->link_info.full_duplex; @@ -122,7 +148,7 @@ otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete) RTE_SET_USED(wait_to_complete); memset(&link, 0, sizeof(struct rte_eth_link)); - if (otx2_dev_is_sdp(dev)) + if (!eth_dev->data->dev_started || otx2_dev_is_sdp(dev)) return 0; if (otx2_dev_is_lbk(dev)) @@ -184,3 +210,78 @@ otx2_nix_dev_set_link_down(struct rte_eth_dev *eth_dev) return nix_dev_set_link_state(eth_dev, 0); } + +static int +cgx_change_mode(struct otx2_eth_dev *dev, struct cgx_set_link_mode_args *cfg) +{ + struct otx2_mbox *mbox = dev->mbox; + struct cgx_set_link_mode_req *req; + + req = otx2_mbox_alloc_msg_cgx_set_link_mode(mbox); + req->args.speed = cfg->speed; + req->args.duplex = cfg->duplex; + req->args.an = cfg->an; + + return otx2_mbox_process(mbox); +} + +#define SPEED_NONE 0 +static inline uint32_t +nix_parse_link_speeds(struct otx2_eth_dev *dev, uint32_t link_speeds) +{ + uint32_t link_speed = SPEED_NONE; + + /* 50G and 100G to be supported for board version C0 and above */ + if (!otx2_dev_is_Ax(dev)) { + if (link_speeds & RTE_ETH_LINK_SPEED_100G) + link_speed = 100000; + if (link_speeds & RTE_ETH_LINK_SPEED_50G) + link_speed = 50000; + } + if (link_speeds & RTE_ETH_LINK_SPEED_40G) + link_speed = 40000; + if (link_speeds & RTE_ETH_LINK_SPEED_25G) + link_speed = 25000; + if (link_speeds & RTE_ETH_LINK_SPEED_20G) + link_speed = 20000; + if (link_speeds & RTE_ETH_LINK_SPEED_10G) + link_speed = 10000; + if (link_speeds & RTE_ETH_LINK_SPEED_5G) + link_speed = 5000; + if (link_speeds & RTE_ETH_LINK_SPEED_1G) + link_speed = 1000; + + return link_speed; +} + +static inline uint8_t +nix_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; +} + +int +otx2_apply_link_speed(struct rte_eth_dev *eth_dev) +{ + struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); + struct rte_eth_conf *conf = ð_dev->data->dev_conf; + struct cgx_set_link_mode_args cfg; + + /* If VF/SDP/LBK, link attributes cannot be changed */ + if (otx2_dev_is_vf_or_sdp(dev) || otx2_dev_is_lbk(dev)) + return 0; + + memset(&cfg, 0, sizeof(struct cgx_set_link_mode_args)); + cfg.speed = nix_parse_link_speeds(dev, conf->link_speeds); + if (cfg.speed != SPEED_NONE && cfg.speed != dev->speed) { + cfg.duplex = nix_parse_eth_link_duplex(conf->link_speeds); + cfg.an = (conf->link_speeds & RTE_ETH_LINK_SPEED_FIXED) == 0; + + return cgx_change_mode(dev, &cfg); + } + return 0; +}