From: Stephen Hemminger Date: Fri, 26 Jan 2018 02:01:40 +0000 (-0800) Subject: net/vmxnet3: use link status helper functions X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=13086a8f50c288843c2f9ae207f3d386fc132c1c;p=dpdk.git net/vmxnet3: use link status helper functions Use new rte_eth_linkstatus_get/set helper functions to handle link status update. Also remove no longer necessary include of rte_atomic.h Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index e8f2d8c120..426008722b 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -160,59 +159,6 @@ gpa_zone_reserve(struct rte_eth_dev *dev, uint32_t size, return rte_memzone_reserve_aligned(z_name, size, socket_id, 0, align); } -/** - * 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 int -vmxnet3_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 write to. - * - Pointer to the buffer to be saved with the link status. - * - * @return - * - On success, zero. - * - On failure, negative value. - */ -static int -vmxnet3_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; -} - /* * This function is based on vmxnet3_disable_intr() */ @@ -375,7 +321,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) link.link_duplex = ETH_LINK_FULL_DUPLEX; link.link_speed = ETH_SPEED_NUM_10G; link.link_autoneg = ETH_LINK_FIXED; - vmxnet3_dev_atomic_write_link_status(eth_dev, &link); + rte_eth_linkstatus_set(eth_dev, &link); return 0; } @@ -868,7 +814,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) link.link_duplex = ETH_LINK_FULL_DUPLEX; link.link_speed = ETH_SPEED_NUM_10G; link.link_autoneg = ETH_LINK_FIXED; - vmxnet3_dev_atomic_write_link_status(dev, &link); + rte_eth_linkstatus_set(dev, &link); } /* @@ -1147,11 +1093,10 @@ __vmxnet3_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { struct vmxnet3_hw *hw = dev->data->dev_private; - struct rte_eth_link old = { 0 }, link; + struct rte_eth_link link; uint32_t ret; memset(&link, 0, sizeof(link)); - vmxnet3_dev_atomic_read_link_status(dev, &old); VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK); ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD); @@ -1162,9 +1107,7 @@ __vmxnet3_dev_link_update(struct rte_eth_dev *dev, link.link_speed = ETH_SPEED_NUM_10G; link.link_autoneg = ETH_LINK_AUTONEG; - vmxnet3_dev_atomic_write_link_status(dev, &link); - - return (old.link_status == link.link_status) ? -1 : 0; + return rte_eth_linkstatus_set(dev, &link); } static int