From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE921A0093 for ; Tue, 19 May 2020 14:58:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BFE7F1D625; Tue, 19 May 2020 14:58:57 +0200 (CEST) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by dpdk.org (Postfix) with ESMTP id 2B0311D623 for ; Tue, 19 May 2020 14:58:57 +0200 (CEST) Received: by mail-wr1-f52.google.com with SMTP id e1so15811957wrt.5 for ; Tue, 19 May 2020 05:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fWcDBVJEibmVUcEd2uyn2E1L0eoMfs7JruAMWUD/uJI=; b=vg4420xyuatXaYmvQbfFB97TAwnB/XoFHPwSxDIBYQO5fOsMSN7vOEBZ1jR5O9ftVg C/Yr5n8sSSuXMQFYPX+guFr6EofaJ6nNonakV+lg8xHoX4IyLiOvRZq9K2DrxzB9/ygn 3lqS5F5L7Gvk8cR0MYKvFIAowGJ2CixbfTWbkrFb+bjOdUozDuPvMpmhHNltRcvYT5m4 5y0t3Qo6NpXYoX40FmOck7G1INcotxFoh0BpsVnV2CAs1DiN0DwtOckr+zmxlVaqwyY6 d0y8/6a02bgnf2IoaEhEA5RBLuMBgSo1UPowdVuGD1z+a4F+RhSaLp9y4Pnwr4EhBZfn Nrlg== 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:mime-version:content-transfer-encoding; bh=fWcDBVJEibmVUcEd2uyn2E1L0eoMfs7JruAMWUD/uJI=; b=DMsOuy0ynRBOWQ7r7Sy0JGwLsbv5teknSQhFk5bmF24SnyHrdh8aemMoUTkEkRaQvw RBdQkhEldOIEjr8M0UrYL9R8ouoCTiBDwA2KqLNEFmgZLJ7SHhyMg8rtfZxxGOOAH0RR fo4LoyYKSvZJakRy2n0mVsKUyeOzc0kUV69jkTFsk3vym92rrB5ndSOYKOLNrXmgD3sJ 405r8GIzJk471YPEmiP7F51tBYwndZE1XWPdA+ELBR36bQT1Hxf75pUezzsDZekYv5/M UgEhh0qH1aQPIC71pISme/n7XHMAGq1t7Qp5eUJAwlxX5hhhBNS7wbvN6oHE0t8Jj/Ac ILwA== X-Gm-Message-State: AOAM533oKA3+tUrh78nhmuh6ctKud7XaekTrvXz3saRSQqMiOSEovaS7 CDpXZw5CXtQBrhA7VJ3c9ehDKNp5IG1k512y X-Google-Smtp-Source: ABdhPJxaoPUS2mcN3WnGeyME2hVQ47MbonzHqF8pAeTO6B4yV285aKQdtKL4UmTxQSGteWR/CzvxMw== X-Received: by 2002:a5d:4b04:: with SMTP id v4mr27002389wrq.182.1589893136831; Tue, 19 May 2020 05:58:56 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 10sm3932771wmw.26.2020.05.19.05.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Ashish Gupta Cc: Jerin Jacob , dpdk stable Date: Tue, 19 May 2020 13:53:28 +0100 Message-Id: <20200519125804.104349-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx2: fix link information for loopback port' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 255066602833e35bc6552011385389d24990a82f Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Thu, 6 Feb 2020 18:00:58 +0530 Subject: [PATCH] net/octeontx2: fix link information for loopback port [ upstream commit 7b1b04079174e8a6843fcb53d1de792bf09fdf03 ] Loopback devices are exposed as ethdev device in octeontx2. This patch fixes the link information for loopback ports. Fixes: 38f566280abb ("net/octeontx2: add link stats operations") Signed-off-by: Ashish Gupta Acked-by: Jerin Jacob --- drivers/net/octeontx2/otx2_link.c | 53 +++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/drivers/net/octeontx2/otx2_link.c b/drivers/net/octeontx2/otx2_link.c index f5679b06e7..4128f56d90 100644 --- a/drivers/net/octeontx2/otx2_link.c +++ b/drivers/net/octeontx2/otx2_link.c @@ -82,31 +82,56 @@ otx2_eth_dev_link_status_update(struct otx2_dev *dev, _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); } -int -otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete) +static int +lbk_link_update(struct rte_eth_link *link) +{ + link->link_status = ETH_LINK_UP; + link->link_speed = ETH_SPEED_NUM_100G; + link->link_autoneg = ETH_LINK_FIXED; + link->link_duplex = ETH_LINK_FULL_DUPLEX; + return 0; +} + +static int +cgx_link_update(struct otx2_eth_dev *dev, struct rte_eth_link *link) { - struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); struct otx2_mbox *mbox = dev->mbox; struct cgx_link_info_msg *rsp; - struct rte_eth_link link; int rc; - - RTE_SET_USED(wait_to_complete); - - if (otx2_dev_is_lbk(dev) || otx2_dev_is_sdp(dev)) - return 0; - otx2_mbox_alloc_msg_cgx_get_linkinfo(mbox); rc = otx2_mbox_process_msg(mbox, (void *)&rsp); if (rc) return rc; - link.link_status = rsp->link_info.link_up; - link.link_speed = rsp->link_info.speed; - link.link_autoneg = ETH_LINK_AUTONEG; + link->link_status = rsp->link_info.link_up; + link->link_speed = rsp->link_info.speed; + link->link_autoneg = ETH_LINK_AUTONEG; if (rsp->link_info.full_duplex) - link.link_duplex = rsp->link_info.full_duplex; + link->link_duplex = rsp->link_info.full_duplex; + return 0; +} + +int +otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete) +{ + struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); + struct rte_eth_link link; + int rc; + + RTE_SET_USED(wait_to_complete); + memset(&link, 0, sizeof(struct rte_eth_link)); + + if (otx2_dev_is_sdp(dev)) + return 0; + + if (otx2_dev_is_lbk(dev)) + rc = lbk_link_update(&link); + else + rc = cgx_link_update(dev, &link); + + if (rc) + return rc; return rte_eth_linkstatus_set(eth_dev, &link); } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.527896801 +0100 +++ 0018-net-octeontx2-fix-link-information-for-loopback-port.patch 2020-05-19 13:56:18.179501099 +0100 @@ -1,13 +1,14 @@ -From 7b1b04079174e8a6843fcb53d1de792bf09fdf03 Mon Sep 17 00:00:00 2001 +From 255066602833e35bc6552011385389d24990a82f Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Thu, 6 Feb 2020 18:00:58 +0530 Subject: [PATCH] net/octeontx2: fix link information for loopback port +[ upstream commit 7b1b04079174e8a6843fcb53d1de792bf09fdf03 ] + Loopback devices are exposed as ethdev device in octeontx2. This patch fixes the link information for loopback ports. Fixes: 38f566280abb ("net/octeontx2: add link stats operations") -Cc: stable@dpdk.org Signed-off-by: Ashish Gupta Acked-by: Jerin Jacob