From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by dpdk.org (Postfix) with ESMTP id 1731E1B1C5 for ; Mon, 8 Jan 2018 18:45:31 +0100 (CET) Received: by mail-pf0-f196.google.com with SMTP id y5so2563293pff.13 for ; Mon, 08 Jan 2018 09:45:30 -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=c9U/gNYMt9oTW7/0mmi27QtE1xhGM6nlbaPNz0MLmMo=; b=oJ8Ua2tqoK/Xww4VIKy67l4OAv0gvQyTefBW5ksJkZt6HG0JLXqXSoZ5WOSCcQOHwF dBf+C2c6lpLem0hrl1+kbeIUXmWSU4l1Gq9aGxlO7jfNRhd2Hf2fx8kqcCyrYTThgSrO nT+BGrOJpPqN6iARrj4ZBypYI6N0IxKf/ZRtOPxXFukch9B3b8vmUl7ZSFeVD1CPcNSW jsB1AUbVPKRrtU/k9Kwt9d0N67to3LQhwVXBriy8K6ulx0MzMwVRTsVrOy2GtdqTU7Uz O7AO4T52vBcI2fJxNG73PxXtaLre+j3/sODf96hbZb/OtF6LtfgmqIejtynZj4f2tKE0 5Dkg== 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=c9U/gNYMt9oTW7/0mmi27QtE1xhGM6nlbaPNz0MLmMo=; b=tNJZFBMA0o2sWCQjPkj2yrRA0TmRXGmeJSy/lYkNyWWsteehSztsyaELJ67GRaw9QT DwZPtHZ6OZiwmB/zYp9LGWgbYPxMal06KTohk5rTp7V4mHmg+RuvqtstrK1zQ3XuXwu5 mg0w0npbH9ui/tKZ+NKru1WSiYVx6INv6Ia0Je5xd4bmM2v22umhMoDDdYQ5qY/pFx2P DvxAIWXh19zzjz6UECNuNY8Yt/kJkKSADkppA+PqebLxz0oi3VYMJxeSlwVnaOaXvI0m 98+L0gfDaQCVhe14aXp+aHetLgsxBo5W9ci2jhaOSUh3ihpxEjrIuXiGMt5nWo78Eny1 DGJg== X-Gm-Message-State: AKGB3mKOMaM6rdCLFlswD0Hl8CqTRxBcDOg7oh0HoCXUWewkwnPTIwrX lpw9CQl+VY1TUi82pNFZSntj4RBWpyI= X-Google-Smtp-Source: ACJfBosQL5f08jsWHlPjTmz00HCImssVAOs0jSGR8N6KbKO7qn/CBSovhCWdbej+4N9ow/Gzg2ZpBg== X-Received: by 10.159.253.5 with SMTP id p5mr12910115pls.127.1515433529935; Mon, 08 Jan 2018 09:45:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 09:45:29 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jan 2018 09:45:04 -0800 Message-Id: <20180108174514.14688-6-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 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: Mon, 08 Jan 2018 17:45:31 -0000 Use new helper function to update the link status. As a good side effect this fixes a but because this driver was not returning correct status (should be -1 in link_status changed). Signed-off-by: Stephen Hemminger --- drivers/net/dpaa2/dpaa2_ethdev.c | 65 +++++----------------------------------- 1 file changed, 7 insertions(+), 58 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 2f99d95d2216..c0fc59ab148f 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 @@ -1291,8 +1239,8 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev, RTE_LOG(ERR, PMD, "dpni is NULL\n"); return 0; } - memset(&old, 0, sizeof(old)); - dpaa2_dev_atomic_read_link_status(dev, &old); + + _rte_eth_link_read(dev, &old); ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state); if (ret < 0) { @@ -1314,13 +1262,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); + ret = _rte_eth_linkstatus_set(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); - return 0; + + return ret; } /** -- 2.15.1