[Cbe-oss-dev] [RFC][PATCH] spidernet: enable fiber autonegotiation

[Jens Osterkamp]

While experimenting with a copper passthrough module in bladecenter I found 
out that this needs autonegotiation enabled in order to work properly.
This quick hack enables it with the sideeffect of breaking other bladecenter 
switch configurations.
If anyone has any suggestions or has experimented with the same configuration, 
feel free to comment.

This patch is not meant for inclusion into mainline.

Signed-off-by: Jens Osterkamp <jens at de.ibm.com>

Index: linux-2.6.19-rc6/drivers/net/spider_net.c
===================================================================
--- linux-2.6.19-rc6.orig/drivers/net/spider_net.c
+++ linux-2.6.19-rc6/drivers/net/spider_net.c
@@ -1724,8 +1724,10 @@ spider_net_setup_phy(struct spider_net_c
  phy->mdio_read = spider_net_read_phy;
  phy->mdio_write = spider_net_write_phy;
 
+ /* reset phy, read id and setup phy struct with phy ops*/
  mii_phy_probe(phy, phy->mii_id);
 
+ /* write fix speed and duplex to BMCR */
  if (phy->def->ops->setup_forced)
   phy->def->ops->setup_forced(phy, SPEED_1000, DUPLEX_FULL);
 
Index: linux-2.6.19-rc6/drivers/net/sungem_phy.c
===================================================================
--- linux-2.6.19-rc6.orig/drivers/net/sungem_phy.c
+++ linux-2.6.19-rc6/drivers/net/sungem_phy.c
@@ -335,10 +335,6 @@ static int bcm5421_enable_fiber(struct m
  /* LEDs active in both modes, autosense prio = fiber */
  phy_write(phy, MII_NCONFIG, 0x945f);
 
- /* switch off fibre autoneg */
- phy_write(phy, MII_NCONFIG, 0xfc01);
- phy_write(phy, 0x0b, 0x0004);
-
  return 0;
 }
 
@@ -347,7 +343,7 @@ static int bcm5461_enable_fiber(struct m
  phy_write(phy, MII_NCONFIG, 0xfc0c);
  phy_write(phy, MII_BMCR, 0x4140);
  phy_write(phy, MII_NCONFIG, 0xfc0b);
- phy_write(phy, MII_BMCR, 0x0140);
+ phy_write(phy, MII_BMCR, 0x1140);
 
  return 0;
 }