From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by dpdk.org (Postfix) with ESMTP id 70C141B1CE for ; Sat, 6 Jan 2018 02:07:12 +0100 (CET) Received: by mail-pl0-f66.google.com with SMTP id s3so4068176plp.4 for ; Fri, 05 Jan 2018 17:07:12 -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=Wnen70b1CiX4/8+DJI5HtYKjg6g7XzXzQfgA/CN1B/o=; b=GYnLzQXYgLqwwOwcMpZDFVc/gUzi7vzGeU85m1lg8eTZbG9eOsGc9dSRKWAJgw9Rc9 uk3RaPvNMyJp5P29OeuVqRR9SFEI0/5qEVKzPhvme78TVjOpI56FBMboMulr9ZHoLF0U F6UKKxqVWZuq6ZaLzMZkVt1gWAgfAyPtgcz2rtqWBUv1Z06D66E59UrAMOlCUtL6F9aG +Wp0rMJvvbYvUXGP+q4xoMbY4B6O/S1cDlD/zXBOzeNPcPrM5Vwo3vx+M059F/ase9ow HI9Lzox3mTbvf6SC1tmz1SIhiWyD5xnJSnSAu8VOsuYLYfASU0i94kpiBvAsQ6ckcp/M NdJQ== 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=Wnen70b1CiX4/8+DJI5HtYKjg6g7XzXzQfgA/CN1B/o=; b=BWLyaJdejgPjm7D7VHOZAxxj8DfJ4TbaF8RxkXOjmiDv9rHoGeCyY8Y1z9nVcQ2lYh dCINiHH+J+oINzkj+np7nEUTNUgyYhiuoivQ26G6xWHlZWyfIdjCxNRSf7874KJA+cn2 k1u46+swpta7UkDfZIZgF++OFXfsT5HZNWZIXa6jZxkDH+UPR8iZ3g9m1EVOpbn15BjK W1IkD/tMLKD3+B4PvPTsyZn5+2MbncIPYWWSIAI9Pt3Kt5+A6PIV8bb5/ku9Zl4/zgDT AVQEaVkaKatiH7Bp1draAsJnxF+WMNn63AtLqNayZTclna4vou1BRTGbAcsO3V6sP/8C uv4w== X-Gm-Message-State: AKGB3mIB4Qf7QhhTzQgl+86If0DlYKq8ba22kbOwuXc7pnvp4VpNgFwa W1WCZekVnCcSqcqW7zxwg1TljJZJWF4= X-Google-Smtp-Source: ACJfBoujxXxGO/+CjimrywfFVgyNKE+pubyGFcltG71CygpPl7v71LkuqEbhHXScuCKv8JQLURlnew== X-Received: by 10.84.128.227 with SMTP id a90mr80532pla.130.1515200831365; Fri, 05 Jan 2018 17:07:11 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id p14sm12385018pgn.37.2018.01.05.17.07.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 17:07:10 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 5 Jan 2018 17:06:52 -0800 Message-Id: <20180106010656.9167-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180106010656.9167-1-stephen@networkplumber.org> References: <20180106010656.9167-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 11/15] 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: Sat, 06 Jan 2018 01:07:12 -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 | 54 ++++++--------------------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c index 84b8a3288d12..c7181ebc58de 100644 --- a/drivers/net/liquidio/lio_ethdev.c +++ b/drivers/net/liquidio/lio_ethdev.c @@ -930,32 +930,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) { @@ -975,23 +949,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 */ @@ -1008,13 +976,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