From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f169.google.com (mail-pf0-f169.google.com [209.85.192.169]) by dpdk.org (Postfix) with ESMTP id 0834F2BAA for ; Fri, 14 Jul 2017 20:30:38 +0200 (CEST) Received: by mail-pf0-f169.google.com with SMTP id e7so49136522pfk.0 for ; Fri, 14 Jul 2017 11:30:38 -0700 (PDT) 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=tcQ27Q8pN2BTuveJW4z8DQ0P6IOwyvySq7RgGAAT2WE=; b=kLzOqZKPUFg9EDCWA40JeARh8dJSLx5zChTvwIIuZYIUVNLVqCTrwjR8zNKB6G5FON XtWpRCyLhNEgcph8RhQEg9WfMS3cgzpzeQfC5oAjut9kBT7ikWjcV5N6OINIBgVv7Rny K6LjyDY0XGssnydZL+KU+lsTJwL+Rpt+Z0u/d7avuvNT76c7EIpPJ4So9z7ZN9L1tcdA ++iNj48KD2tuDpgHtx++GgWUbrg/bJV4lqEMu+2cEd749gxO90m4ghomdbl2CjJRS186 3DqSG7qzTCkcKaFPjVngNyDOQEbGAl+97AfGU/VhiGIRcZ6MYuxnaV9y98p9En2PZYNf PoGA== 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=tcQ27Q8pN2BTuveJW4z8DQ0P6IOwyvySq7RgGAAT2WE=; b=OGnL6yu0Z31uNCQoVLkufE8T/BXeow4k5FIK1BnX3ecqcENxktP7ibGo5zdGkSkzmN c8xNdyP06cghcYkm6/uVKSbbXpDsds5W1ZqHbdeI2bSFg9GqAKn8Y9uCYmwgPqtifxpq He8ceBBps5Sgsg3FWNGPSztpzZNlD1ZPInHZ806mFTfb/zpMROzQgKUXarf8YXQA/RUp 3wzr3BiVDIAnv7vTyAQSDaSaT2QuLDyTPHVKMTU+Pqrgz4kG808lFQRCqwQm8+nR5EQV k9DkyPFXWKhWQKh2MwfmLM7brmMAZKqW7ayFIOOnGSWhSuJRpBAYo1fLMhxslJi9NfXJ 436A== X-Gm-Message-State: AIVw112acQJ4SeXTrYIN7DJ0afyd18+kqnI2ITtjS0qdyQfjs7NFmsB+ Gj0tJnpWzp7QRx9QgBe6Xw== X-Received: by 10.99.117.94 with SMTP id f30mr16148849pgn.197.1500057037794; Fri, 14 Jul 2017 11:30:37 -0700 (PDT) Received: from xeon-e3.wavecable.com (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id r9sm22711163pfi.114.2017.07.14.11.30.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 11:30:36 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Stephen Hemminger Date: Fri, 14 Jul 2017 11:30:15 -0700 Message-Id: <20170714183027.16021-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170714183027.16021-1-stephen@networkplumber.org> References: <20170714183027.16021-1-stephen@networkplumber.org> Subject: [dpdk-dev] [RFC 02/14] virtio: use eth_link_read/write (and bug fix) 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: Fri, 14 Jul 2017 18:30:39 -0000 Use the new code in ethdev to handle link status update. Also, virtio was not correctly setting the autoneg flags since its speed should be marked as fixed. Signed-off-by: Stephen Hemminger --- drivers/net/virtio/virtio_ethdev.c | 54 +++++--------------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 00a3122780ba..776ad4961a37 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -794,46 +793,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) { @@ -1829,20 +1788,20 @@ virtio_dev_stop(struct rte_eth_dev *dev) hw->started = 0; memset(&link, 0, sizeof(link)); - virtio_dev_atomic_write_link_status(dev, &link); + _rte_eth_link_update(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; + struct rte_eth_link link; + uint16_t status; + 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; + link.link_autoneg = ETH_LINK_SPEED_FIXED; if (hw->started == 0) { link.link_status = ETH_LINK_DOWN; @@ -1863,9 +1822,8 @@ 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; + return _rte_eth_link_update(dev, &link); } static void -- 2.11.0