From patchwork Fri Jul 14 18:30:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 26919 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 019A57CBB; Fri, 14 Jul 2017 20:30:54 +0200 (CEST) Received: from mail-pg0-f53.google.com (mail-pg0-f53.google.com [74.125.83.53]) by dpdk.org (Postfix) with ESMTP id 45BED2C2B for ; Fri, 14 Jul 2017 20:30:44 +0200 (CEST) Received: by mail-pg0-f53.google.com with SMTP id k14so49538816pgr.0 for ; Fri, 14 Jul 2017 11:30:43 -0700 (PDT) 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=t8c+6UW7d70qvFggwZ/X1Qj+RO1lMcddM7vMZ358v28=; b=cR+HhOSw4fUdQRIecGDsZrQ8TcrLwzN3nXjP5RBEXUJFL0PW0a/+ViAqAXcZobfV5R ysPRBJ9ladlXaVqbHsp1mjPF+CGPeBhOqLGoQHuWm3Rec4SR1kEesd1U7k9kLNlWynFp ygfKJkk+Ur5U8qzNJxI6feTIVoyrMtcLHD2MSEnyu8MmJjPDXSZvssILkh+2r0pxefhp l9sn2GE3+kGRL8qcnZwCdHBEZPeNJ3HgEeglf4KLGT+E0xE0jghh1Sso6DXjz9OLxJt/ sHGfGDZ8brA8O//MEK25xRWRDZFSao9SyiJA+6INpG9ODS8Ma8vZU16OrNdXMKYE2HPM MR6Q== 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=t8c+6UW7d70qvFggwZ/X1Qj+RO1lMcddM7vMZ358v28=; b=RW6+IM2pIBe6JvsvdIi4DTO/7hu8euTNUIPBhZeTrBRUCPD9P+F0N45nNBSLnSUsrZ 6o1G+VwYtnguK9db1BpU3zY0xQIsXwGiZQ3DpFW97R1edQnz6AdtgYjknI0ZKmOXfgPw 8Lwtnh+h8a1LCRSJcMQOtS5IDV8eS4t38BWuaxarzFFxnj2Ya+JDq5kuSFXz6gYwZkYg 9oZIQfLcDZ8xVbzCnk0TUIT06P72JikaIh10SyPyKpnKHKMFiVqATsS6ZAowqVsKgZlg fZtjLjAgKbgB6cdO1Ya41YGJ6ku2ZT1lmNQvQQnsR+GQ/hIHRGcDJ9VtjAr81PINQ5OY Lwfw== X-Gm-Message-State: AIVw111zoDgdsbLGDzfj8ZzYQoCyVoWR36+EbzffyPeoXNLNBRO6gDkQ SqZKdFrT4Pd/Y26U/qP82g== X-Received: by 10.98.65.198 with SMTP id g67mr6597406pfd.196.1500057043021; Fri, 14 Jul 2017 11:30:43 -0700 (PDT) Received: from xeon-e3.wavecable.com (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id r9sm22711163pfi.114.2017.07.14.11.30.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 11:30:42 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 14 Jul 2017 11:30:19 -0700 Message-Id: <20170714183027.16021-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170714183027.16021-1-stephen@networkplumber.org> References: <20170714183027.16021-1-stephen@networkplumber.org> Subject: [dpdk-dev] [RFC 06/14] nfp: use rte_eth_link_update 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use new _rte_eth_link_update helper function. Signed-off-by: Stephen Hemminger --- drivers/net/nfp/nfp_net.c | 74 +++++------------------------------------------ 1 file changed, 8 insertions(+), 66 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 92b03c4cb1fe..50b71ab8ca7c 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -203,57 +203,6 @@ nn_cfg_writeq(struct nfp_net_hw *hw, int off, uint64_t val) nn_writeq(rte_cpu_to_le_64(val), hw->ctrl_bar + off); } -/* - * Atomically reads 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 -nfp_net_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 -nfp_net_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 void nfp_net_rx_queue_release_mbufs(struct nfp_net_rxq *rxq) { @@ -862,7 +811,7 @@ static int nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { struct nfp_net_hw *hw; - struct rte_eth_link link, old; + struct rte_eth_link link; uint32_t nn_link_status; static const uint32_t ls_to_ethtool[] = { @@ -880,9 +829,6 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - memset(&old, 0, sizeof(old)); - nfp_net_dev_atomic_read_link_status(dev, &old); - nn_link_status = nn_cfg_readl(hw, NFP_NET_CFG_STS); memset(&link, 0, sizeof(struct rte_eth_link)); @@ -907,15 +853,13 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) link.link_speed = ls_to_ethtool[nn_link_status]; } - if (old.link_status != link.link_status) { - nfp_net_dev_atomic_write_link_status(dev, &link); - if (link.link_status) - PMD_DRV_LOG(INFO, "NIC Link is Up\n"); - else - PMD_DRV_LOG(INFO, "NIC Link is Down\n"); + if (_rte_eth_link_update(dev, &link) == 0) return 0; - } + if (link.link_status) + PMD_DRV_LOG(INFO, "NIC Link is Up\n"); + else + PMD_DRV_LOG(INFO, "NIC Link is Down\n"); return -1; } @@ -1236,8 +1180,7 @@ nfp_net_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)); - nfp_net_dev_atomic_read_link_status(dev, &link); + _rte_eth_link_read(dev, &link); if (link.link_status) RTE_LOG(INFO, PMD, "Port %d: Link Up - speed %u Mbps - %s\n", (int)(dev->data->port_id), (unsigned)link.link_speed, @@ -1291,8 +1234,7 @@ nfp_net_dev_interrupt_handler(void *param) PMD_DRV_LOG(DEBUG, "We got a LSC interrupt!!!\n"); /* get the link status */ - memset(&link, 0, sizeof(link)); - nfp_net_dev_atomic_read_link_status(dev, &link); + _rte_eth_link_read(dev, &link); nfp_net_link_update(dev, 0);