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 690F81B1F9 for ; Mon, 8 Jan 2018 18:45:38 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id t12so3631460pfg.2 for ; Mon, 08 Jan 2018 09:45:38 -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=LTHwxEXPv5VhS3PG6wGsyM8nqIa+T6uKTSaHAzpE+nsShSaiR1fVnrAOtLbcAuNInc lpTLk8yhETlSPx5rtwXq5uuJCZ5lgZiOZFH6OvH4i0mszcFAtO32soAvcJXnkGSJAxJK eqxRxivmij5RIUGdb5Wei51Bnd6d/+BsCujiAvaOUPYyHDE1A5wHo+ebtJumEEcJDy/G MdWABkW1iN+fkPtefGUl6KdCMYQiBW7lP9nBLImzi/l2B0D6YY5lViG7DM0GsYIC6zou IaLAAO0/+zJO0z3V9W7HS9IhZ6dIm6J4g0BlYvAJ+6P6hnMDmc0HPs6AmLJfYeeU5dq+ yUMg== 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=XeK1kxqdXeTzjepISk7hRogwgnetwAJPXfKUfYupYRNFN4G4HaMVXDyX5B5ujVG773 SlWfZ4S6vSN5SuTdHQgbPaIjOlCakNSJdmUxwdK734wDRrpaPl8DgZV/z8PhTOq6ICuH Tl+lt4LlEgH+u5dyBOTnadDfp8VQtqATc2NnSL7XGqXcT16Q5C9Z5BJuOD6m1ZnLOeES I2oJZ+VmnsUv8FbSxWvKPZnzli/4hOz5H1ZQfDyytZ68Yx3uZ5Mq8x8rqDpaLsW7DrTO EEqAUTobfkBajWsKIXj2H+vsNN2lzwxA+nfO5nQnlynVBiYWmp9vB87kfdHjsF+LKviF CsnQ== X-Gm-Message-State: AKGB3mJlQDL6u28uQMuwFUwXmdpwTVU27amUT9TOoWjjWpA+/ccp7+jl GGUcVDC29J3WyrJnuzKiYZ4ZcZQd3Kw= X-Google-Smtp-Source: ACJfBotXL+6VrqLkzKvbnVL5qXLgslBsQgrCaRjZBpXK4PQ6+ZB83SO2AtxHR21+g54ynAwv5iB7JQ== X-Received: by 10.98.19.137 with SMTP id 9mr2478188pft.5.1515433537263; Mon, 08 Jan 2018 09:45:37 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id j14sm10933142pfh.94.2018.01.08.09.45.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 09:45:36 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jan 2018 09:45:10 -0800 Message-Id: <20180108174514.14688-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108174514.14688-1-stephen@networkplumber.org> References: <20180108174514.14688-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v3 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: Mon, 08 Jan 2018 17:45:38 -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