Prev: [053/205] drm/i915: fix hibernation since i915 self-reclaim fixes
Next: [066/205] drm/radeon/kms: add quirk for ASUS HD 3600 board
From: Greg KH on 30 Jul 2010 14:40 2.6.34-stable review patch. If anyone has any objections, please let us know. ------------------ From: Timo Teräs <timo.teras(a)iki.fi> [ Upstream commit 81a95f049962ec20a9aed888e676208b206f0f2e ] Realtek confirmed that a 20us delay is needed after mdio_read and mdio_write operations. Reduce the delay in mdio_write, and add it to mdio_read too. Also add a comment that the 20us is from hw specs. Signed-off-by: Timo Teräs <timo.teras(a)iki.fi> Acked-by: Francois Romieu <romieu(a)fr.zoreil.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- drivers/net/r8169.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -558,10 +558,10 @@ static void mdio_write(void __iomem *ioa udelay(25); } /* - * Some configurations require a small delay even after the write - * completed indication or the next write might fail. + * According to hardware specs a 20us delay is required after write + * complete indication, but before sending next command. */ - udelay(25); + udelay(20); } static int mdio_read(void __iomem *ioaddr, int reg_addr) @@ -581,6 +581,12 @@ static int mdio_read(void __iomem *ioadd } udelay(25); } + /* + * According to hardware specs a 20us delay is required after read + * complete indication, but before sending next command. + */ + udelay(20); + return value; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |