diff options
author | Don Skidmore <donald.c.skidmore@intel.com> | 2011-08-17 06:15:21 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-09-29 02:11:25 -0400 |
commit | f3df98ec9e8ed127456a601f99619c88e9d6017f (patch) | |
tree | c68c03e89d5501a8735a34b863f9419d81f42e02 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |
parent | 4f51bf702395ab45aa68e6b702df2728cc7fe344 (diff) |
ixgbe: cleanup ixgbe_setup_gpie() for X540
The X540 thermal sensor interrupt isn't a General Purpose Interrupt
so doesn't need to be enabled in ixgbe_setup_gpie(). Likewise X540 doesn't
use the SDP0 for thermal sensor so it doesn't need to be enabled for any
device other than 82599.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 79636eaeb74d..3f5c5a4291a6 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -3680,8 +3680,18 @@ static void ixgbe_setup_gpie(struct ixgbe_adapter *adapter) | |||
3680 | } | 3680 | } |
3681 | 3681 | ||
3682 | /* Enable Thermal over heat sensor interrupt */ | 3682 | /* Enable Thermal over heat sensor interrupt */ |
3683 | if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) | 3683 | if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) { |
3684 | gpie |= IXGBE_SDP0_GPIEN; | 3684 | switch (adapter->hw.mac.type) { |
3685 | case ixgbe_mac_82599EB: | ||
3686 | gpie |= IXGBE_SDP0_GPIEN; | ||
3687 | break; | ||
3688 | case ixgbe_mac_X540: | ||
3689 | gpie |= IXGBE_EIMS_TS; | ||
3690 | break; | ||
3691 | default: | ||
3692 | break; | ||
3693 | } | ||
3694 | } | ||
3685 | 3695 | ||
3686 | /* Enable fan failure interrupt */ | 3696 | /* Enable fan failure interrupt */ |
3687 | if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) | 3697 | if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) |