netdev - [PATCH iwl-next v1 6/7] ixgbe: replace EEE enable flag with state enum

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20260112140108.1173835-7-jedrzej.jagielski@intel.com>
Date: Mon, 12 Jan 2026 15:01:07 +0100
From: Jedrzej Jagielski <jedrzej.jagielski@...el.com>
To: intel-wired-lan@...ts.osuosl.org
Cc: anthony.l.nguyen@...el.com,
	netdev@...r.kernel.org,
	Jedrzej Jagielski <jedrzej.jagielski@...el.com>,
	Aleksandr Loktionov <aleksandr.loktionov@...el.com>
Subject: [PATCH iwl-next v1 6/7] ixgbe: replace EEE enable flag with state enum

Change approach from using EEE enabled flag to using newly introduced
enum dedicated to reflect state of the EEE feature.

New enum is required to extend on/off state with new forced off state,
which is set when EEE must be temporarily disabled due to unsupported
conditions, but should be enabled back when possible.

Such scenario happens eg when link comes up with newly negotiated
speed which is not one of the EEE supported link speeds.

Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@...el.com>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@...el.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe.h         | 11 ++++++++++-
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c |  4 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c    |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 14d275270123..9f52da4ec711 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -324,6 +324,14 @@ enum ixgbe_ring_state_t {
 	__IXGBE_TX_DISABLED,
 };
 
+enum ixgbe_eee_state_t {
+	IXGBE_EEE_DISABLED,	/* EEE explicitly disabled by user */
+	IXGBE_EEE_ENABLED,	/* EEE enabled; for E610 it's default state */
+	IXGBE_EEE_FORCED_DOWN,	/* EEE disabled by link conditions, try to
+				 * restore when possible
+				 */
+};
+
 #define ring_uses_build_skb(ring) \
 	test_bit(__IXGBE_RX_BUILD_SKB_ENABLED, &(ring)->state)
 
@@ -671,7 +679,6 @@ struct ixgbe_adapter {
 #define IXGBE_FLAG2_FW_ASYNC_EVENT		BIT(12)
 #define IXGBE_FLAG2_VLAN_PROMISC		BIT(13)
 #define IXGBE_FLAG2_EEE_CAPABLE			BIT(14)
-#define IXGBE_FLAG2_EEE_ENABLED			BIT(15)
 #define IXGBE_FLAG2_RX_LEGACY			BIT(16)
 #define IXGBE_FLAG2_IPSEC_ENABLED		BIT(17)
 #define IXGBE_FLAG2_VF_IPSEC_ENABLED		BIT(18)
@@ -682,6 +689,8 @@ struct ixgbe_adapter {
 #define IXGBE_FLAG2_API_MISMATCH		BIT(23)
 #define IXGBE_FLAG2_FW_ROLLBACK			BIT(24)
 
+	enum ixgbe_eee_state_t eee_state;
+
 	/* Tx fast path data */
 	int num_tx_queues;
 	u16 tx_itr_setting;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 7a7a58fd065d..24781bbbcf46 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -3656,11 +3656,11 @@ static int ixgbe_set_eee(struct net_device *netdev, struct ethtool_keee *edata)
 		return ret_val;
 
 	if (edata->eee_enabled) {
-		adapter->flags2 |= IXGBE_FLAG2_EEE_ENABLED;
+		adapter->eee_state = IXGBE_EEE_ENABLED;
 		hw->phy.eee_speeds_advertised =
 					   hw->phy.eee_speeds_supported;
 	} else {
-		adapter->flags2 &= ~IXGBE_FLAG2_EEE_ENABLED;
+		adapter->eee_state = IXGBE_EEE_DISABLED;
 		hw->phy.eee_speeds_advertised = 0;
 	}
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 692b095b5c16..b87d553413cd 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6763,11 +6763,11 @@ static void ixgbe_set_eee_capable(struct ixgbe_adapter *adapter)
 		adapter->flags2 |= IXGBE_FLAG2_EEE_CAPABLE;
 		if (!hw->phy.eee_speeds_advertised)
 			break;
-		adapter->flags2 |= IXGBE_FLAG2_EEE_ENABLED;
+		adapter->eee_state = IXGBE_EEE_ENABLED;
 		break;
 	default:
 		adapter->flags2 &= ~IXGBE_FLAG2_EEE_CAPABLE;
-		adapter->flags2 &= ~IXGBE_FLAG2_EEE_ENABLED;
+		adapter->eee_state = IXGBE_EEE_DISABLED;
 		break;
 	}
 }
-- 
2.31.1