From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7DB01A0C41 for ; Tue, 30 Nov 2021 17:40:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77CFB411A7; Tue, 30 Nov 2021 17:40:11 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 9BE10410F7 for ; Tue, 30 Nov 2021 17:40:10 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 80CF840009 for ; Tue, 30 Nov 2021 16:40:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290410; bh=gkgWW9EYp+tNVYFcz8jifnXqiWJ586oaTeX9HxUABL0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Xtj6td4XDtCgUm/qXfd7a2a4vz/6hzGtMofx5acavt+agrOtCAem0m1t0r8RqFW3r K5SSYK92Vy3YTIYX3CSORGn4qm1Cx5MyUz9gE3CC3Pr4OWY9wQtU0OUsFBp1Cu0XY5 aMgeAJXI2mMgGs1zw8ZQP8KhuuX9jkzGjPZR8hEa+VIVegQmACzvy08kzvrm+7+eJW wNpwGpxQ9SMxrk6ilCsdvGyTtVhsb7uci94hbH7rP7HWUtvs0c/N9wOE5ZHwHGsk/q ESzc7IOJX8bhmJUv/xycN5MY/jJgWgYPr1QycVHn5JBcDMl2D0foba/Z1BhD1438Cz p0EGPxRqejxzQ== Received: by mail-ed1-f69.google.com with SMTP id 30-20020a508e5e000000b003f02e458b17so10721923edx.17 for ; Tue, 30 Nov 2021 08:40:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gkgWW9EYp+tNVYFcz8jifnXqiWJ586oaTeX9HxUABL0=; b=kfVdwP/HT/Ee2ur/U/JFi6UtayRfl8hZd8mOvm/UtlMeAg7QKJ9S9AywTO7AWojJ93 PsbPdQgvL4gJ27TjHv4Fbrh/t5I/pYxX8LJ+Rf1stS92zkc6WBW0czWTxPW3IZWlk6ZW yrYsdVPdSaQnelSWkMBQYiPko0+qcGiPfnYS+ek7lNYyMpl26ifBi9Hu1HlB0u/5vcVm YzeO3ITtmumNUuflI8XmXcNQIdUxkJMbx6z+ou/0nnEBEa26aj4to73DNu11xPG8edUx BenDZv/2vA6GNrf9xmS8tpro/B3HewC852H8NbJzW2FsMPrbl9R8eCdN4/nOMQeIHVHU yk/g== X-Gm-Message-State: AOAM531lY2agw6MtDDJhXZqQE/Xvcb+mQhVl2HNXHfsS7QY1Xj11umBj F8uolUWv2Obf1y/RUNvMdC/Ee6FzHzYtDUIcf03mOKhBF/G2KELfS2gP9YdYj0CGA6/N6jQTIff cajA/wJF/3sQJj+j/3InXNerI X-Received: by 2002:a50:d492:: with SMTP id s18mr50161edi.145.1638290410220; Tue, 30 Nov 2021 08:40:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJyw5kgYHdCK0Pf9E9gAcJxZupg5wSzCPGR4HJkfcTJMpq9x3xw8ogyL6oebpVo4iTKFi5NnMg== X-Received: by 2002:a50:d492:: with SMTP id s18mr50140edi.145.1638290410069; Tue, 30 Nov 2021 08:40:10 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id z1sm11626017edq.54.2021.11.30.08.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:40:09 -0800 (PST) From: christian.ehrhardt@canonical.com To: Robin Zhang Cc: Jaroslaw Gawin , Beilei Xing , dpdk stable Subject: patch 'net/i40e/base: fix update link data for X722' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:43 +0100 Message-Id: <20211130163605.2460997-79-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/813fffccb31240fe336223a733e03bf5462023ae Thanks. Christian Ehrhardt --- >From 813fffccb31240fe336223a733e03bf5462023ae Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Sat, 9 Oct 2021 01:39:46 +0000 Subject: [PATCH] net/i40e/base: fix update link data for X722 [ upstream commit 74bd4072996e64b0051d24d8d641554d225db196 ] The X722 card has 'Link Type' information elsewhere than the X710. Previously, for all cards, the 'Link Type' information was retrieved by opcode 0x0607 and this value was wrong for all X722 cards. Now this information for X722 only is taken by opcode 0x0600 (function: i40e_aq_get_phy_capabilities) instead of an opcode 0x0607 (function: i40e_aq_get_link_info). All other parameters read by opcode 0x0607 unchanged. Fixes: e6691b428eb1 ("i40e/base: fix PHY NVM interaction") Fixes: 75c3de654ead ("net/i40e/base: fix long link down notification time") Signed-off-by: Jaroslaw Gawin Signed-off-by: Robin Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_common.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index fef3b08e89..5c75872661 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -2030,6 +2030,9 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw, hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE) hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU; + /* 'Get Link Status' response data structure from X722 FW has + * different format and does not contain this information + */ if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE && hw->mac.type != I40E_MAC_X722) { __le32 tmp; @@ -2900,10 +2903,13 @@ enum i40e_status_code i40e_update_link_info(struct i40e_hw *hw) return status; /* extra checking needed to ensure link info to user is timely */ - if ((hw->phy.link_info.link_info & I40E_AQ_MEDIA_AVAILABLE) && - ((hw->phy.link_info.link_info & I40E_AQ_LINK_UP) || - !(hw->phy.link_info_old.link_info & I40E_AQ_LINK_UP))) { - status = i40e_aq_get_phy_capabilities(hw, false, false, + if (((hw->phy.link_info.link_info & I40E_AQ_MEDIA_AVAILABLE) && + ((hw->phy.link_info.link_info & I40E_AQ_LINK_UP) || + !(hw->phy.link_info_old.link_info & I40E_AQ_LINK_UP))) || + hw->mac.type == I40E_MAC_X722) { + status = i40e_aq_get_phy_capabilities(hw, false, + hw->mac.type == + I40E_MAC_X722, &abilities, NULL); if (status) return status; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:10.524186504 +0100 +++ 0079-net-i40e-base-fix-update-link-data-for-X722.patch 2021-11-30 16:50:05.826873794 +0100 @@ -1 +1 @@ -From 74bd4072996e64b0051d24d8d641554d225db196 Mon Sep 17 00:00:00 2001 +From 813fffccb31240fe336223a733e03bf5462023ae Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 74bd4072996e64b0051d24d8d641554d225db196 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index aa424e6010..ef061a6b63 100644 +index fef3b08e89..5c75872661 100644 @@ -29 +30 @@ -@@ -2078,6 +2078,9 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw, +@@ -2030,6 +2030,9 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw, @@ -39 +40 @@ -@@ -2948,10 +2951,13 @@ enum i40e_status_code i40e_update_link_info(struct i40e_hw *hw) +@@ -2900,10 +2903,13 @@ enum i40e_status_code i40e_update_link_info(struct i40e_hw *hw)