From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by dpdk.org (Postfix) with ESMTP id F04EA1B37C for ; Tue, 16 Jan 2018 19:38:17 +0100 (CET) Received: by mail-pg0-f67.google.com with SMTP id i196so9952666pgd.0 for ; Tue, 16 Jan 2018 10:38: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=WffHZMiJT9K/ahySQFCP3J6sM/D7z7PjTwiUYTXwDiw06bRum9nZsSu43m8HtPB7ke WYle0uwHrQCf5uMsy33rAp/M5Nzw1H9TK+/fx74p/GyY8PiuBjlpRiwjDPJsnGpGAQDB u7s/oMK8wcjj2FE2a1qI+T3nvhgrTS0B2Pim225vv74LCC+LE1ykOL2CF2nXMIbKFEPy RXb5NE0T+cRQ2YGxg2uks6m+PQ2pgPLG5ak/oF/ygZ1dbOxYRyLxchvcx4tz5Y3lX24Z TIL2G1naaiSWsI8jxI7oDWsuo7DBtdVuobK6QZZ8D0v0NtpBhlEIvpyTZkW/IwiTsz98 fxHw== 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=W0rN7Lj3h8DMjHHmLsMcMTVO4O23vxAukSBLSfyFc3riXz1+TrIZmIJTUQJAjXfPxd 4hE9JMDfGgdnWKFCfgoHzJvE7KVOuoHjVEZGNn3nztzsG05jK5aLUCTJ8kqLOOSx20MQ uaW8KzPtIpM+hVshMn9XWNz17Uv5g0VpnfpLmWiLGjWx9jJ8UPtciiFQUw1k8VbP+0TO JAe9kegQWguVt/nNoPjT/ye8wpgL1PLwg/cGdus8EMk8SHeVrGi/zKj93LUAwY8RHu6p LC4yOsKIWfamUViy1YUMUu83Pc08Rcnj3dmTIz/X8h4gxMgiTRSiCOfD38WBBNNtBxUd SKkg== X-Gm-Message-State: AKwxytefmrwtNk7APPygbyGiMdJUXlKl3KXe500eqvO7YDd8/HrnP/VH Oo9l1XDmVML01m8ggE5OPNssd2mvON4= X-Google-Smtp-Source: ACJfBovs3jDnG5GmdkaAS6egkkgxZg5Ee5qpuDQWepiYgOkznqIpqIt1lEF07HwHIvx4RClK1+EVNQ== X-Received: by 10.98.17.21 with SMTP id z21mr11603154pfi.86.1516127896670; Tue, 16 Jan 2018 10:38: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 77sm4560351pfc.187.2018.01.16.10.38.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 10:38:15 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 16 Jan 2018 10:37:51 -0800 Message-Id: <20180116183755.24542-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116183755.24542-1-stephen@networkplumber.org> References: <20180116183755.24542-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v5 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:38:18 -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