From nobody Thu Nov 12 02:33:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jQ4FM2TTdz6yJt6 for ; Thu, 12 Nov 2026 02:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQ4FM1tkgz3QbL for ; Thu, 12 Nov 2026 02:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794450807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pSkHaY6fD8N9Rc5B8Nqvf3FsCG1ic2PHLHO2fWHVcAo=; b=ySgFRNM1aZ6EyFEoqI/9MOfDJIrYg3PI+ItmkzY9pWlWJLKx9MjKheImc7G2rWsJzfP9cv //FfJcyp1KS/GPK/RakjK69jY6HZ0u5lr8IoHz9ZrogUIt0B1G304m+uPR0eIKW3QbGGCn RzAORxPDEb2qMDMn4LP511Ihk4CIbBS6itFQil/hU4yrA+RYaItyD+8liQ5rRcdzPA+Pql BgI4/pkImfae3EIU5CE5tYTvg1GoXU3e57A4UrVCZRmyqa0CaIB53F8XFNrseOV2QSNK5X sG3H4/DNl01Ch0V2bHbDdZ0bRwYUl66+U5kPI5iMDEdIh20poCDi0A6tTJ6roA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794450807; b=VTMWjnaqfiIZ9iU9K+fW7aDoD1T+K+2RT1O9dW7729aqrgFROJhOeY3wTO0ss5zoSGOv1N +/6LUqwTyrDdUvhLrklr0IGwj0QEDNnIponogDonhfQaadqmfVqQAeh2h+NZE1Bg2iot4F C5LJlm7Vbgmv3HAABxpI0Plvn/DzqdSnPtBi0wBSPI+mbgtzxh3QFgMawCjbWEOrgmqVwn 1+Kf0hdGzYKuRsNtPccgvJeioV48Foqp/3+KoojizgwUHTverorxatQIJcFEetGPT6UQIz K0WdYX4Vts8FK4OSeP77oUjqnZsmPsW3vgnDu/W0ry1n6H6wm1F3TsEgiz/MLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794450807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pSkHaY6fD8N9Rc5B8Nqvf3FsCG1ic2PHLHO2fWHVcAo=; b=U9o1hMhkdLw5OxkDsW7NH6qKEKxHj7j7i9eB/ExONb3U5l6FegpHXIrlV1AsIA1aiIN2+o 9UqEtAiaCggN85t+z9dGoK5p3wgeK8mqhjAg0VksqVKcE/XYNhA4QK1KZZ7jmXnN6+qRnE PIVsfvcgczCUQwgHbC4mMKZy3My94BAlV9LAqfm/nJh2bKxWybBXwdn+oUnkwFY8+39U5X oKgeqMvW+eb46WnBmrRBX45sxstnT+/m2D/5rqxkjaVJvLSgN0SLzLxaAL89rFv9HHecx/ 6dTXr8shwN74j88Pf9S8obQ0uugLeA5MViIQetDUa+WNOPfhYLyI2YW5GCMwtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQ4FM1YYXzhh4 for ; Thu, 12 Nov 2026 02:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 12f9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 02:33:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 4678f9d8dc13 - main - ixgbe: Restore EEE exclusion for X550EM_X KR List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4678f9d8dc1324da6c021dc9d376a4671e72ad97 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 02:33:27 +0000 Message-Id: <6af52577.12f9b.325626d7@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4678f9d8dc1324da6c021dc9d376a4671e72ad97 commit 4678f9d8dc1324da6c021dc9d376a4671e72ad97 Author: Kevin Bowling AuthorDate: 2026-11-12 01:44:18 +0000 Commit: Kevin Bowling 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;