From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by dpdk.org (Postfix) with ESMTP id 6D1D41B1AD for ; Tue, 23 Jan 2018 00:55:13 +0100 (CET) Received: by mail-pg0-f65.google.com with SMTP id u1so8354116pgr.0 for ; Mon, 22 Jan 2018 15:55:13 -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=XHqM7ye4hNP0RlH8hIlYQhcQ/MIvuZFmyx2FgJHFwT4=; b=QejsVIrpMNaSPncrjI5LubRTGX1bo17qNebVN+U3GZC3re01I/RnA3riYBlviitp9U k88/fKV+AHmv+oUM3o+eTa/niXUrTNAUFDBt0fTjsWYuM2j2xjlkls4MvEENy4fcl4Dg LePraYk7Qm58UCwfuMht0IckkgTpuG6HYv05+xSEFkSGTuPEaKC+McoGmqEmvZ8Pdppo Se2GUYO7XRzXKQd2zSkO8FugElW7GiJN/DLmGTFGvCdwigY8M+NSLxN2KSmoaVc0725H fJEPzwqdP43d384ey4wO0LmKcZq3mxB+788chC2j5JKeq49neUNhX4X0eufvK/6+jwGi Ou9Q== 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=XHqM7ye4hNP0RlH8hIlYQhcQ/MIvuZFmyx2FgJHFwT4=; b=iFFmUCgBmtgDWDxl6fRxe8iLFZ+vYhwXOIVx1OWthxyZfdW6UcfHPR5BixaiHRWqVP z7dVZyrjcf1MTjORXly6nYyR8LQr+sJvYqkbdulRFVmis+++9jCBpuyrmDHVFGdRGAFB I4H1ZxADnuopthj/4CkEr91rX9W6sLco/nhI4ez5n1khjnmtP6MR0C76Fo2ogHne1oQY Cj58a6IswBFh5U724l4qVf5ZUAp/xE85aZMyif9IGeDoGTGIugNyYNbt75WIs57/GmVj /+Fu9Bw5fCtPEgpZf7ymDF5vaJIdcOyY6QX+0uPZ9RI5xzmVo8B2BNy8EuKvEfZYnhov IvQQ== X-Gm-Message-State: AKwxytdqCotrqmmRUn5pqaJ4xs32rpL7ZFFlLNnqGUv9BZ8Tofg1tJ9I 0cC80erqLMzFyb6H0+Kbo4rqe09NhPA= X-Google-Smtp-Source: AH8x2275FkjK6I0e5hJC9pVnKnxJWrm4rrY5F5Ngieycdqm9VJR1wbH/lhid7mgEyK1NvTI2luC//w== X-Received: by 2002:a17:902:ab8d:: with SMTP id f13-v6mr4329483plr.215.1516665312331; Mon, 22 Jan 2018 15:55:12 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id a24sm1623825pff.160.2018.01.22.15.55.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 15:55:11 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Ferruh Yigit Date: Mon, 22 Jan 2018 15:54:51 -0800 Message-Id: <20180122235458.28562-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180122235458.28562-1-stephen@networkplumber.org> References: <20180122235458.28562-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v7 08/15] net/ixgbe: use rte_eth_linkstatus functions 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, 22 Jan 2018 23:55:13 -0000 Use the new helper functions from eth_dev for handling atomic link_info update. Signed-off-by: Stephen Hemminger Signed-off-by: Ferruh Yigit --- drivers/net/ixgbe/ixgbe_ethdev.c | 96 +++++++--------------------------------- 1 file changed, 17 insertions(+), 79 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 58217680c29c..7b74cbe92c0d 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -787,58 +786,6 @@ static const struct rte_ixgbe_xstats_name_off rte_ixgbevf_stats_strings[] = { #define IXGBEVF_NB_XSTATS (sizeof(rte_ixgbevf_stats_strings) / \ sizeof(rte_ixgbevf_stats_strings[0])) -/** - * Atomically reads the link status information from global - * structure rte_eth_dev. - * - * @param 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 -rte_ixgbe_dev_atomic_read_link_status(struct rte_eth_dev *dev, - struct rte_eth_link *link) -{ - struct rte_eth_link *dst = link; - struct rte_eth_link *src = &(dev->data->dev_link); - - if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, - *(uint64_t *)src) == 0) - return -1; - - return 0; -} - -/** - * Atomically writes the link status information into global - * structure rte_eth_dev. - * - * @param 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 -rte_ixgbe_dev_atomic_write_link_status(struct rte_eth_dev *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; -} - /* * This function is the same as ixgbe_is_sfp() in base/ixgbe.h. */ @@ -2758,7 +2705,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) /* Clear recorded link status */ memset(&link, 0, sizeof(link)); - rte_ixgbe_dev_atomic_write_link_status(dev, &link); + rte_eth_linkstatus_set(dev, &link); if (!rte_intr_allow_others(intr_handle)) /* resume to the default handler */ @@ -3943,7 +3890,6 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, int wait_to_complete, int vf) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct rte_eth_link link, old; ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN; struct ixgbe_interrupt *intr = IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private); @@ -3952,13 +3898,11 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, u32 speed = 0; int wait = 1; bool autoneg = false; - - link.link_status = ETH_LINK_DOWN; - link.link_speed = 0; - link.link_duplex = ETH_LINK_HALF_DUPLEX; - link.link_autoneg = ETH_LINK_AUTONEG; - memset(&old, 0, sizeof(old)); - rte_ixgbe_dev_atomic_read_link_status(dev, &old); + struct rte_eth_link link = { + .link_status = ETH_LINK_DOWN, + .link_duplex = ETH_LINK_HALF_DUPLEX, + .link_autoneg = ETH_LINK_AUTONEG, + }; hw->mac.get_link_status = true; @@ -3982,19 +3926,17 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, if (diag != 0) { link.link_speed = ETH_SPEED_NUM_100M; link.link_duplex = ETH_LINK_FULL_DUPLEX; - rte_ixgbe_dev_atomic_write_link_status(dev, &link); - if (link.link_status == old.link_status) - return -1; + rte_eth_linkstatus_set(dev, &link); + return 0; } if (link_up == 0) { - rte_ixgbe_dev_atomic_write_link_status(dev, &link); intr->flags |= IXGBE_FLAG_NEED_LINK_CONFIG; - if (link.link_status == old.link_status) - return -1; + rte_eth_linkstatus_set(dev, &link); return 0; } + intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG; link.link_status = ETH_LINK_UP; link.link_duplex = ETH_LINK_FULL_DUPLEX; @@ -4026,11 +3968,8 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, link.link_speed = ETH_SPEED_NUM_10G; break; } - rte_ixgbe_dev_atomic_write_link_status(dev, &link); - - if (link.link_status == old.link_status) - return -1; + rte_eth_linkstatus_set(dev, &link); return 0; } @@ -4230,8 +4169,8 @@ ixgbe_dev_link_status_print(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_eth_link link; - memset(&link, 0, sizeof(link)); - rte_ixgbe_dev_atomic_read_link_status(dev, &link); + rte_eth_linkstatus_get(dev, &link); + if (link.link_status) { PMD_INIT_LOG(INFO, "Port %d: Link Up - speed %u Mbps - %s", (int)(dev->data->port_id), @@ -4266,7 +4205,6 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev, struct ixgbe_interrupt *intr = IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private); int64_t timeout; - struct rte_eth_link link; struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -4283,9 +4221,10 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev, } if (intr->flags & IXGBE_FLAG_NEED_LINK_UPDATE) { + struct rte_eth_link link; + /* get the link status before link update, for predicting later */ - memset(&link, 0, sizeof(link)); - rte_ixgbe_dev_atomic_read_link_status(dev, &link); + rte_eth_linkstatus_get(dev, &link); ixgbe_dev_link_update(dev, 0); @@ -6804,9 +6743,8 @@ ixgbe_start_timecounters(struct rte_eth_dev *dev) uint32_t shift = 0; /* Get current link speed. */ - memset(&link, 0, sizeof(link)); ixgbe_dev_link_update(dev, 1); - rte_ixgbe_dev_atomic_read_link_status(dev, &link); + rte_eth_linkstatus_get(dev, &link); switch (link.link_speed) { case ETH_SPEED_NUM_100M: -- 2.15.1