[leon] move patches to patches-2.6.36

[openwrt/svn-archive/archive.git] / target / linux / leon / patches-2.6.36 / 022-greth_avoid_bad_speed_duplex.patch

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 (file)
index 0000000..e825364
--- /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;