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 6926345CE3 for ; Mon, 11 Nov 2024 07:35:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6107640E2D; Mon, 11 Nov 2024 07:35:51 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2078.outbound.protection.outlook.com [40.107.94.78]) by mails.dpdk.org (Postfix) with ESMTP id 472D240E2D for ; Mon, 11 Nov 2024 07:35:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FtoiDseW3XitrUf2Oy1hLlcuz1qCdAMU98c57Px6q85HjPJJiI4Py3YUeLUdrP1U0FmSQqNpA2AfQvlwd0wAZW3HCyh7pluOn+Gd70wrteZLSCb95N9f9cSxyJeQb8XCpPRjowT0Mf5tIhoUBdM6GzedCoXcN3Kp+paglviHTJdsbew4ha2caoSsuKQ6uN6u3E9BF5qMCFMK7qHoW/0+6hH2yCnBjmlCQS+UHjmtyA4ReBKXtSCz14uirUkzHC7KN9bIOKFo1Rz1sXkG77ryjT66exJ35y6OdxadZHE4/oX0mdrpEFUi8bK4H2LIKoMyCOTiFj61IlvbFVJ5VJqUtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=o/GERHcrbscF+YFh3GR0R/y4Pqcpg4O1GZDFQ1/I8/M=; b=nx+0r8rsz19XIufFu2LSuB5upgTX7THrvNZ0kqT7TLKEQuPax6+MVqDSnFKreNmk+lVIjhwEUuZ4PcweEVAt3MSruiVBzpXud08q2lbUPu6TBJjXhGDcQqOiTu3M7L8UABBwE3/e2Z4b45+ri8nZj5ZTgd23dBOHRALa8dmu65f60PMvEoFE1atGYjB/L4tQux/iuY/Ft4jw5/azF0eoHP7qUJNF+kuv33rjAsUDIuyHr0kr6b+zf7YjrbxcLLmTU8JBxT2QtMt6HEEVgGuIvU+KUb5/Bpw2kW8RsstAqrJwC+bTeIdRJSAkfOO/6Leb8QSdJaXCL0DqXpa3AGAEqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=o/GERHcrbscF+YFh3GR0R/y4Pqcpg4O1GZDFQ1/I8/M=; b=ZE6bgg0u4RdCREhX92/qWflmWF5LMUfuhkoBGlv1MmFBWgWzShPU/HO6jFMK3ynKwW/oMQlUKUbtDVB42vl457cUcGhNUhmYiwPK5Tq9B5GME8F0SSVt6LkGlYBzCdQK865NnAZpUwUtVVoV/N638HC7wcfKyXNmu+w90Ffbv+i0ulpUGU58g+d30PIYaOqld+EhFH4Asm84W+tGwcTdPD1nZztEMlLJcN/kRdxlyepohCVw8zQvT7HFkErv7d+b2M5UvZhoOk69e6EOouX94LFjzMtGygUVZk1VAAgc8cX0c0QyX4SwQQ2vg1phDoyoW6CdEr6wAfL7Ha4LsyfIcQ== Received: from BN8PR15CA0041.namprd15.prod.outlook.com (2603:10b6:408:80::18) by CYXPR12MB9387.namprd12.prod.outlook.com (2603:10b6:930:e6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27; Mon, 11 Nov 2024 06:35:43 +0000 Received: from BL02EPF00021F68.namprd02.prod.outlook.com (2603:10b6:408:80:cafe::ce) by BN8PR15CA0041.outlook.office365.com (2603:10b6:408:80::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27 via Frontend Transport; Mon, 11 Nov 2024 06:35:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL02EPF00021F68.mail.protection.outlook.com (10.167.249.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:35:43 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:35:26 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:35:23 -0800 From: Xueming Li To: Eryk Rybak CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/i40e/base: fix blinking X722 with X557 PHY' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:27:49 +0800 Message-ID: <20241111062847.216344-64-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00021F68:EE_|CYXPR12MB9387:EE_ X-MS-Office365-Filtering-Correlation-Id: 7dc9c028-ee55-4139-322e-08dd021b1158 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?naZOYUH4yg+jnBskP1+lT1x5CHeLaF97C979EvFcA5lsWn6a/4wbEYn15kVq?= =?us-ascii?Q?r5pGIK1U2BjN8Pxw8nQcg4OgH7KS0AKn3R14ujpLAHgKxrfDzFd2ybixITEY?= =?us-ascii?Q?1OMFsxmEwLqb5a7WFwUoa0b37bJVfkXL/VuKx2Nes2LHD15qiEkFvSYG2dST?= =?us-ascii?Q?upVBQVuqOD+iv51sGpdyZbZG0Fq0R85/wgjPmaWH7yb50O+sYdUkEx7qDAFY?= =?us-ascii?Q?qw9u6ePLtDSj+/UOgLZdn/7msZG/PjIeKD/FG8ZG5LHvO19QaLcDtjFVsDIT?= =?us-ascii?Q?k7RXRAdT1GorR5lGdAWyZXQJZ7sxYkTiuPO8E19D2ChooOnDwBv8o+EsWVT2?= =?us-ascii?Q?DVj+439gmQdYhciLbBOFdjO/f3aJJlZhYY9fXMU3zRktvcmzncdXtpqTOFab?= =?us-ascii?Q?uGsQuSPol6fE83V2BHYeR3hASRCK6wxde1U7DLCC2Mx5BH0yk1WqvAZ13zIS?= =?us-ascii?Q?h64fwLSBna7T7Czl/2npn0B4NYoSWjvGWEfseRa/fzG6XF9VN2kwDG2oDQvY?= =?us-ascii?Q?G9UDKgxFiZv2rSFfP2OOs40FIz6ihreQDkrnwd7ph8aY5y9bxAQHd4apfd6T?= =?us-ascii?Q?zmPq/cug4BNEbJxnd/95/OiOsnpe6WcquR0sna2ujpMDlii3QvMNGO8bDU3t?= =?us-ascii?Q?OYB9unXQxwPsnle7UN3z2S+k3cxIpIBeKdMl01MTGjYaMEieYGvFbzIv57I2?= =?us-ascii?Q?pcagT/QoQwXvnNU1pF6Udmzs87fvZ+CkFgJS52N004m0vDtTYQNsz/0O9WAW?= =?us-ascii?Q?43i/0vUsgIcYDCdh8+SL6I1VSWtz7FHVUrjspo7Qvw0lKbhSyLqKcKBr9EQM?= =?us-ascii?Q?IbzafSPYhId/5EvtCUGXrm+dLAf1wThdMxa924DCFzSF9hKXCYFnyS9KWQpb?= =?us-ascii?Q?X4ZGQbxal8funYFRkci15r/s2PocJ+BbWAym2zxuXzerisybuyNaofFEw7Z0?= =?us-ascii?Q?6T0ACf87fCT5l832uY2+r63U+rxbdSAAjwyriRfJPi2Bgbp/WHXSAaEv4Wu/?= =?us-ascii?Q?UugOmxl09WceIo5FH7mv4L2IwOd2KB57NEhLbUc4unKO5FLsrKZUvehsn4rX?= =?us-ascii?Q?GwQMzFMFxGDtxqcOlydzAowFOz8GMd+2+c9leuOmIeGIZtu+3p7iRCV1PUeR?= =?us-ascii?Q?cammDBquaBfcAP1Zp7CevBJsiAR17OZ73r3eYk2WL+JuC6Gi/CysHVUxv7xl?= =?us-ascii?Q?wST1h2FAMU5fxN50rXqxPRdc1+GZ5p8ThxrkyzEcZ42UKNFrFK3qM3tAijzj?= =?us-ascii?Q?IH0rXsIbkC/Z9Qb+NEQ/ORkRfR7hy186/vvTt6SOdQcflKgcz296n12NcmNK?= =?us-ascii?Q?KN4gwYsvxrTyHB1ybGi36el224aGyFYTO4AXugSoBlG7FmP1VSoLvN6g9nf7?= =?us-ascii?Q?H+L7HLuceefsLYmOf3/QOQbg8qAQmBsYsOeU6CByZf/FhTZahQ=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:35:43.2656 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7dc9c028-ee55-4139-322e-08dd021b1158 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00021F68.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9387 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 23.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 11/30/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=cd6164532228038bc6c4d96e51e83f241a53b7da Thanks. Xueming Li --- >From cd6164532228038bc6c4d96e51e83f241a53b7da Mon Sep 17 00:00:00 2001 From: Eryk Rybak Date: Mon, 2 Sep 2024 10:54:23 +0100 Subject: [PATCH] net/i40e/base: fix blinking X722 with X557 PHY Cc: Xueming Li [ upstream commit bf0183e9ab98c946e0c7e178149e4b685465b9b1 ] On x722 with x557 PHY LEDs do not blink under certain circumstances, because the function was attempting to avoid triggering LED activity when it detected that LED was already active. Fix it to just always trigger LED blinking regardless of the LED state. Fixes: 8db9e2a1b232 ("i40e: base driver") Signed-off-by: Eryk Rybak Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/i40e/base/i40e_common.c | 32 ----------------------------- 1 file changed, 32 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 821fb2fb36..243c547d19 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1587,7 +1587,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) **/ u32 i40e_led_get(struct i40e_hw *hw) { - u32 current_mode = 0; u32 mode = 0; int i; @@ -1600,21 +1599,6 @@ u32 i40e_led_get(struct i40e_hw *hw) if (!gpio_val) continue; - /* ignore gpio LED src mode entries related to the activity - * LEDs - */ - current_mode = ((gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK) - >> I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT); - switch (current_mode) { - case I40E_COMBINED_ACTIVITY: - case I40E_FILTER_ACTIVITY: - case I40E_MAC_ACTIVITY: - case I40E_LINK_ACTIVITY: - continue; - default: - break; - } - mode = (gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK) >> I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT; break; @@ -1634,7 +1618,6 @@ u32 i40e_led_get(struct i40e_hw *hw) **/ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) { - u32 current_mode = 0; int i; if (mode & ~I40E_LED_MODE_VALID) { @@ -1651,21 +1634,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) if (!gpio_val) continue; - /* ignore gpio LED src mode entries related to the activity - * LEDs - */ - current_mode = ((gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK) - >> I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT); - switch (current_mode) { - case I40E_COMBINED_ACTIVITY: - case I40E_FILTER_ACTIVITY: - case I40E_MAC_ACTIVITY: - case I40E_LINK_ACTIVITY: - continue; - default: - break; - } - if (I40E_IS_X710TL_DEVICE(hw->device_id)) { u32 pin_func = 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:08.214233477 +0800 +++ 0063-net-i40e-base-fix-blinking-X722-with-X557-PHY.patch 2024-11-11 14:23:05.152192839 +0800 @@ -1 +1 @@ -From bf0183e9ab98c946e0c7e178149e4b685465b9b1 Mon Sep 17 00:00:00 2001 +From cd6164532228038bc6c4d96e51e83f241a53b7da Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bf0183e9ab98c946e0c7e178149e4b685465b9b1 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index be27cc9d0b..80500697ed 100644 +index 821fb2fb36..243c547d19 100644 @@ -25 +27 @@ -@@ -1548,7 +1548,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) +@@ -1587,7 +1587,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) @@ -33 +35 @@ -@@ -1561,21 +1560,6 @@ u32 i40e_led_get(struct i40e_hw *hw) +@@ -1600,21 +1599,6 @@ u32 i40e_led_get(struct i40e_hw *hw) @@ -55 +57 @@ -@@ -1595,7 +1579,6 @@ u32 i40e_led_get(struct i40e_hw *hw) +@@ -1634,7 +1618,6 @@ u32 i40e_led_get(struct i40e_hw *hw) @@ -63 +65 @@ -@@ -1612,21 +1595,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) +@@ -1651,21 +1634,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)