igb: reconfigure mailbox timeout logic (3935358e) · Commits · 戴 / test

This change updates the timeout logic so that it is not possible to have a sucessful check for message and still return an error if countdown = 0. Signed-off-by:

Alexander Duyck <alexander.h.duyck@intel.com> Reported-by:

Juha Leppanen <juha_motorsportscom@luukku.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/igb/e1000_mbx.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -140,13 +140,13 @@ static s32 igb_poll_for_msg(struct e1000_hw *hw, u16 mbx_id)
		struct e1000_mbx_info *mbx = &hw->mbx;
		int countdown = mbx->timeout;

		if (!mbx->ops.check_for_msg)
		if (!countdown \|\| !mbx->ops.check_for_msg)
		goto out;

		while (mbx->ops.check_for_msg(hw, mbx_id)) {
		countdown--;
		if (!countdown)
		break;
		countdown--;
		udelay(mbx->usec_delay);
		}
		out:
		@@ -165,13 +165,13 @@ static s32 igb_poll_for_ack(struct e1000_hw *hw, u16 mbx_id)
		struct e1000_mbx_info *mbx = &hw->mbx;
		int countdown = mbx->timeout;

		if (!mbx->ops.check_for_ack)
		if (!countdown \|\| !mbx->ops.check_for_ack)
		goto out;

		while (mbx->ops.check_for_ack(hw, mbx_id)) {
		countdown--;
		if (!countdown)
		break;
		countdown--;
		udelay(mbx->usec_delay);
		}
		out:

Admin message