net #5
PATCH 1/1 net #5
The following patch fixes some long udelay()s in aironet.c and saa9730.c in the current kernel tree.
Andrzej
*************************** PATCH 5 *******************************
drivers/net/aironet4500_card.c +8 -11
@@ -723,14 +723,14 @@awc_i365_card_release (s); -udelay (100000 ); +mdelay (100 );i365_out (s,0x2 ,0x10 );// power enable -udelay (200000 ); +mdelay (200 );i365_out (s,0x2 ,0x10 |0x01 |0x04 |0x80 );//power enable -udelay (250000 ); +mdelay (250 );if (!s->irq) s->irq =11 ;
@@ -756,7 +756,7 @@i365_out (s,0x15 ,0x3f |0x40 );// enab mem reg bit i365_out (s,0x06 ,0x01 );// enab mem -udelay (10000 ); +mdelay (10 ); cis[0 ] =0x45 ;
@@ -767,7 +767,7 @@ mem[0x3e0 ] =0x45 ; -udelay (10000 ); +mdelay (10 );memcpy_fromio (cis,0xD000 ,0x3e0 );
@@ -795,7 +795,7 @@ s->socket, s->manufacturer,s->product);i365_out (s,0x07 ,0x1 |0x2 );// enable io 16bit -udelay (1000 ); +mdelay (1 ); port = s->io;i365_out (s,0x08 , port &0xff );i365_out (s,0x09 , (port &0xff00 )/0x100 );
@@ -804,7 +804,7 @@i365_out (s,0x06 ,0x40 );// enable io window -udelay (1000 ); +mdelay (1 );i365_out (s,0x3e0 ,0x45 );
@@ -822,13 +822,10 @@outw (0x10 , s->io +0x34 ); -udelay (10000 ); +mdelay (10 );return 0 ; - - - };
drivers/net/saa9730.c +10 -10
@@ -335,7 +335,7 @@printk ("Error: lan_saa9730_mii_init: timeout\n" );return -1 ; } -udelay (1000 );/* wait 1 ms. */ +mdelay (1 );/* wait 1 ms. */ }/* Now set the control and address register. */
@@ -350,11 +350,11 @@printk ("Error: lan_saa9730_mii_init: timeout\n" );return -1 ; } -udelay (1000 );/* wait 1 ms. */ +mdelay (1 );/* wait 1 ms. */ }/* Wait for 1 ms. */ -udelay (1000 ); +mdelay (1 );/* Check the link status. */ if (INL(&lp->lan_saa9730_regs->StationMgmtData) &
@@ -369,7 +369,7 @@ &lp->lan_saa9730_regs->StationMgmtCtl);/* Wait for 1 ms. */ -udelay (1000 ); +mdelay (1 );/* set 'CONTROL' = force reset and renegotiate */ OUTL(PHY_CONTROL_RESET | PHY_CONTROL_AUTO_NEG |
@@ -377,7 +377,7 @@ &lp->lan_saa9730_regs->StationMgmtData);/* Wait for 50 ms. */ -udelay (50 *1000 ); +mdelay (50 );/* set 'BUSY' to start operation */ OUTL(MD_CA_BUSY | PHY_ADDRESS << MD_CA_PHY_SHF | MD_CA_WR |
@@ -393,11 +393,11 @@ ("Error: lan_saa9730_mii_init: timeout\n" );return -1 ; } -udelay (1000 );/* wait 1 ms. */ +mdelay (1 );/* wait 1 ms. */ }/* Wait for 1 ms. */ -udelay (1000 ); +mdelay (1 );for (l =0 ; l <2 ; l++) {/* set PHY address = 'STATUS' */
@@ -415,11 +415,11 @@ ("Error: lan_saa9730_mii_init: timeout\n" );return -1 ; } -udelay (1000 );/* wait 1 ms. */ +mdelay (1 );/* wait 1 ms. */ }/* wait for 3 sec. */ -udelay (3000 *1000 ); +mdelay (3000 );/* check the link status */ if (INL(&lp->lan_saa9730_regs->StationMgmtData) &
@@ -495,7 +495,7 @@ ("Error: lan_sa9730_stop: MAC reset timeout\n" );return -1 ; } -udelay (1000 );/* wait 1 ms. */ +mdelay (1 );/* wait 1 ms. */ }return 0 ;
Signature · 4 lines
======================================================================= Andrzej M. Krzysztofowicz [email protected] phone (48)(58) 347 14 61 Faculty of Applied Phys. & Math., Technical University of Gdansk