patch 'net/ngbe: fix WOL and NCSI capabilities' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/12/25. 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/9d33d68367cb55a489802f2c5ae413637894e6b9

Thanks.

Kevin

---
>From 9d33d68367cb55a489802f2c5ae413637894e6b9 Mon Sep 17 00:00:00 2001
From: Zaiyu Wang <zaiyuwang at trustnetic.com>
Date: Mon, 24 Feb 2025 17:59:07 +0800
Subject: [PATCH] net/ngbe: fix WOL and NCSI capabilities

[ upstream commit 7e77960c402cda75534b4bfb32e1056e1b3fa5c8 ]

When determining NIC's WOL and NCSI capability via sub-system ID,
flag matching must be exact, not inclusive. Misidentifying WOL/NCSI
capability will skip PHY configuration, causing link-up failure.

Fixes: 5f1ab0d529fc ("net/ngbe: add WOL and NCSI capability")

Signed-off-by: Zaiyu Wang <zaiyuwang at trustnetic.com>
---
 drivers/net/ngbe/base/ngbe_hw.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c
index 29944f5070..1caeececf0 100644
--- a/drivers/net/ngbe/base/ngbe_hw.c
+++ b/drivers/net/ngbe/base/ngbe_hw.c
@@ -1922,4 +1922,6 @@ void ngbe_map_device_id(struct ngbe_hw *hw)
 {
 	u16 oem = hw->sub_system_id & NGBE_OEM_MASK;
+	u16 ncsi = hw->sub_system_id & NGBE_NCSI_SUP_MASK;
+	u16 wol = hw->sub_system_id & NGBE_WOL_SUP_MASK;
 
 	hw->is_pf = true;
@@ -1982,7 +1984,7 @@ void ngbe_map_device_id(struct ngbe_hw *hw)
 		hw->gpio_ctl = true;
 
-	hw->wol_enabled = (hw->sub_system_id & NGBE_WOL_SUP_MASK) ? true : false;
-	hw->ncsi_enabled = (hw->sub_system_id & NGBE_NCSI_SUP_MASK ||
-			    hw->sub_system_id & NGBE_OCP_CARD) ? true : false;
+	hw->wol_enabled = (wol == NGBE_WOL_SUP_MASK) ? true : false;
+	hw->ncsi_enabled = (ncsi == NGBE_NCSI_SUP_MASK ||
+			   oem == NGBE_OCP_CARD) ? true : false;
 }
 
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-07 11:02:57.353435696 +0000
+++ 0012-net-ngbe-fix-WOL-and-NCSI-capabilities.patch	2025-03-07 11:02:56.849335609 +0000
@@ -1 +1 @@
-From 7e77960c402cda75534b4bfb32e1056e1b3fa5c8 Mon Sep 17 00:00:00 2001
+From 9d33d68367cb55a489802f2c5ae413637894e6b9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7e77960c402cda75534b4bfb32e1056e1b3fa5c8 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index e29a1946e5..6688ae6a31 100644
+index 29944f5070..1caeececf0 100644
@@ -22 +23 @@
-@@ -1923,4 +1923,6 @@ void ngbe_map_device_id(struct ngbe_hw *hw)
+@@ -1922,4 +1922,6 @@ void ngbe_map_device_id(struct ngbe_hw *hw)
@@ -29 +30 @@
-@@ -1983,7 +1985,7 @@ void ngbe_map_device_id(struct ngbe_hw *hw)
+@@ -1982,7 +1984,7 @@ void ngbe_map_device_id(struct ngbe_hw *hw)