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 E455245BB6 for ; Wed, 23 Oct 2024 23:19:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE64640261; Wed, 23 Oct 2024 23:19:29 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 668A9432E2 for ; Wed, 23 Oct 2024 23:19:28 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-37d41894a32so160232f8f.1 for ; Wed, 23 Oct 2024 14:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718368; x=1730323168; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xIfjWHzQ1lW5IAnqwpPGDkSrs7o4PChqrrnK27mtTss=; b=MRWj3AB999a96UN1WMSlpEPKbucTZbPc4pD/UByVCu8H2X55wUySSQJHamJe8lifBF 0c6snbDE4zFxwQS7rVf6FZ0Jh84I9XbGccHRCikojowu0IYZFVAIm8rvNzkOAYuWPUSb cgt6NCj7m/YA19fXk656su4CsvdNlhxLVY3rxjTGyd6ff3kQJyVYtHsPZtTXDjnYhIZ1 QmUIRLqbpTUK3TIYwqOqjZNVTdwV3X7AKaNR67VCn2vDP9KWuyWt4UyHq6dUfbmjB8/a WC6Bs1BFNYXxGgpEUK8ZOrbBqdQn/p+n7AKHSDhXOqa3TsyGQ89gThNOB9na8w6MzdDs lVlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718368; x=1730323168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xIfjWHzQ1lW5IAnqwpPGDkSrs7o4PChqrrnK27mtTss=; b=vIRArMR7qxIv8q9H811V4T89xERJci39PYbzXoxLpg5cW0yyLPA7kRmcgyXFFmmIP9 g/ud/wrrjL5ky6YjXYH0O8myTClrDgI0BX2lm2iAIq7sz9/ZDyZ5mac4stMVfrrSqRwz fBiyILshBJQVfg8u8EqWGg+Fzwoi/Gxd/QeOuokYUGuGFsMplB1Bceeggn1GJ9DHadjJ eAKJpsLpS+tCT0yyYomBu1iuM/2sc7AAfY4GoKDvgRKnE9EQJlp5eE9WRPt+kv8wYKQr 4M4pYZWQ33WKdM+3hIlKGRaLlysxkmpKU3TVIJk67DRQua6CZmN43REFBviIhyYrrk0l xzFw== X-Forwarded-Encrypted: i=1; AJvYcCWKtObBVw+zHFCvyaL8iPrkEM6f3mT0Q/IV6JMCeS0M1XM5rFxVzoMSNeKJVblsBhH72LHpEF0=@dpdk.org X-Gm-Message-State: AOJu0YyDh2AZPyhJRTAl9+Gqa+jkBk9mAX6DIxkhxOZixusQWSLJZlgo lDA18kuG6qjgUSnx1rlWkJmW2O7VH62tYgkdpr5AaRO2TDu+ay6hya9Zpw== X-Google-Smtp-Source: AGHT+IHu1L15/5xoRjEbChYquUCmpD2zHuySkD01J+o4rZlViZXnwZ61N/3VQeKPEIYnJktMHsuSSw== X-Received: by 2002:adf:ea12:0:b0:371:6fc7:d45d with SMTP id ffacd0b85a97d-37efc5d55cemr2291118f8f.2.1729718367875; Wed, 23 Oct 2024 14:19:27 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a48882sm9731223f8f.30.2024.10.23.14.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:19:27 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.7 Date: Wed, 23 Oct 2024 22:16:20 +0100 Message-ID: <20241023211704.1216956-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a6d819d27a79d79e6d4dd5c129ec477a613e670a Thanks. Luca Boccassi --- >From a6d819d27a79d79e6d4dd5c129ec477a613e670a 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 @@ -1585,7 +1585,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; @@ -1598,21 +1597,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; @@ -1632,7 +1616,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) { @@ -1649,21 +1632,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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.040111495 +0100 +++ 0040-net-i40e-base-fix-blinking-X722-with-X557-PHY.patch 2024-10-23 22:16:40.483942118 +0100 @@ -1 +1 @@ -From bf0183e9ab98c946e0c7e178149e4b685465b9b1 Mon Sep 17 00:00:00 2001 +From a6d819d27a79d79e6d4dd5c129ec477a613e670a 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 @@ -@@ -1548,7 +1548,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) +@@ -1585,7 +1585,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) @@ -33 +34 @@ -@@ -1561,21 +1560,6 @@ u32 i40e_led_get(struct i40e_hw *hw) +@@ -1598,21 +1597,6 @@ u32 i40e_led_get(struct i40e_hw *hw) @@ -55 +56 @@ -@@ -1595,7 +1579,6 @@ u32 i40e_led_get(struct i40e_hw *hw) +@@ -1632,7 +1616,6 @@ u32 i40e_led_get(struct i40e_hw *hw) @@ -63 +64 @@ -@@ -1612,21 +1595,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) +@@ -1649,21 +1632,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)