Skip to contentSkip to conversation

spidernet: enable fiber autonegotiation

RFC PATCH In review Jens Osterkamp 3 participants 4 messages Nov 27, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 spidernet: enable fiber autonegotiation

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.

drivers/net/spider_net.c +2 -0
Index: 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);
 
drivers/net/sungem_phy.c +1 -5
Index: 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;
 }
#1 lore raw
Quoted 7 lines · 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.

There was a patch from Ishizaki Kou recently, to set up autonegotiate and other things, see http://patchwork.ozlabs.org/linuxppc/patch?id=8121 .

Are you sure that you don't need any of those changes as well?

	Arnd <><
#2 lore raw
Quoted 5 lines

There was a patch from Ishizaki Kou recently, to set up autonegotiate and other things, see http://patchwork.ozlabs.org/linuxppc/patch?id=8121 .

Are you sure that you don't need any of those changes as well?

Thanks for pointing me to this, I must have overlooked it. Some of it seems only applicable to the Celleb copper interface, but some of it is quite usable for us too.

Is it already queued upstream ?

Jens

#3 lore raw
Quoted 5 lines · Jens Osterkamp

Thanks for pointing me to this, I must have overlooked it. Some of it seems only applicable to the Celleb copper interface, but some of it is quite usable for us too.

Is it already queued upstream ?

No, I'm currently waiting for an updated series for Celleb, ported to the latest kernel. The spidernet patch from this series has not yet been submitted to netdev or jgarzik, AFAIK.

	Arnd <><