d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc: use link status helper functions

Browse Source 
Use new rte_eth_linkstatus_get/set helper functions to handle link
status update.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Stephen Hemminger 2018-01-25 18:01:45 -08:00 committed by Ferruh Yigit
parent faadebad81
commit 4abe903e50
2 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/sfc/sfc_ethdev.c
View File

@ -236,22 +236,13 @@ static int
sfc_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{
struct sfc_adapter *sa = dev->data->dev_private;
struct rte_eth_link *dev_link = &dev->data->dev_link;
struct rte_eth_link old_link;
struct rte_eth_link current_link;
int ret;
sfc_log_init(sa, "entry");
retry:
EFX_STATIC_ASSERT(sizeof(*dev_link) == sizeof(rte_atomic64_t));
*(int64_t *)&old_link = rte_atomic64_read((rte_atomic64_t *)dev_link);
if (sa->state != SFC_ADAPTER_STARTED) {
sfc_port_link_mode_to_info(EFX_LINK_UNKNOWN, &current_link);
if (!rte_atomic64_cmpset((volatile uint64_t *)dev_link,
*(uint64_t *)&old_link,
*(uint64_t *)&current_link))
goto retry;
} else if (wait_to_complete) {
efx_link_mode_t link_mode;
@ -259,21 +250,16 @@ sfc_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
link_mode = EFX_LINK_UNKNOWN;
sfc_port_link_mode_to_info(link_mode, &current_link);
if (!rte_atomic64_cmpset((volatile uint64_t *)dev_link,
*(uint64_t *)&old_link,
*(uint64_t *)&current_link))
goto retry;
} else {
sfc_ev_mgmt_qpoll(sa);
*(int64_t *)&current_link =
rte_atomic64_read((rte_atomic64_t *)dev_link);
rte_eth_linkstatus_get(dev, &current_link);
}
if (old_link.link_status != current_link.link_status)
ret = rte_eth_linkstatus_set(dev, &current_link);
if (ret == 0)
sfc_info(sa, "Link status is %s",
current_link.link_status ? "UP" : "DOWN");
return old_link.link_status == current_link.link_status ? 0 : -1;
return ret;
}
static void

20
drivers/net/sfc/sfc_ev.c
View File

@ -382,27 +382,11 @@ sfc_ev_link_change(void *arg, efx_link_mode_t link_mode)
{
struct sfc_evq *evq = arg;
struct sfc_adapter *sa = evq->sa;
struct rte_eth_link *dev_link = &sa->eth_dev->data->dev_link;
struct rte_eth_link new_link;
uint64_t new_link_u64;
uint64_t old_link_u64;
EFX_STATIC_ASSERT(sizeof(*dev_link) == sizeof(rte_atomic64_t));
sfc_port_link_mode_to_info(link_mode, &new_link);
new_link_u64 = *(uint64_t *)&new_link;
do {
old_link_u64 = rte_atomic64_read((rte_atomic64_t *)dev_link);
if (old_link_u64 == new_link_u64)
break;
if (rte_atomic64_cmpset((volatile uint64_t *)dev_link,
old_link_u64, new_link_u64)) {
evq->sa->port.lsc_seq++;
break;
}
} while (B_TRUE);
if (rte_eth_linkstatus_set(sa->eth_dev, &new_link))
evq->sa->port.lsc_seq++;
return B_FALSE;
}