From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by dpdk.org (Postfix) with ESMTP id 6EAED1B381 for ; Tue, 16 Jan 2018 19:26:17 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id e11so10126904pff.6 for ; Tue, 16 Jan 2018 10:26:17 -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=tzMWPoHHLIIEnPxnXllstmdQtUbq20eXm+U+Gl09ahI=; b=Ntlj+H9Y/cxD8vC1dQ/OAu3f0BgJd6RlpwF1P6RNAxkgo9VcjOb4nWy2BrKS0OYGHU otHEyyyDAH1xzjDZTuJYOhE9SoN+XDfO8LQwENPiLjMCvr2zCuHgoWLlAiQIaMIVZTm0 txdAxA1dNq1qvvqHij8k3opGCqH2cWoSBxuLovru/kL4eDgPRyYdnoy3JPbqTaWbt/1a H58jflzX1D4JMpWu74f97U7rHLOLLZtB85ZSjVuJ+s3nAK6AS6cf/cxYrrfLUmlhfZUZ 1AJyz6vqPGHE3S7NEY1rdDFvCDls+PhKOW9Z9K3QQ7G5Tf7UgbsjvjDIIJtYMlf2x08U gC/w== 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=tzMWPoHHLIIEnPxnXllstmdQtUbq20eXm+U+Gl09ahI=; b=qWUjinAN5u/6D+rS/C8CsbL8WwN9jWjY6hT8TzjpxSaH2qO9tJNcKGsJgVujVT28Zi JOED+Edk/rqogAPak3hn1juP2b48avEFpAP0UjMOiIoBmB15QfvNS4NdBYbAsaA9hzxy 9NGWpbckkH3yDqSComFVDPN5VdBj2aDxduTULHShmzsp8Si/I3ZrHm4JXEguhBysiiZL NNh+/SC7PPrbs43a05aNbeDeLfbuf8rhhsbs+8zRr7lyhEecDEeZMeJJOMSpQHGIM3mi msy0F75SMCiuK5wuN38gkvjrjJhDU4/+9WyT8NXbYZg2Ke7pWPMc0pBg7koeiaceBpQ4 wysg== X-Gm-Message-State: AKwxytfdB97R7NeDVJvzyqjF2Kvu3WUZ4nNBhS+OrO08EsRGlSkbRpS9 GHTGj8ZfohuYVT27uqz96zgAJ4CH4vs= X-Google-Smtp-Source: ACJfBos/UJJLLge6E7LkJyGNFuNXkobbtvCSanFK/xQ584jiNAT0EZs0hk2xhut4RD8iLbUGVJG/yg== X-Received: by 10.99.4.216 with SMTP id 207mr14229558pge.45.1516127176318; Tue, 16 Jan 2018 10:26:16 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 10:26:15 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 16 Jan 2018 10:25:54 -0800 Message-Id: <20180116182558.6254-12-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 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: Tue, 16 Jan 2018 18:26:17 -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 | 53 ++++++--------------------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c index 5b50c9334103..cdb21a896f6c 100644 --- a/drivers/net/liquidio/lio_ethdev.c +++ b/drivers/net/liquidio/lio_ethdev.c @@ -901,32 +901,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) { @@ -946,23 +920,17 @@ 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; - - /* Initialize */ - 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)); + struct rte_eth_link link = { + .link_status = ETH_LINK_DOWN, + .link_speed = ETH_SPEED_NUM_NONE, + .link_duplex = ETH_LINK_HALF_DUPLEX, + .link_autoneg = ETH_LINK_AUTONEG, + }; /* 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 */ @@ -979,12 +947,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; - + rte_eth_linkstatus_set(eth_dev, &link); return 0; } -- 2.15.1