igb: fix a few items where weren't correctly setup for mbx timeout

The mailbox timeout routines need to be updated as they were not correctly
handling the case of a mailbox timeout and could cause issues with long
delays when used.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/igb/e1000_mbx.c b/drivers/net/igb/e1000_mbx.c
index ef645f604d89f72e9959513b7f15ef0dbcd4ff76..c474cdb70047c6f9cde8851a6b793c13143bdfdf 100644 (file)
--- a/drivers/net/igb/e1000_mbx.c
+++ b/drivers/net/igb/e1000_mbx.c
@@ -143,12 +143,16 @@ static s32 igb_poll_for_msg(struct e1000_hw *hw, u16 mbx_id)
        if (!countdown || !mbx->ops.check_for_msg)
                goto out;
 
-       while (mbx->ops.check_for_msg(hw, mbx_id)) {
+       while (countdown && mbx->ops.check_for_msg(hw, mbx_id)) {
                countdown--;
                if (!countdown)
                        break;
                udelay(mbx->usec_delay);
        }
+
+       /* if we failed, all future posted messages fail until reset */
+       if (!countdown)
+               mbx->timeout = 0;
 out:
        return countdown ? 0 : -E1000_ERR_MBX;
 }
@@ -168,12 +172,16 @@ static s32 igb_poll_for_ack(struct e1000_hw *hw, u16 mbx_id)
        if (!countdown || !mbx->ops.check_for_ack)
                goto out;
 
-       while (mbx->ops.check_for_ack(hw, mbx_id)) {
+       while (countdown && mbx->ops.check_for_ack(hw, mbx_id)) {
                countdown--;
                if (!countdown)
                        break;
                udelay(mbx->usec_delay);
        }
+
+       /* if we failed, all future posted messages fail until reset */
+       if (!countdown)
+               mbx->timeout = 0;
 out:
        return countdown ? 0 : -E1000_ERR_MBX;
 }
@@ -217,12 +225,13 @@ out:
 static s32 igb_write_posted_mbx(struct e1000_hw *hw, u32 *msg, u16 size, u16 mbx_id)
 {
        struct e1000_mbx_info *mbx = &hw->mbx;
-       s32 ret_val = 0;
+       s32 ret_val = -E1000_ERR_MBX;
 
-       if (!mbx->ops.write)
+       /* exit if either we can't write or there isn't a defined timeout */
+       if (!mbx->ops.write || !mbx->timeout)
                goto out;
 
-       /* send msg*/
+       /* send msg */
        ret_val = mbx->ops.write(hw, msg, size, mbx_id);
 
        /* if msg sent wait until we receive an ack */