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.

(cherry picked from commit f3df98ec9e8ed127456a601f99619c88e9d6017f)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 0f0477f3818c2460e25b1b0dfade571526259706..36e478f228b5f1d550c1b703f5c5be0ba9987f6d 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3679,8 +3679,18 @@ static void ixgbe_setup_gpie(struct ixgbe_adapter *adapter)
        }
 
        /* Enable Thermal over heat sensor interrupt */
-       if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE)
-               gpie |= IXGBE_SDP0_GPIEN;
+       if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) {
+               switch (adapter->hw.mac.type) {
+               case ixgbe_mac_82599EB:
+                       gpie |= IXGBE_SDP0_GPIEN;
+                       break;
+               case ixgbe_mac_X540:
+                       gpie |= IXGBE_EIMS_TS;
+                       break;
+               default:
+                       break;
+               }
+       }
 
        /* Enable fan failure interrupt */
        if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)