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

net/e1000: 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:43 -08:00 committed by Ferruh Yigit
parent aab28ea2bc
commit 80ba61115e
2 changed files with 10 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/net/e1000/em_ethdev.c
View File

@ -20,7 +20,6 @@
#include <rte_ethdev_pci.h> #include <rte_ethdev_pci.h>
#include <rte_memory.h> #include <rte_memory.h>
#include <rte_eal.h> #include <rte_eal.h>
#include <rte_atomic.h>
#include <rte_malloc.h> #include <rte_malloc.h>
#include <rte_dev.h> #include <rte_dev.h>
@ -197,57 +196,6 @@ static const struct eth_dev_ops eth_em_ops = {
.txq_info_get = em_txq_info_get, .txq_info_get = em_txq_info_get,
}; };
/**
* Atomically reads the link status information from global
* structure rte_eth_dev.
*
* @param dev
* - Pointer to the structure rte_eth_dev to read from.
* - Pointer to the buffer to be saved with the link status.
*
* @return
* - On success, zero.
* - On failure, negative value.
*/
static inline int
rte_em_dev_atomic_read_link_status(struct rte_eth_dev *dev,
struct rte_eth_link *link)
{
struct rte_eth_link *dst = link;
struct rte_eth_link *src = &(dev->data->dev_link);
if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
*(uint64_t *)src) == 0)
return -1;
return 0;
}
/**
* Atomically writes the link status information into global
* structure rte_eth_dev.
*
* @param dev
* - Pointer to the structure rte_eth_dev to read from.
* - Pointer to the buffer to be saved with the link status.
*
* @return
* - On success, zero.
* - On failure, negative value.
*/
static inline int
rte_em_dev_atomic_write_link_status(struct rte_eth_dev *dev,
struct rte_eth_link *link)
{
struct rte_eth_link *dst = &(dev->data->dev_link);
struct rte_eth_link *src = link;
if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
*(uint64_t *)src) == 0)
return -1;
return 0;
}
/** /**
* eth_em_dev_is_ich8 - Check for ICH8 device * eth_em_dev_is_ich8 - Check for ICH8 device
@ -802,7 +750,7 @@ eth_em_stop(struct rte_eth_dev *dev)
/* clear the recorded link status */ /* clear the recorded link status */
memset(&link, 0, sizeof(link)); memset(&link, 0, sizeof(link));
rte_em_dev_atomic_write_link_status(dev, &link); rte_eth_linkstatus_set(dev, &link);
if (!rte_intr_allow_others(intr_handle)) if (!rte_intr_allow_others(intr_handle))
/* resume to the default handler */ /* resume to the default handler */
@ -1160,7 +1108,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{ {
struct e1000_hw *hw = struct e1000_hw *hw =
E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct rte_eth_link link, old; struct rte_eth_link link;
int link_check, count; int link_check, count;
link_check = 0; link_check = 0;
@ -1195,8 +1143,6 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
rte_delay_ms(EM_LINK_UPDATE_CHECK_INTERVAL); rte_delay_ms(EM_LINK_UPDATE_CHECK_INTERVAL);
} }
memset(&link, 0, sizeof(link)); memset(&link, 0, sizeof(link));
rte_em_dev_atomic_read_link_status(dev, &link);
old = link;
/* Now we check if a transition has happened */ /* Now we check if a transition has happened */
if (link_check && (link.link_status == ETH_LINK_DOWN)) { if (link_check && (link.link_status == ETH_LINK_DOWN)) {
@ -1215,14 +1161,8 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
link.link_status = ETH_LINK_DOWN; link.link_status = ETH_LINK_DOWN;
link.link_autoneg = ETH_LINK_FIXED; link.link_autoneg = ETH_LINK_FIXED;
} }
rte_em_dev_atomic_write_link_status(dev, &link);
/* not changed */ return rte_eth_linkstatus_set(dev, &link);
if (old.link_status == link.link_status)
return -1;
/* changed */
return 0;
} }
/* /*
@ -1631,8 +1571,8 @@ eth_em_interrupt_action(struct rte_eth_dev *dev,
if (ret < 0) if (ret < 0)
return 0; return 0;
memset(&link, 0, sizeof(link)); rte_eth_linkstatus_get(dev, &link);
rte_em_dev_atomic_read_link_status(dev, &link);
if (link.link_status) { if (link.link_status) {
PMD_INIT_LOG(INFO, " Port %d: Link Up - speed %u Mbps - %s", PMD_INIT_LOG(INFO, " Port %d: Link Up - speed %u Mbps - %s",
dev->data->port_id, link.link_speed, dev->data->port_id, link.link_speed,

71
drivers/net/e1000/igb_ethdev.c
View File

@ -20,7 +20,6 @@
#include <rte_ethdev_pci.h> #include <rte_ethdev_pci.h>
#include <rte_memory.h> #include <rte_memory.h>
#include <rte_eal.h> #include <rte_eal.h>
#include <rte_atomic.h>
#include <rte_malloc.h> #include <rte_malloc.h>
#include <rte_dev.h> #include <rte_dev.h>
@ -522,57 +521,6 @@ static const struct rte_igb_xstats_name_off rte_igbvf_stats_strings[] = {
#define IGBVF_NB_XSTATS (sizeof(rte_igbvf_stats_strings) / \ #define IGBVF_NB_XSTATS (sizeof(rte_igbvf_stats_strings) / \
sizeof(rte_igbvf_stats_strings[0])) sizeof(rte_igbvf_stats_strings[0]))
/**
* Atomically reads the link status information from global
* structure rte_eth_dev.
*
* @param dev
* - Pointer to the structure rte_eth_dev to read from.
* - Pointer to the buffer to be saved with the link status.
*
* @return
* - On success, zero.
* - On failure, negative value.
*/
static inline int
rte_igb_dev_atomic_read_link_status(struct rte_eth_dev *dev,
struct rte_eth_link *link)
{
struct rte_eth_link *dst = link;
struct rte_eth_link *src = &(dev->data->dev_link);
if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
*(uint64_t *)src) == 0)
return -1;
return 0;
}
/**
* Atomically writes the link status information into global
* structure rte_eth_dev.
*
* @param dev
* - Pointer to the structure rte_eth_dev to read from.
* - Pointer to the buffer to be saved with the link status.
*
* @return
* - On success, zero.
* - On failure, negative value.
*/
static inline int
rte_igb_dev_atomic_write_link_status(struct rte_eth_dev *dev,
struct rte_eth_link *link)
{
struct rte_eth_link *dst = &(dev->data->dev_link);
struct rte_eth_link *src = link;
if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
*(uint64_t *)src) == 0)
return -1;
return 0;
}
static inline void static inline void
igb_intr_enable(struct rte_eth_dev *dev) igb_intr_enable(struct rte_eth_dev *dev)
@ -1559,7 +1507,7 @@ eth_igb_stop(struct rte_eth_dev *dev)
/* clear the recorded link status */ /* clear the recorded link status */
memset(&link, 0, sizeof(link)); memset(&link, 0, sizeof(link));
rte_igb_dev_atomic_write_link_status(dev, &link); rte_eth_linkstatus_set(dev, &link);
if (!rte_intr_allow_others(intr_handle)) if (!rte_intr_allow_others(intr_handle))
/* resume to the default handler */ /* resume to the default handler */
@ -1635,7 +1583,7 @@ eth_igb_close(struct rte_eth_dev *dev)
} }
memset(&link, 0, sizeof(link)); memset(&link, 0, sizeof(link));
rte_igb_dev_atomic_write_link_status(dev, &link); rte_eth_linkstatus_set(dev, &link);
} }
static int static int
@ -2382,7 +2330,7 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{ {
struct e1000_hw *hw = struct e1000_hw *hw =
E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct rte_eth_link link, old; struct rte_eth_link link;
int link_check, count; int link_check, count;
link_check = 0; link_check = 0;
@ -2423,8 +2371,6 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
rte_delay_ms(IGB_LINK_UPDATE_CHECK_INTERVAL); rte_delay_ms(IGB_LINK_UPDATE_CHECK_INTERVAL);
} }
memset(&link, 0, sizeof(link)); memset(&link, 0, sizeof(link));
rte_igb_dev_atomic_read_link_status(dev, &link);
old = link;
/* Now we check if a transition has happened */ /* Now we check if a transition has happened */
if (link_check) { if (link_check) {
@ -2443,14 +2389,8 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
link.link_status = ETH_LINK_DOWN; link.link_status = ETH_LINK_DOWN;
link.link_autoneg = ETH_LINK_FIXED; link.link_autoneg = ETH_LINK_FIXED;
} }
rte_igb_dev_atomic_write_link_status(dev, &link);
/* not changed */ return rte_eth_linkstatus_set(dev, &link);
if (old.link_status == link.link_status)
return -1;
/* changed */
return 0;
} }
/* /*
@ -2887,8 +2827,7 @@ eth_igb_interrupt_action(struct rte_eth_dev *dev,
if (ret < 0) if (ret < 0)
return 0; return 0;
memset(&link, 0, sizeof(link)); rte_eth_linkstatus_get(dev, &link);
rte_igb_dev_atomic_read_link_status(dev, &link);
if (link.link_status) { if (link.link_status) {
PMD_INIT_LOG(INFO, PMD_INIT_LOG(INFO,
" Port %d: Link Up - speed %u Mbps - %s", " Port %d: Link Up - speed %u Mbps - %s",