From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by dpdk.org (Postfix) with ESMTP id C90C61B35B for ; Tue, 16 Jan 2018 19:26:06 +0100 (CET) Received: by mail-pl0-f68.google.com with SMTP id g18so1189967plo.7 for ; Tue, 16 Jan 2018 10:26:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fh0nLM5IfBZCaQBajwNcLknTFEEMshSi8DTpkuksOC4=; b=hESKyEYauNSay1Whm/RPTNcknxGJWNS1Udnpy6LfFahjG8u+aM3kQT/z73G5LWyHgw n+vvv215gzssXdn1EYvtxBqQQr5EXTqlOxfyTVBF10Uil82CRgTvn8CfemuuX7RdfGq9 +xp0YWLJOL66bpiHnjZ2R5jEw62kOVIeng6bLDbOdsqsCjqRXMyoIrTEZUaGUTpVm9vP CNeAy6zKLm35SuzwTxUWsfLUpwycqA2kHZrel28sYY86HJQw1gNYlo25fFfU36xjV1oo 1qsgmUXUQ2k5TENFLAdd+V4+pnPNHC74uLCtAAQS61hHUIlGVM9peB32+ih1ttwcX+K1 swVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fh0nLM5IfBZCaQBajwNcLknTFEEMshSi8DTpkuksOC4=; b=aYRGvPDy2HktfKcjbDIH6YHxGgtRp/u/qpmT1MtLe4KtciNK1LFIhtSl+noeQRTda8 hngMPV11UPxAyd0F47G7AmermdXnICw3XJpPoynNW/H6b+ctZ95NtV5bsYNNLtdZytaJ 35J0KAvN4yYERH+CtjZpTI/v+3ohUFUQf4YC8p107h9vwML9nxlVyYQJA0Gid+Mx025Q FdaFfpSqJC76a0v/zoa4U+g/2DgF/iGr0eW/ihyIaDSV9oTYrNcep9TxTYJ+NwR5rPei 8hMLfze0F45gdNoXFv79piQjTp8H7nRnMX+EBJnmvoA48iC6tT5OnjriFl2zLsECKh6W z7YA== X-Gm-Message-State: AKGB3mI6dZ7mJ3ix3LWiJB5hKU6JOSCKabuYZ2SN8mOHmfIarXpjLbP4 8w4MuPHfXw9OM1iUWomNrpe/dw29wAs= X-Google-Smtp-Source: ACJfBovzLfl0WjnJjLG0shGGcumQS7aGdEu6+W3oc5a5CP/R/cjdt3Coq+M4n6bo1k6VSsdCkXvQHg== X-Received: by 10.84.133.131 with SMTP id f3mr39553761plf.280.1516127165604; Tue, 16 Jan 2018 10:26:05 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id x17sm3940497pge.50.2018.01.16.10.26.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 10:26:04 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 16 Jan 2018 10:25:46 -0800 Message-Id: <20180116182558.6254-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116182558.6254-1-stephen@networkplumber.org> References: <20180116182558.6254-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v4 03/15] net/virtio: use eth_linkstatus_set X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jan 2018 18:26:07 -0000 Use the new comon code in ethdev to handle link status update. Signed-off-by: Stephen Hemminger --- drivers/net/virtio/virtio_ethdev.c | 67 ++++++++------------------------------ 1 file changed, 13 insertions(+), 54 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 21f2131a9efd..782fd8619116 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 @@ -771,46 +770,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) { @@ -1913,8 +1872,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"); @@ -1922,21 +1883,19 @@ 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); } static int virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { - 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); - old = link; - link.link_duplex = ETH_LINK_FULL_DUPLEX; - link.link_speed = SPEED_10G; + uint16_t status; + struct rte_eth_link link = { + .link_speed = ETH_SPEED_NUM_10G, + .link_duplex = ETH_LINK_FULL_DUPLEX, + .link_autoneg = ETH_LINK_SPEED_FIXED, + }; if (hw->started == 0) { link.link_status = ETH_LINK_DOWN; @@ -1957,9 +1916,9 @@ 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); - - return (old.link_status == link.link_status) ? -1 : 0; + rte_eth_linkstatus_set(dev, &link); + + return 0; } static int -- 2.15.1