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 BF6A6A034F for ; Wed, 10 Nov 2021 07:48:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B6EED40142; Wed, 10 Nov 2021 07:48:22 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2058.outbound.protection.outlook.com [40.107.212.58]) by mails.dpdk.org (Postfix) with ESMTP id ECE6E40142 for ; Wed, 10 Nov 2021 07:48:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cxBnC25cEk0N0zD/AKEyGGFO+8TEP58IcoqtcmPGrtxrBP1JscWeYTFdSyrUmWylcSkuzb/amFIlye/0cAVFLPMPMMAuMDdkgYn1hAJbO7FrNDQXqD0JtY0BotdhMmHAldyjYsV+DqMHaE6sQaiyfMhjicm4XPdOPt/4DNAKRUGQjoh5+DsbSG4+DJCFwdr55Ug/iB/inxtKB8nUOMWRr6je/sEH3bYvz8nhY7InWeR3mAGT2gyjYvttNarh1hqhK4Q+bH3MbmQlbK+Yb5owUgE7t2l1BTEGS9LXK/ldQ6OVEsH+l3v2SP2DKql/iWiqvelCmsWt2/Re9tgM1eSQMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bwSR6CU/KJ6bQgsy4r9EJeJjt0y4PQ7P/q8xxr4X3bc=; b=J84OtQPb0i2r+gCa3R5XTEwWUia7hbpz2jarn3racOxixk6CUtRMr4wo2+JhJYNOhP0XJzz1yqMvPusGwtRKJXE2KoOjB8h+VaypmNgwDKckY7P/RCEhXUDmwUcnTgifp0Bn4dsIhaTXFHw2AjeC9npL11OAD2ZgRWWAp/jOtIqKMWWRmI2xkZNPY1yWWHRHvSj2vI1SCtyUFMi0bOc9a1Y8x30seSlIxT1LoL+z1wymfYc9ulgkulNvQCKlvrPi235VJDSOMg8Wbky2rz9dPsHnkKd99VNzBAQDiI1MuX37rwC7nOfrIy+xI7SmFIiiGQyGvQl58TVL7/PnWzpovw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bwSR6CU/KJ6bQgsy4r9EJeJjt0y4PQ7P/q8xxr4X3bc=; b=j3spwtQTvQCVA3K3m+vp6mP0epBqGsyRSHFYDh3OTg5U+TXAcA+1xwfpMVUX/UDj2jY27W58jPT63X+7QNBLVZGuV7a378DemcspiXQZC8liE4DB8eeJpguCRtv0Cjv+PHkyGqmTEPYMMLJ8v97KPVp66JJnRC7QGJib6ccaEAw0riMIPiG/vidDPrMn9GKUGq7tLCCYUNIeSpxdWQ4t1mCvU8r3SEVIp3lSbamHIereDQLg92NI7mpp4dCWCdGEId4KkNH7e6qxvfp3wSMmHKWjNJVfV0RIJ9VCHYlo0KmdTWfhKHON0cibJ90c8zZYkP41Z6pdCm4Lrbp1JZPGMw== Received: from BN0PR03CA0036.namprd03.prod.outlook.com (2603:10b6:408:e7::11) by BN6PR1201MB2515.namprd12.prod.outlook.com (2603:10b6:404:a7::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Wed, 10 Nov 2021 06:48:19 +0000 Received: from BN8NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e7:cafe::83) by BN0PR03CA0036.outlook.office365.com (2603:10b6:408:e7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:48:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT059.mail.protection.outlook.com (10.13.177.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:48:18 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:48:16 +0000 From: Xueming Li To: Robin Zhang CC: Luca Boccassi , Jaroslaw Gawin , Beilei Xing , dpdk stable Date: Wed, 10 Nov 2021 14:30:28 +0800 Message-ID: <20211110063216.2744012-145-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa7ea77d-b5fc-450d-5866-08d9a4161483 X-MS-TrafficTypeDiagnostic: BN6PR1201MB2515: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LfweEJWMOWGZq+rz9LnZi4ukpUJMzZCI0rE6ChxJo4OAxR0B3/MCQetppZAI1b4XkNJsPO5+m6GlwWA06mfGGuzCHAzNZR47ppBxVv6Zl/L7uKEaBmVrTe9edOEoIoA4m52Kt2UvQ8YU1HxOjB1ujZHuRCsam6YBDF4sSZCTve2gkD7td5Vgje+rXKQocVN5NxIVmjdxX5vC9hHaTQ4W5hL+JlYUL1QJqzy1NNsh9e49eswy4xzVAQ2hj28jO8k5pQx9SBobvWMs44Dx8uBXcTNsLsYynpDAB1Yv83YFhEpNpX2q9ZFvf6EZgv+7e6xWbDXP/2BrviyYsGpjVDsETYm6TiOT8bhDOtwgYy8OMerxmFN9eVU320NQL6iqoSPbx4IPagCJrXw/cjO527uWNcttc6YTpkJFAhoz0WObdaE5DD0RkJkxvQVsH0/1S42p8qpjEm6zx8knJvag1yn1DfF5skrkcWeJLcOtQlULsJt/FFyY01zTC5V5LvFdSAypdXxa2WC7GbaQUlSJfjmsn9oDj8Yl3otVQOM3KZJgkBttDgJMzq0u/1dird9fiTltabdFqvDWDH/C1K++M0IfTr8KYN01BYYMyb2izjWnzvKppuWgUi1jfFOwnjzuQg+S5iorDCVfn3NsZdMyL3nyIHoQltDpk94OsZbEH0KoPfMLD+2JvG0XJxndeiqd+eyqsXaY0SOUYlDcE98FWwNFQzaFBmGS1TClvlqvb9Tc46GKjTjmeZBfYsyjWpapLleh1nbwNyeoacvfoB4m32cGIl+c4n0N/qXSt89WveHxfvQcKK1iIb9S8whEoor8Mxxy1pV9OBEUJkDWk2fWvbBY6Q== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(2616005)(966005)(4001150100001)(86362001)(1076003)(6666004)(186003)(8676002)(8936002)(356005)(4326008)(55016002)(36860700001)(5660300002)(2906002)(70586007)(70206006)(26005)(53546011)(47076005)(83380400001)(16526019)(36756003)(316002)(336012)(6286002)(15650500001)(508600001)(7636003)(426003)(7696005)(82310400003)(36906005)(54906003)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:48:18.8274 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa7ea77d-b5fc-450d-5866-08d9a4161483 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB2515 Subject: [dpdk-stable] patch 'net/i40e/base: fix update link data for X722' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/7d5375f7d7f8e71ca1e95bdd8ea4a0292f835280 Thanks. Xueming Li --- >From 7d5375f7d7f8e71ca1e95bdd8ea4a0292f835280 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 Cc: Xueming Li [ 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 69ff2dce9e..9ae632c1b6 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -2078,6 +2078,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; @@ -2948,10 +2951,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.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.341668100 +0800 +++ 0144-net-i40e-base-fix-update-link-data-for-X722.patch 2021-11-10 14:17:01.924078988 +0800 @@ -1 +1 @@ -From 74bd4072996e64b0051d24d8d641554d225db196 Mon Sep 17 00:00:00 2001 +From 7d5375f7d7f8e71ca1e95bdd8ea4a0292f835280 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 74bd4072996e64b0051d24d8d641554d225db196 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index aa424e6010..ef061a6b63 100644 +index 69ff2dce9e..9ae632c1b6 100644