svn commit: r353665 - releng/12.1/sys/dev/ixgbe

[Eric Joyner]

Author: erj
Date: Wed Oct 16 21:46:49 2019
New Revision: 353665
URL: https://svnweb.freebsd.org/changeset/base/353665

Log:
  MFC r353660: ixgbe: Disable EEE for backplane X550EM_X
  
  This prevents a kernel panic when configuring EEE on X552 devices.
  
  PR:		240320
  Approved by:	re@ (gjb@)
  Sponsored by:	Intel Corporation

Modified:
  releng/12.1/sys/dev/ixgbe/if_ix.c
Directory Properties:
  releng/12.1/   (props changed)

Modified: releng/12.1/sys/dev/ixgbe/if_ix.c
==============================================================================
--- releng/12.1/sys/dev/ixgbe/if_ix.c	Wed Oct 16 21:07:18 2019	(r353664)
+++ releng/12.1/sys/dev/ixgbe/if_ix.c	Wed Oct 16 21:46:49 2019	(r353665)
@@ -4416,7 +4416,7 @@ ixgbe_sysctl_eee_state(SYSCTL_HANDLER_ARGS)
 	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);
@@ -4469,8 +4469,6 @@ ixgbe_init_device_features(struct adapter *adapter)
 	case ixgbe_mac_X550EM_x:
 		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:
 		adapter->feat_cap |= IXGBE_FEATURE_SRIOV;