git: 4678f9d8dc13 - main - ixgbe: Restore EEE exclusion for X550EM_X KR

From: Kevin Bowling <kbowling_at_FreeBSD.org>
Date: Thu, 12 Nov 2026 02:33:27 UTC
The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/src/commit/?id=4678f9d8dc1324da6c021dc9d376a4671e72ad97

commit 4678f9d8dc1324da6c021dc9d376a4671e72ad97
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2026-11-12 01:44:18 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2026-11-12 02:32:17 +0000

    ixgbe: Restore EEE exclusion for X550EM_X KR
    
    X550EM_X KR devices do not support EEE and have no setup_eee operation.
    The shared-code update restored the capability removed by d61b6a41dd30,
    and the E610 EEE support subsequently added an unchecked call during
    attach. Together these changes allow a NULL function pointer call when
    attaching a KR device.
    
    Remove the incorrect EEE capability and use the NULL-safe ixgbe_setup_eee()
    wrapper when enabling EEE at attach.
    
    Removing the unsupported capability also stops exposing eee_state and the
    eee.tx_lpi_count and eee.rx_lpi_count sysctls on X550EM_X_KR devices.
    
    Fixes:  f72de14ea132 ("ixgbe: update if_ix and ixgbe api with ix-3.3.38 changes")
    Fixes:  13ee84c591f8 ("ix(4): Add EEE support for E610 adapters")
    MFC after:      1 week
    Sponsored by:   BBOX.io
---
 sys/dev/ixgbe/if_ix.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c
index 688ff53ebb39..35bcebf985fc 100644
--- a/sys/dev/ixgbe/if_ix.c
+++ b/sys/dev/ixgbe/if_ix.c
@@ -1270,7 +1270,7 @@ ixgbe_if_attach_pre(if_ctx_t ctx)
 
 	/* Enable EEE power saving */
 	if (sc->feat_en & IXGBE_FEATURE_EEE)
-		hw->mac.ops.setup_eee(hw, true);
+		ixgbe_setup_eee(hw, true);
 
 	/* Set an initial default flow control value */
 	hw->fc.requested_mode = ixgbe_flow_control;
@@ -6433,8 +6433,6 @@ ixgbe_init_device_features(struct ixgbe_softc *sc)
 		sc->feat_cap |= IXGBE_FEATURE_RECOVERY_MODE;
 		sc->feat_cap |= IXGBE_FEATURE_SRIOV;
 		sc->feat_cap |= IXGBE_FEATURE_FDIR;
-		if (sc->hw.device_id == IXGBE_DEV_ID_X550EM_X_KR)
-			sc->feat_cap |= IXGBE_FEATURE_EEE;
 		break;
 	case ixgbe_mac_X550EM_a:
 		sc->feat_cap |= IXGBE_FEATURE_RECOVERY_MODE;