1 files changed, 25 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index c27d9867e20d..580dfd88418d 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -750,12 +750,35 @@ static void ixgbevf_set_itr(struct ixgbevf_q_vector *q_vector)
 static irqreturn_t ixgbevf_msix_other(int irq, void *data)
 {
         struct ixgbevf_adapter *adapter = data;
+        struct pci_dev *pdev = adapter->pdev;
         struct ixgbe_hw *hw = &adapter->hw;
+        u32 msg;
+        bool got_ack = false;
 
         hw->mac.get_link_status = 1;
+        if (!hw->mbx.ops.check_for_ack(hw))
+                got_ack = true;
 
-        if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
-                mod_timer(&adapter->watchdog_timer, jiffies);
+        if (!hw->mbx.ops.check_for_msg(hw)) {
+                hw->mbx.ops.read(hw, &msg, 1);
+
+                if ((msg & IXGBE_MBVFICR_VFREQ_MASK) == IXGBE_PF_CONTROL_MSG)
+                        mod_timer(&adapter->watchdog_timer,
+                                  round_jiffies(jiffies + 1));
+
+                if (msg & IXGBE_VT_MSGTYPE_NACK)
+                        dev_info(&pdev->dev,
+                                 "Last Request of type %2.2x to PF Nacked\n",
+                                 msg & 0xFF);
+                hw->mbx.v2p_mailbox |= IXGBE_VFMAILBOX_PFSTS;
+        }
+
+        /* checking for the ack clears the PFACK bit.  Place
+         * it back in the v2p_mailbox cache so that anyone
+         * polling for an ack will not miss it
+         */
+        if (got_ack)
+                hw->mbx.v2p_mailbox |= IXGBE_VFMAILBOX_PFACK;
 
         IXGBE_WRITE_REG(hw, IXGBE_VTEIMS, adapter->eims_other);