On Tue, Nov 07, 2006 at 10:33:14AM -0800, Auke Kok wrote:
> Matthew Wilcox wrote:
> >Tested on the internal interface of an HP Integrity rx2600.
>
> bad news, it's completely hosed. The adapter does some indistinguishable
> blinking for a second, then stops blinking alltogether.
Weird. I tested it on the only e100 I have access to, and it worked.
I've just reviewed the patch you quoted below, and I don't see what the
problem is.
I wonder if this is wrong:
> >- mdio_write(netdev, nic->mii.phy_id, MII_LED_CONTROL, 0);
> >+ mdio_write(netdev, nic->mii.phy_id, MII_LED_CONTROL, led_off);
but everything else seems pretty straight-forward.
> I might revert the code to the old situation. I guess I should have tested
> it initially right away.
>
> I'm not even going to touch the e1000 patch for now ;)
>
> Auke
>
> >
> >Signed-off-by: Matthew Wilcox <[EMAIL PROTECTED]>
> >
> >diff --git a/drivers/net/e100.c b/drivers/net/e100.c
> >index a3a08a5..aade1e9 100644
> >--- a/drivers/net/e100.c
> >+++ b/drivers/net/e100.c
> >@@ -556,7 +556,6 @@ struct nic {
> > struct params params;
> > struct net_device_stats net_stats;
> > struct timer_list watchdog;
> >- struct timer_list blink_timer;
> > struct mii_if_info mii;
> > struct work_struct tx_timeout_task;
> > enum loopback loopback;
> >@@ -581,7 +580,6 @@ struct nic {
> > u32 rx_over_length_errors;
> >
> > u8 rev_id;
> >- u16 leds;
> > u16 eeprom_wc;
> > u16 eeprom[256];
> > spinlock_t mdio_lock;
> >@@ -2168,23 +2166,6 @@ err_clean_rx:
> > return err;
> > }
> >
> >-#define MII_LED_CONTROL 0x1B
> >-static void e100_blink_led(unsigned long data)
> >-{
> >- struct nic *nic = (struct nic *)data;
> >- enum led_state {
> >- led_on = 0x01,
> >- led_off = 0x04,
> >- led_on_559 = 0x05,
> >- led_on_557 = 0x07,
> >- };
> >-
> >- nic->leds = (nic->leds & led_on) ? led_off :
> >- (nic->mac < mac_82559_D101M) ? led_on_557 : led_on_559;
> >- mdio_write(nic->netdev, nic->mii.phy_id, MII_LED_CONTROL, nic->leds);
> >- mod_timer(&nic->blink_timer, jiffies + HZ / 4);
> >-}
> >-
> > static int e100_get_settings(struct net_device *netdev, struct
> > ethtool_cmd *cmd)
> > {
> > struct nic *nic = netdev_priv(netdev);
> >@@ -2411,16 +2392,32 @@ static void e100_diag_test(struct net_de
> > msleep_interruptible(4 * 1000);
> > }
> >
> >+#define MII_LED_CONTROL 0x1B
> > static int e100_phys_id(struct net_device *netdev, u32 data)
> > {
> > struct nic *nic = netdev_priv(netdev);
> >+ int i;
> >+
> >+ enum led_state {
> >+ led_off = 0x04,
> >+ led_on_559 = 0x05,
> >+ led_on_557 = 0x07,
> >+ };
> >+ u16 leds = led_off;
> >+
> >+ if (data == 0)
> >+ data = 2;
> >+
> >+ for (i = 0; i < (data * 2); i++) {
> >+ leds = (leds == led_off) ?
> >+ (nic->mac < mac_82559_D101M) ? led_on_557 :
> >led_on_559 :
> >+ led_off;
> >+ mdio_write(nic->netdev, nic->mii.phy_id, MII_LED_CONTROL,
> >leds);
> >+ if (msleep_interruptible(500))
> >+ break;
> >+ }
> >
> >- if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
> >- data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
> >- mod_timer(&nic->blink_timer, jiffies);
> >- msleep_interruptible(data * 1000);
> >- del_timer_sync(&nic->blink_timer);
> >- mdio_write(netdev, nic->mii.phy_id, MII_LED_CONTROL, 0);
> >+ mdio_write(netdev, nic->mii.phy_id, MII_LED_CONTROL, led_off);
> >
> > return 0;
> > }
> >@@ -2633,9 +2630,6 @@ #endif
> > init_timer(&nic->watchdog);
> > nic->watchdog.function = e100_watchdog;
> > nic->watchdog.data = (unsigned long)nic;
> >- init_timer(&nic->blink_timer);
> >- nic->blink_timer.function = e100_blink_led;
> >- nic->blink_timer.data = (unsigned long)nic;
> >
> > INIT_WORK(&nic->tx_timeout_task,
> > (void (*)(void *))e100_tx_timeout_task, netdev);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
