From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by dpdk.org (Postfix) with ESMTP id EDBC81B198 for ; Sat, 6 Jan 2018 02:07:04 +0100 (CET) Received: by mail-pl0-f66.google.com with SMTP id 62so4072068pld.7 for ; Fri, 05 Jan 2018 17:07:04 -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=O+Ydxg+mmzUed4Z0HBCC062tN9Ut8DyVbyBMjKNuyYBfQUX6sg7ejYdAvBevKp/C2X 1zwGGKNYztMSsv7R7VHzOKnrVn7tSKyCYNsgFTPoeuWj7OFFkS1IUacfg5CqO5RSaEGJ YYF1/LDdSPEASPTB99zRP0OM5KpzYGQeHp4ibpb5mNrkwwTzc+RAky0xr5/E1poAOFQT 0tDP3Bu203gfd/A3hBJybLGy6I7jk8x2ZHIspmpLfTK2PXnwWkIKZsAC8RM44gghGCyf xxMZkOy044b6sJl3hf0t0KTHuGZUEn+0+wokZB1hrShD1IKJWTQyCPvauBLlxz0xRm1g CEUg== 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=qHBf0d37urWYu2Lccl+vxxeEj/gEbbwavfQac0fg+SCJS3CFtbfkqGtPfO04grCJUd qhdotmpKlpSzxvd63qZlpyk8sYJ5uCQbGbGrjyybdE4N87rD4zWDgNIwov7aRuWwAYab tMOvgZCWrsY8o32CPYxF3/quppdJEu8Kq8cgpmWBf0wGf9IybbTZLmo/fLrZJ/cYLuze MrhvZRdRl+z+ag/PxUoiuVzu1bf9Kdkmtk7bPRVA1FJ091z1algd0wD5Vsnqu6ya8tPv +qIVIBd5FKa3u40UZ/DZ+VuEyVdk/MHRfV9r6SV9JVM6EqYgWAGFJsHAUkYPh8k8+bIF fVtw== X-Gm-Message-State: AKGB3mKZPdIKpJjZgaj71VBimEZl/CC22sIz8f0n7HUXiF0BDTTl3Zpj idAGoCCAgvx2lZ4jPhcyXCU5EpnVvJM= X-Google-Smtp-Source: ACJfBouUOCr7v0KWLjUW41mgIE69tTDJf2ZnkKSxPy+yP20AItG6pcESIbIf+7s0l7MKfxcqqbEmUA== X-Received: by 10.84.141.168 with SMTP id 37mr4734961plv.335.1515200823646; Fri, 05 Jan 2018 17:07:03 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id p14sm12385018pgn.37.2018.01.05.17.07.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 17:07:02 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 5 Jan 2018 17:06:46 -0800 Message-Id: <20180106010656.9167-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180106010656.9167-1-stephen@networkplumber.org> References: <20180106010656.9167-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 05/15] 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: Sat, 06 Jan 2018 01:07:05 -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