From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by dpdk.org (Postfix) with ESMTP id C96FE1B2BB for ; Fri, 26 Jan 2018 03:02:06 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id r19so6294343pgn.1 for ; Thu, 25 Jan 2018 18:02: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=wdLMDs2S97dSnxPGw1Xl4ETrjpSmhCg4T3SBQCBgQ6w=; b=c/jzz4DeJbWV56X00y511r86bBIOkeHeU0fZVvRg+IldQubRdnvxBsxHEO/RjzaHQ5 X2lDStXbZeW07TnRCqyTwfiP/Tg25Cy1RhOQdie9ID4ozo0KByXrGn4y6NQlS2PS4pUR UsCo1VfAQec3pX6ex5AVX80at5I245OkOjzxMmuorddqDW/iBB8U/anNnci1EPsOPA2x 6ZLv1RxBoUN/KA375eI9lUzTUHBet1hqUIeJVa9jzGHBCb2ClnhER/K5EmzBZyRZbPZA l+o8RTD//8GFdvOJoh0Rx8UnxrOOX1SiF+q/HJl/hM2R0FcsT7qwKZ9WRNHMdV12PEjV K38g== 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=wdLMDs2S97dSnxPGw1Xl4ETrjpSmhCg4T3SBQCBgQ6w=; b=rirOiETMUOY4o5rWfmlzqViOrRIdLbENM2FDHkK5KnInQNBEzGbbNRwdV831Ky1L2s HHd5nwy6EDkhGIAUmcXuqeKn7bq5w0vZVZfiryRv0c/5OI6KPOEuwP7xGBZ4kdineMAi leiHYFM4742vvKrzmRJ5bQW6PpirqJi1R2YN6YpCWH/Th2yCDBXwiTTtubfYj1/rvdrK O1Sw4vJ9GwwUg20ntZqOI/psWCiCfqEt5ARoBSgDhky8CNHzDEr2DOcqTnC8kRO6pB98 Q1+RtdI6zetbfYYY5om0uW/QSE8205hc/+6rkoCjUAbM4M3fyJugAV0HsIUOMzKXskPN 83gw== X-Gm-Message-State: AKwxytecYZJkKZ75MiX1J9Rlapow8ujySA21WgBh8CFmkvyJyFs9iZ9+ nZo4f+Np0cmVmKsNwFcRSYvBIwqVpok= X-Google-Smtp-Source: AH8x227LAUKSGeDmnohXmGD/uqBbKGr69wPyhSrdSlMrJYtx4Fqe8gCKW32SyJneM4ELzqpYB96WgQ== X-Received: by 2002:a17:902:e2:: with SMTP id a89-v6mr12785707pla.98.1516932125376; Thu, 25 Jan 2018 18:02: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 d5sm22141492pfk.2.2018.01.25.18.02.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 18:02:04 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 25 Jan 2018 18:01:47 -0800 Message-Id: <20180126020151.979-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180126020151.979-1-stephen@networkplumber.org> References: <20180126020151.979-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v8 11/15] net/liquidio: use rte_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: Fri, 26 Jan 2018 02:02:07 -0000 Use the new link update API, and cleanup the logic in the the link update routine. Tested-by: Shijith Thotton Signed-off-by: Stephen Hemminger --- drivers/net/liquidio/lio_ethdev.c | 44 ++++----------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c index 843d023383f7..f44e5a952cbf 100644 --- a/drivers/net/liquidio/lio_ethdev.c +++ b/drivers/net/liquidio/lio_ethdev.c @@ -904,32 +904,6 @@ lio_dev_vlan_filter_set(struct rte_eth_dev *eth_dev, uint16_t vlan_id, int on) return 0; } -/** - * Atomically writes the link status information into global - * structure rte_eth_dev. - * - * @param eth_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 -lio_dev_atomic_write_link_status(struct rte_eth_dev *eth_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 uint64_t lio_hweight64(uint64_t w) { @@ -949,23 +923,19 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete __rte_unused) { struct lio_device *lio_dev = LIO_DEV(eth_dev); - struct rte_eth_link link, old; + struct rte_eth_link link; /* Initialize */ + memset(&link, 0, sizeof(link)); link.link_status = ETH_LINK_DOWN; link.link_speed = ETH_SPEED_NUM_NONE; link.link_duplex = ETH_LINK_HALF_DUPLEX; link.link_autoneg = ETH_LINK_AUTONEG; - memset(&old, 0, sizeof(old)); /* Return what we found */ if (lio_dev->linfo.link.s.link_up == 0) { /* Interface is down */ - if (lio_dev_atomic_write_link_status(eth_dev, &link)) - return -1; - if (link.link_status == old.link_status) - return -1; - return 0; + return rte_eth_linkstatus_set(eth_dev, &link); } link.link_status = ETH_LINK_UP; /* Interface is up */ @@ -982,13 +952,7 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev, link.link_duplex = ETH_LINK_HALF_DUPLEX; } - if (lio_dev_atomic_write_link_status(eth_dev, &link)) - return -1; - - if (link.link_status == old.link_status) - return -1; - - return 0; + return rte_eth_linkstatus_set(eth_dev, &link); } /** -- 2.15.1