This is a note to let you know that I've just added the patch titled
igb: Fix for issue where values could be too high for udelay function.
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
igb-fix-for-issue-where-values-could-be-too-high-for-udelay-function.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From df29df92adda751ac04ca5149d30014b5199db81 Mon Sep 17 00:00:00 2001
From: Carolyn Wyborny <carolyn.wyborny@xxxxxxxxx>
Date: Sat, 14 Dec 2013 03:26:46 -0800
Subject: igb: Fix for issue where values could be too high for udelay function.
From: Carolyn Wyborny <carolyn.wyborny@xxxxxxxxx>
commit df29df92adda751ac04ca5149d30014b5199db81 upstream.
This patch changes the igb_phy_has_link function to check the value of the
parameter before deciding to use udelay or mdelay in order to be sure that
the value is not too high for udelay function.
Signed-off-by: Sunil K Pandey <sunil.k.pandey@xxxxxxxxx>
Signed-off-by: Kevin B Smith <kevin.b.smith@xxxxxxxxx>
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@xxxxxxxxx>
Tested-by: Aaron Brown <aaron.f.brown@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/intel/igb/e1000_phy.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -1595,7 +1595,10 @@ s32 igb_phy_has_link(struct e1000_hw *hw
* ownership of the resources, wait and try again to
* see if they have relinquished the resources yet.
*/
- udelay(usec_interval);
+ if (usec_interval >= 1000)
+ mdelay(usec_interval/1000);
+ else
+ udelay(usec_interval);
}
ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
if (ret_val)
Patches currently in stable-queue which might be from carolyn.wyborny@xxxxxxxxx are
queue-3.10/igb-fix-for-issue-where-values-could-be-too-high-for-udelay-function.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html