ethernet: dm9000 driver: davicom: upgrade driver
PATCH 1/1 ethernet: dm9000 driver: davicom: upgrade driver
Fixing bug for DM9000B which is a DSP revision!
Had tested to Davicom DM9000 series include DM9000E(analog), DM9000A(analog), DM9000B(dsp) and DM9000C(dsp) in X86 and ARM Embedded Linux these years.
Signed-off-by Joseph CHANG <[email protected]>
--- drivers/net/ethernet/davicom/dm9000.c | 12 ++++++++++-- drivers/net/ethernet/davicom/dm9000.h | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-)
drivers/net/ethernet/davicom/dm9000.c +10 -2
@@ -47,7 +47,7 @@#define DM9000_PHY 0x40/* PHY address 0x01 */ #define CARDNAME "dm9000" -#define DRV_VERSION "1.31" +#define DRV_VERSION "1.39"/* * Transmit timeout, default 5 seconds.
@@ -795,6 +795,8 @@ dm9000_init_dm9000(struct net_device *dev)iow (db,DM9000_GPCR ,GPCR_GEP_CNTL );/* Let GPIO0 output */ +dm9000_phy_write (dev,0 ,MII_BMCR ,BMCR_RESET );/* PHY RESET */ + ncr = (db->flags &DM9000_PLATF_EXT_PHY ) ?NCR_EXT_PHY :0 ;/* if wol is needed, then always set NCR_WAKEEN otherwise we end
@@ -830,6 +832,8 @@ dm9000_init_dm9000(struct net_device *dev) db->tx_pkt_cnt =0 ; db->queue_pkt_len =0 ; dev->trans_start = jiffies; + +dm9000_phy_write (dev,0 ,MII_DM_DSPCR ,DSPCR_INIT_PARAM );/* Init */ }/* Our watchdog timed out. Called by the networking layer */
@@ -1502,7 +1506,11 @@ dm9000_probe(struct platform_device *pdev) db->flags |=DM9000_PLATF_SIMPLE_PHY ;#endif -dm9000_reset (db); +/* Fixing bug on dm9000_probe, takeover dm9000_reset(db), +* Need 'NCR_MAC_LBK' bit to indeed stable our DM9000 fifo +* while probe stage */ + +iow (db,DM9000_NCR ,NCR_MAC_LBK |NCR_RST );/* try multiple times, DM9000 sometimes gets the read wrong */ for (i =0 ; i <8 ; i++) {
drivers/net/ethernet/davicom/dm9000.h +10 -1
@@ -69,7 +69,9 @@#define NCR_WAKEEN (1<<6)#define NCR_FCOL (1<<4)#define NCR_FDX (1<<3) -#define NCR_LBK (3<<1) + +#define NCR_RESERVED (3<<1) +#define NCR_MAC_LBK (1<<1)#define NCR_RST (1<<0)#define NSR_SPEED (1<<7)
@@ -167,5 +169,12 @@#define ISR_LNKCHNG (1<<5)#define ISR_UNDERRUN (1<<4) +/* Davicom MII registers. +*/ + +#define MII_DM_DSPCR 0x1b/* DSP Control Register */ + +#define DSPCR_INIT_PARAM 0xE100/* DSP init parameter */ +#endif /* _DM9000X_H_ */
Signature · 1 line
1.7.1