X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fleon%2Fpatches-2.6.36%2F022-greth_avoid_bad_speed_duplex.patch;fp=target%2Flinux%2Fleon%2Fpatches-2.6.36%2F022-greth_avoid_bad_speed_duplex.patch;h=e8253640dc998e62a1acc616eab9711135e1a892;hp=0000000000000000000000000000000000000000;hb=8749797f41319058e087cb4669ed754e32871cdc;hpb=da9b3ca98c6d72493480ac31e2699d0fb3c30e25

diff --git a/target/linux/leon/patches-2.6.36/022-greth_avoid_bad_speed_duplex.patch b/target/linux/leon/patches-2.6.36/022-greth_avoid_bad_speed_duplex.patch
new file mode 100644
index 0000000000..e8253640dc
--- /dev/null
+++ b/target/linux/leon/patches-2.6.36/022-greth_avoid_bad_speed_duplex.patch
@@ -0,0 +1,50 @@
+From c2e963057ca5635d6e5387623c3ad0c0b3123754 Mon Sep 17 00:00:00 2001
+From: Daniel Hellstrom <daniel@gaisler.com>
+Date: Wed, 1 Dec 2010 10:28:37 +0100
+Subject: [PATCH] GRETH: avoid writing bad speed/duplex when setting transfer mode
+
+Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
+---
+ drivers/net/greth.c |   19 ++++++++-----------
+ 1 files changed, 8 insertions(+), 11 deletions(-)
+
+--- a/drivers/net/greth.c
++++ b/drivers/net/greth.c
+@@ -1236,29 +1236,26 @@ static void greth_link_change(struct net
+ 	struct greth_private *greth = netdev_priv(dev);
+ 	struct phy_device *phydev = greth->phy;
+ 	unsigned long flags;
+-
+ 	int status_change = 0;
++	u32 ctrl;
+ 
+ 	spin_lock_irqsave(&greth->devlock, flags);
+ 
+ 	if (phydev->link) {
+ 
+ 		if ((greth->speed != phydev->speed) || (greth->duplex != phydev->duplex)) {
+-
+-			GRETH_REGANDIN(greth->regs->control,
+-				       ~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB));
++			ctrl = GRETH_REGLOAD(greth->regs->control) & 
++			       ~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB);
+ 
+ 			if (phydev->duplex)
+-				GRETH_REGORIN(greth->regs->control, GRETH_CTRL_FD);
+-
+-			if (phydev->speed == SPEED_100) {
+-
+-				GRETH_REGORIN(greth->regs->control, GRETH_CTRL_SP);
+-			}
++				ctrl |= GRETH_CTRL_FD;
+ 
++			if (phydev->speed == SPEED_100)
++				ctrl |= GRETH_CTRL_SP;
+ 			else if (phydev->speed == SPEED_1000)
+-				GRETH_REGORIN(greth->regs->control, GRETH_CTRL_GB);
++				ctrl |= GRETH_CTRL_GB;
+ 
++			GRETH_REGSAVE(greth->regs->control, ctrl);
+ 			greth->speed = phydev->speed;
+ 			greth->duplex = phydev->duplex;
+ 			status_change = 1;