From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by dpdk.org (Postfix) with ESMTP id 8592E1B22A for ; Fri, 26 Jan 2018 03:02:00 +0100 (CET) Received: by mail-pf0-f195.google.com with SMTP id y26so7198537pfi.10 for ; Thu, 25 Jan 2018 18:02:00 -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=F8JydM3XauaDUgu0k3Lt6s+7X84MbbZTSvX3H1muDHI=; b=H84FgU5BZThFoMqmPVSfoA1QLM5tVUYAUy0JtQ3AgBsAssrS6Pq2tWiUFPQb4gkRoC khbfZka1JRElMqf1b2TI3eJMVawEjfnRvyUq3G9yPvsTqRvcIhO8EjUSMRVq3bpbdEjU 6NIwi24A/SeK+E6likB6fDp2CR6GtF+jyEY2/BlJwgs4U7nxdBhtZGRvlEqAbiZqV2cG 1gbbJwE5jAhAQdxVahgJHCK/X6r4efsJm9EE/AjzHzUQHgtsU30yc8WYYLYYeWsHrjd8 tZXgVl0/AB/6sS/x/DHOK8RYZzvpVrnTk1iX7lsDK6gPKLHrAcvQgL0KhHJ5FTRo9UmX rFiA== 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=F8JydM3XauaDUgu0k3Lt6s+7X84MbbZTSvX3H1muDHI=; b=d26i6pw/nENkAzNwjm/mjIe/mvstPv6yxFFaQ6nz5/4ubfGd0aRAmVLCgqVh4Gsmqn 7xrdqCy50durJZB87XodBIlNnOIGq9I/ZiWEPXXEHI/rmAC8eZaqMvWW8M75BjAVtqfB uOGYOtI6nP87X1jXLJLlDUEPlLOzJVbu7aFC/AjMIIkaPS3UP/cIz0B1Jc64bJ2+dpGy nUTcCbhsZty7cAYFAyebh7TReUKABNAYdH5rQrmoXQjg4uMME9vnpmK4BqIsn91i5AAL dF17dDYuII8UU9YcunkuOP4i1DzlrhgeznBJigbhKCx4vHAg3BpF0umI/XzrKGD8a+S1 2A3w== X-Gm-Message-State: AKwxytes/tRYPtPELcytJujMmPVyMS4bwVGr9rxz2tFbWJd04EoFupdd iFasNQkoPLOH5vIgADXPvZ88RNguJBY= X-Google-Smtp-Source: AH8x225TpR0UVhW3G3KIjWLJ/a6/Y2bvRNS8qqV1bfEfAOXq6vRqKQf2DhyUGvRbYw9W1ASsqqdXbg== X-Received: by 2002:a17:902:7182:: with SMTP id b2-v6mr13965690pll.38.1516932119198; Thu, 25 Jan 2018 18:01:59 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id d5sm22141492pfk.2.2018.01.25.18.01.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 18:01:58 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 25 Jan 2018 18:01:41 -0800 Message-Id: <20180126020151.979-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180126020151.979-1-stephen@networkplumber.org> References: <20180126020151.979-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v8 05/15] net/dpaa2: 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: Fri, 26 Jan 2018 02:02:01 -0000 Use new helper function to update the link status. Signed-off-by: Stephen Hemminger --- drivers/net/dpaa2/dpaa2_ethdev.c | 78 ++++++---------------------------------- 1 file changed, 10 insertions(+), 68 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 09a11d65af93..6778fc97fdd6 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -57,58 +57,6 @@ static int dpaa2_dev_set_link_up(struct rte_eth_dev *dev); static int dpaa2_dev_set_link_down(struct rte_eth_dev *dev); static int dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); -/** - * 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 -dpaa2_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 -dpaa2_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; -} - static int dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) { @@ -852,7 +800,7 @@ dpaa2_dev_stop(struct rte_eth_dev *dev) /* clear the recorded link status */ memset(&link, 0, sizeof(link)); - dpaa2_dev_atomic_write_link_status(dev, &link); + rte_eth_linkstatus_set(dev, &link); } static void @@ -884,7 +832,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev) } memset(&link, 0, sizeof(link)); - dpaa2_dev_atomic_write_link_status(dev, &link); + rte_eth_linkstatus_set(dev, &link); } static void @@ -1335,15 +1283,13 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev, int ret; struct dpaa2_dev_priv *priv = dev->data->dev_private; struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw; - struct rte_eth_link link, old; + struct rte_eth_link link; struct dpni_link_state state = {0}; if (dpni == NULL) { RTE_LOG(ERR, PMD, "dpni is NULL\n"); return 0; } - memset(&old, 0, sizeof(old)); - dpaa2_dev_atomic_read_link_status(dev, &old); ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state); if (ret < 0) { @@ -1351,11 +1297,6 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev, return -1; } - if ((old.link_status == state.up) && (old.link_speed == state.rate)) { - RTE_LOG(DEBUG, PMD, "No change in status\n"); - return -1; - } - memset(&link, 0, sizeof(struct rte_eth_link)); link.link_status = state.up; link.link_speed = state.rate; @@ -1365,13 +1306,14 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev, else link.link_duplex = ETH_LINK_FULL_DUPLEX; - dpaa2_dev_atomic_write_link_status(dev, &link); - - if (link.link_status) - PMD_DRV_LOG(INFO, "Port %d Link is Up\n", dev->data->port_id); + ret = rte_eth_linkstatus_set(dev, &link); + if (ret == -1) + RTE_LOG(DEBUG, PMD, "No change in status\n"); else - PMD_DRV_LOG(INFO, "Port %d Link is Down", dev->data->port_id); - return 0; + PMD_DRV_LOG(INFO, "Port %d Link is %s\n", dev->data->port_id, + link.link_status ? "Up" : "Down"); + + return ret; } /** -- 2.15.1