From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by dpdk.org (Postfix) with ESMTP id D08E71B355 for ; Tue, 16 Jan 2018 19:26:09 +0100 (CET) Received: by mail-pl0-f65.google.com with SMTP id s3so6805025plp.4 for ; Tue, 16 Jan 2018 10:26:09 -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=dR0V1AUa7cLLWnF6idqOuMz6+pNa43U8efZDnn6MeLE=; b=gu3574248vAlNnnWpXmyR20HJq973+bXwN2I5kG5mTL8Yub+JK8+Otw1pgxyZDGUww 1g9HmU5XXbi3oMvnPMknet1bHNOEA0uMtATbxmqORfRkBsnKFC/a/ENFiu/ztA3LpcOY NAclgTnHmdeleQKwVY3BDVhs4tg7vCKpHH9PdyQTRp2/QM0AZ+QoBTIwl9A+lpnM+ADC U7OvSYEXVrPd6OTtDx9PZn5+l27LcjZyYCZwpRIYC3bkORCW4Fx3khhD4QcmntsKBUQ8 eawwfu/yqbgGdTSOrTsF/OYRJ0Q4lsJhgHtN39rtORQgcxDE6cyPh2BKLlpM78bhtMsY iWNw== 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=dR0V1AUa7cLLWnF6idqOuMz6+pNa43U8efZDnn6MeLE=; b=JN8yBKoBpTT7NKRkndi4ToZVo6QEU5Rsg6WHmnDlOOz2UDz5SmrCTQSnDJE38SnF3E 9qfUPEbbcM1gCPqLUBvKKvX+LymIrPWovDbBa1h8rzWpe0h5HVgNE/jFQugn3+shGHZd hDy7tZv1VnVnX+yLaB2vjcxgxUliutHbW9nSpM6SQhuOwATu7UA25YF+RzllwNCcQAcQ CdmhLfbnJEyJN6lwxyRabKGPSM+098cR1NS0pNxxFpoy/UkPDyvXp25yTr90tNkJnfjh tcESR9y0QXMyZJ9MChGqBWlina08osoXFy2Ia6IWYJtA4ROq1AqH1VA77FcwRs+UKDH+ slQg== X-Gm-Message-State: AKwxytfyEb1Zfai1ok30hMSvjbeTf5B9btVx/K8qpNFKd51F6/RNb7UZ +/PRc/5Lz3a2NG1I3Y+ehQVsSdNYkfE= X-Google-Smtp-Source: ACJfBotF1RonevqdHk/gfHDSJ4v0Lanwr+idm4yigEU+ScmWTU8YMgcPRBvsFhCKOmZj11Q9i4nCbQ== X-Received: by 10.159.202.145 with SMTP id p17mr15600558plo.375.1516127168465; Tue, 16 Jan 2018 10:26:08 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id x17sm3940497pge.50.2018.01.16.10.26.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 10:26:07 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 16 Jan 2018 10:25:48 -0800 Message-Id: <20180116182558.6254-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116182558.6254-1-stephen@networkplumber.org> References: <20180116182558.6254-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v4 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: Tue, 16 Jan 2018 18:26:10 -0000 Use new helper function to update the link status. Signed-off-by: Stephen Hemminger --- drivers/net/dpaa2/dpaa2_ethdev.c | 75 ++++------------------------------------ 1 file changed, 7 insertions(+), 68 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 2f99d95d2216..c2aed380e408 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -56,58 +56,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) { @@ -804,7 +752,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_link_write(dev, &link); } static void @@ -836,7 +784,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev) } memset(&link, 0, sizeof(link)); - dpaa2_dev_atomic_write_link_status(dev, &link); + _rte_eth_link_write(dev, &link); } static void @@ -1284,15 +1232,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) { @@ -1300,11 +1246,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; @@ -1314,12 +1255,10 @@ 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); - else - PMD_DRV_LOG(INFO, "Port %d Link is Down", dev->data->port_id); + if (rte_eth_linkstatus_set(dev, &link)) { + PMD_DRV_LOG(INFO, "Port %d Link is %s\n", dev->data->port_id, + link.link_status ? "Up" : "Down"); + } return 0; } -- 2.15.1