022-greth_avoid_bad_speed_duplex.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. From c2e963057ca5635d6e5387623c3ad0c0b3123754 Mon Sep 17 00:00:00 2001
  2. From: Daniel Hellstrom <[email protected]>
  3. Date: Wed, 1 Dec 2010 10:28:37 +0100
  4. Subject: [PATCH] GRETH: avoid writing bad speed/duplex when setting transfer mode
  5. Signed-off-by: Daniel Hellstrom <[email protected]>
  6. ---
  7. drivers/net/greth.c | 19 ++++++++-----------
  8. 1 files changed, 8 insertions(+), 11 deletions(-)
  9. --- a/drivers/net/greth.c
  10. +++ b/drivers/net/greth.c
  11. @@ -1236,29 +1236,26 @@ static void greth_link_change(struct net
  12. struct greth_private *greth = netdev_priv(dev);
  13. struct phy_device *phydev = greth->phy;
  14. unsigned long flags;
  15. -
  16. int status_change = 0;
  17. + u32 ctrl;
  18. spin_lock_irqsave(&greth->devlock, flags);
  19. if (phydev->link) {
  20. if ((greth->speed != phydev->speed) || (greth->duplex != phydev->duplex)) {
  21. -
  22. - GRETH_REGANDIN(greth->regs->control,
  23. - ~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB));
  24. + ctrl = GRETH_REGLOAD(greth->regs->control) &
  25. + ~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB);
  26. if (phydev->duplex)
  27. - GRETH_REGORIN(greth->regs->control, GRETH_CTRL_FD);
  28. -
  29. - if (phydev->speed == SPEED_100) {
  30. -
  31. - GRETH_REGORIN(greth->regs->control, GRETH_CTRL_SP);
  32. - }
  33. + ctrl |= GRETH_CTRL_FD;
  34. + if (phydev->speed == SPEED_100)
  35. + ctrl |= GRETH_CTRL_SP;
  36. else if (phydev->speed == SPEED_1000)
  37. - GRETH_REGORIN(greth->regs->control, GRETH_CTRL_GB);
  38. + ctrl |= GRETH_CTRL_GB;
  39. + GRETH_REGSAVE(greth->regs->control, ctrl);
  40. greth->speed = phydev->speed;
  41. greth->duplex = phydev->duplex;
  42. status_change = 1;