1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 88f67375e85e..d30fbdd81fca 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2454,6 +2454,16 @@ static irqreturn_t ixgbe_msix_other(int irq, void *data)
          * with the write to EICR.
          */
         eicr = IXGBE_READ_REG(hw, IXGBE_EICS);
+
+        /* The lower 16bits of the EICR register are for the queue interrupts
+         * which should be masked here in order to not accidently clear them if
+         * the bits are high when ixgbe_msix_other is called. There is a race
+         * condition otherwise which results in possible performance loss
+         * especially if the ixgbe_msix_other interrupt is triggering
+         * consistently (as it would when PPS is turned on for the X540 device)
+         */
+        eicr &= 0xFFFF0000;
+
         IXGBE_WRITE_REG(hw, IXGBE_EICR, eicr);
 
         if (eicr & IXGBE_EICR_LSC)