From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ferruh Yigit Subject: [PATCH v6 03/14] net/virtio: use ethdev linkstatus helper functions Date: Sun, 21 Jan 2018 18:59:45 +0000 Message-ID: <20180121185956.32970-3-ferruh.yigit@intel.com> References: <20180116183755.24542-1-stephen@networkplumber.org> <20180121185956.32970-1-ferruh.yigit@intel.com> Cc: dev@dpdk.org, Ferruh Yigit , Stephen Hemminger To: Bruce Richardson , Konstantin Ananyev , Yuanhan Liu , Maxime Coquelin , Tiwei Bie Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id C0D5912001 for ; Sun, 21 Jan 2018 20:00:06 +0100 (CET) In-Reply-To: <20180121185956.32970-1-ferruh.yigit@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Stephen Hemminger Use the new comon code in ethdev to handle link status update. Signed-off-by: Stephen Hemminger Signed-off-by: Ferruh Yigit --- v6: * Keep logic exact same, only use new APIs to get/set link --- drivers/net/virtio/virtio_ethdev.c | 53 +++++--------------------------------- 1 file changed, 6 insertions(+), 47 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 17ac04931..dcbbfa90c 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -785,46 +784,6 @@ static const struct eth_dev_ops virtio_eth_dev_ops = { .mac_addr_set = virtio_mac_addr_set, }; -static inline int -virtio_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 -virtio_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 void virtio_update_stats(struct rte_eth_dev *dev, struct rte_eth_stats *stats) { @@ -2023,8 +1982,10 @@ static void virtio_dev_stop(struct rte_eth_dev *dev) { struct virtio_hw *hw = dev->data->dev_private; - struct rte_eth_link link; struct rte_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf; + struct rte_eth_link link = { + .link_status = ETH_LINK_DOWN, + }; PMD_INIT_LOG(DEBUG, "stop"); @@ -2033,8 +1994,7 @@ virtio_dev_stop(struct rte_eth_dev *dev) virtio_intr_disable(dev); hw->started = 0; - memset(&link, 0, sizeof(link)); - virtio_dev_atomic_write_link_status(dev, &link); + rte_eth_linkstatus_set(dev, &link); rte_spinlock_unlock(&hw->state_lock); } @@ -2044,8 +2004,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet struct rte_eth_link link, old; uint16_t status; struct virtio_hw *hw = dev->data->dev_private; - memset(&link, 0, sizeof(link)); - virtio_dev_atomic_read_link_status(dev, &link); + rte_eth_linkstatus_get(dev, &link); old = link; link.link_duplex = ETH_LINK_FULL_DUPLEX; link.link_speed = ETH_SPEED_NUM_10G; @@ -2069,7 +2028,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet } else { link.link_status = ETH_LINK_UP; } - virtio_dev_atomic_write_link_status(dev, &link); + rte_eth_linkstatus_set(dev, &link); return (old.link_status == link.link_status) ? -1 : 0; } -- 2.14.3