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 B39EE45DB9 for ; Wed, 27 Nov 2024 18:20:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ADE12402DE; Wed, 27 Nov 2024 18:20:48 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 945DE402DE for ; Wed, 27 Nov 2024 18:20:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D0pNXY+E2i+eEZLas1+xdAlvkCqdaL8ga3Wdh+6RFZg=; b=E3ULWzKZ8YMEhefl35+pT74LdMdRImkagVBGfCjwxw2Bl258fCdvgFzQOoOpN5FGXR+qVN JzIxj84S/dLHNeiSj0mUA4LAEPeVt8zrR6SKczH7LBMfbsnI2vvpPWF9wme4PurEVM6STf NLok//mThWHhXBNpy/woitRLuB47hQc= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-134-xrIqFbNGOfmr5YRtILyqfw-1; Wed, 27 Nov 2024 12:20:44 -0500 X-MC-Unique: xrIqFbNGOfmr5YRtILyqfw-1 X-Mimecast-MFC-AGG-ID: xrIqFbNGOfmr5YRtILyqfw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AA9B519540EF; Wed, 27 Nov 2024 17:20:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 071FB300019E; Wed, 27 Nov 2024 17:20:41 +0000 (UTC) From: Kevin Traynor 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 21.11.9 Date: Wed, 27 Nov 2024 17:17:41 +0000 Message-ID: <20241127171916.690404-34-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: G2tSuEg4Q43m-YjgLnxZrioaeN6AnaFATUwl5mSjxk4_1732728043 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2e22461f86d824443724cb8cfcbbae2f5f6e7c71 Thanks. Kevin --- >From 2e22461f86d824443724cb8cfcbbae2f5f6e7c71 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 [ 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 4d8167692d..d444c4a78e 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1586,5 +1586,4 @@ 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; @@ -1599,19 +1598,4 @@ u32 i40e_led_get(struct i40e_hw *hw) 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; @@ -1633,5 +1617,4 @@ 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; @@ -1650,19 +1633,4 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) 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.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.363363194 +0000 +++ 0034-net-i40e-base-fix-blinking-X722-with-X557-PHY.patch 2024-11-27 17:17:38.197269228 +0000 @@ -1 +1 @@ -From bf0183e9ab98c946e0c7e178149e4b685465b9b1 Mon Sep 17 00:00:00 2001 +From 2e22461f86d824443724cb8cfcbbae2f5f6e7c71 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bf0183e9ab98c946e0c7e178149e4b685465b9b1 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index be27cc9d0b..80500697ed 100644 +index 4d8167692d..d444c4a78e 100644 @@ -25 +26 @@ -@@ -1549,5 +1549,4 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) +@@ -1586,5 +1586,4 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) @@ -31 +32 @@ -@@ -1562,19 +1561,4 @@ u32 i40e_led_get(struct i40e_hw *hw) +@@ -1599,19 +1598,4 @@ u32 i40e_led_get(struct i40e_hw *hw) @@ -51 +52 @@ -@@ -1596,5 +1580,4 @@ u32 i40e_led_get(struct i40e_hw *hw) +@@ -1633,5 +1617,4 @@ u32 i40e_led_get(struct i40e_hw *hw) @@ -57 +58 @@ -@@ -1613,19 +1596,4 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) +@@ -1650,19 +1633,4 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)