[src/trunk]: src/sys/dev/pci/ixgbe Apply FreeBSD r353599:

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d911e399846d
branches:  trunk
changeset: 1004181:d911e399846d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Oct 16 04:07:42 2019 +0000

description:
Apply FreeBSD r353599:

 > ixgbe: Disable EEE for backplane X550EM_X
 >
 > From Zach:
 > Intel documentation indicates that backplane X550EM_X KR devices do not
 > support Energy Efficient Ethernet. Prior to this patch, X552 devices
 > (device ID 0x15AB) will crash the system when transitioning EEE state
 > via sysctl.
 >
 > Signed-off-by: Zach Vargas <zvargas%xes-inc.com@localhost>
 >
 > PR:          240320
 > Submitted by:        Zach Vargas <zvargas%xes-inc.com@localhost>
 > Reviewed by: erj@
 > MFC after:   3 days
 > Differential Revision:       https://reviews.freebsd.org/D21673

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 8f664ac4e91f -r d911e399846d sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Wed Oct 16 01:44:48 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Wed Oct 16 04:07:42 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.213 2019/09/18 10:42:44 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.214 2019/10/16 04:07:42 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -5860,7 +5860,7 @@
        if ((new_eee < 0) || (new_eee > 1))
                return (EINVAL);
 
-       retval = adapter->hw.mac.ops.setup_eee(&adapter->hw, new_eee);
+       retval = ixgbe_setup_eee(&adapter->hw, new_eee);
        if (retval) {
                device_printf(dev, "Error in EEE setup: 0x%08X\n", retval);
                return (EINVAL);
@@ -6034,8 +6034,6 @@
                 */
                adapter->feat_cap |= IXGBE_FEATURE_SRIOV;
                adapter->feat_cap |= IXGBE_FEATURE_FDIR;
-               if (adapter->hw.device_id == IXGBE_DEV_ID_X550EM_X_KR)
-                       adapter->feat_cap |= IXGBE_FEATURE_EEE;
                break;
        case ixgbe_mac_X550EM_a:
                /*