8390: Neatening
Subsystems (2)
cover 8390: Neatening
Some updates requested by Geert Uytterhoeven
Joe Perches (8):
ariadne: Update style, neaten, restructure to eliminate prototypes
a2065: Use pr_fmt, pr_<level> and netdev_<level>
lib8390: Use pr_<level> and netdev_<level>
lib8390: Indent braces appropriately
lib8390: Normalize source code spacing
lib8390: Convert include <asm to include <linux
lib8390: Remove unnecessary extern
zorro8390: Restructure and eliminate prototypes
drivers/net/a2065.c | 336 ++++++------- drivers/net/ariadne.c | 1267 ++++++++++++++++++++++------------------------- drivers/net/lib8390.c | 285 +++++------ drivers/net/zorro8390.c | 673 +++++++++++++------------- 4 files changed, 1220 insertions(+), 1341 deletions(-)
Signature · 1 line
1.7.6.rc3
PATCH 1/8 ariadne: Update style, neaten, restructure to eliminate prototypes
Convert to current logging styles.
Move code blocks to eliminate need for prototypes. Use tabs for code indent and sandardize spacing. Comment neatening.
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/ariadne.c | 1267 +++++++++++++++++++++++-------------------------- 1 files changed, 601 insertions(+), 666 deletions(-)
drivers/net/ariadne.c +601 -666
@@ -34,6 +34,9 @@* - an MC68230 Parallel Interface/Timer configured as 2 parallel ports */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +/*#define DEBUG*/ +#include <linux/module.h> #include <linux/stddef.h> #include <linux/kernel.h>
@@ -54,802 +57,734 @@#include "ariadne.h" -#ifdef ARIADNE_DEBUG int ariadne_debug =ARIADNE_DEBUG ;#else int ariadne_debug =1 ;#endif +/* Macros to Fix Endianness problems */ -/* -* Macros to Fix Endianness problems -*/ - -/* Swap the Bytes in a WORD */ -#define swapw (x) (((x>>8)&0x00ff)|((x<<8)&0xff00)) -/* Get the Low BYTE in a WORD */ -#define lowb (x) (x&0xff) -/* Get the Swapped High WORD in a LONG */ -#define swhighw (x) ((((x)>>8)&0xff00)|(((x)>>24)&0x00ff)) -/* Get the Swapped Low WORD in a LONG */ -#define swloww (x) ((((x)<<8)&0xff00)|(((x)>>8)&0x00ff)) +/* Swap the Bytes in a WORD */ +#define swapw (x) (((x >> 8) & 0x00ff) | ((x << 8) & 0xff00)) +/* Get the Low BYTE in a WORD */ +#define lowb (x) (x & 0xff) +/* Get the Swapped High WORD in a LONG */ +#define swhighw (x) ((((x) >> 8) & 0xff00) | (((x) >> 24) & 0x00ff)) +/* Get the Swapped Low WORD in a LONG */ +#define swloww (x) ((((x) << 8) & 0xff00) | (((x) >> 8) & 0x00ff)) - -/* -* Transmit/Receive Ring Definitions -*/ +/* Transmit/Receive Ring Definitions */ #define TX_RING_SIZE 5#define RX_RING_SIZE 16#define PKT_BUF_SIZE 1520 - -/* -* Private Device Data -*/ +/* Private Device Data */ struct ariadne_private { -volatile struct TDRE *tx_ring[TX_RING_SIZE ]; -volatile struct RDRE *rx_ring[RX_RING_SIZE ]; -volatile u_short *tx_buff[TX_RING_SIZE ]; -volatile u_short *rx_buff[RX_RING_SIZE ]; -int cur_tx, cur_rx;/* The next free ring entry */ -int dirty_tx;/* The ring entries to be free()ed. */ -char tx_full; +volatile struct TDRE *tx_ring[TX_RING_SIZE ]; +volatile struct RDRE *rx_ring[RX_RING_SIZE ]; +volatile u_short *tx_buff[TX_RING_SIZE ]; +volatile u_short *rx_buff[RX_RING_SIZE ]; +int cur_tx, cur_rx;/* The next free ring entry */ +int dirty_tx;/* The ring entries to be free()ed */ +char tx_full; }; - -/* -* Structure Created in the Ariadne's RAM Buffer -*/ +/* Structure Created in the Ariadne's RAM Buffer */ struct lancedata { -struct TDRE tx_ring[TX_RING_SIZE ]; -struct RDRE rx_ring[RX_RING_SIZE ]; -u_short tx_buff[TX_RING_SIZE ][PKT_BUF_SIZE /sizeof (u_short)]; -u_short rx_buff[RX_RING_SIZE ][PKT_BUF_SIZE /sizeof (u_short)]; +struct TDRE tx_ring[TX_RING_SIZE ]; +struct RDRE rx_ring[RX_RING_SIZE ]; +u_short tx_buff[TX_RING_SIZE ][PKT_BUF_SIZE /sizeof (u_short)]; +u_short rx_buff[RX_RING_SIZE ][PKT_BUF_SIZE /sizeof (u_short)]; }; -static int ariadne_open (struct net_device *dev); -static void ariadne_init_ring (struct net_device *dev); -static netdev_tx_t ariadne_start_xmit (struct sk_buff *skb, -struct net_device *dev); -static void ariadne_tx_timeout (struct net_device *dev); -static int ariadne_rx (struct net_device *dev); -static void ariadne_reset (struct net_device *dev); -static irqreturn_t ariadne_interrupt (int irq,void *data); -static int ariadne_close (struct net_device *dev); -static struct net_device_stats *ariadne_get_stats (struct net_device *dev); -static void set_multicast_list (struct net_device *dev); - -static void memcpyw (volatile u_short *dest,u_short *src,int len) { -while (len >=2 ) { - *(dest++) = *(src++); - len -=2 ; - } -if (len ==1 ) - *dest = (*(u_char *)src)<<8 ; +while (len >=2 ) { + *(dest++) = *(src++); + len -=2 ; + } +if (len ==1 ) + *dest = (*(u_char *)src) <<8 ; } +static void ariadne_init_ring (struct net_device *dev) +{ +struct ariadne_private *priv =netdev_priv (dev); +volatile struct lancedata *lancedata = (struct lancedata *)dev->mem_start; +int i; -static int __devinit ariadne_init_one (struct zorro_dev *z, -const struct zorro_device_id *ent); -static void __devexit ariadne_remove_one(struct zorro_dev *z); - - -static struct zorro_device_id ariadne_zorro_tbl[]__devinitdata = { - {ZORRO_PROD_VILLAGE_TRONIC_ARIADNE }, - {0 } -}; -MODULE_DEVICE_TABLE (zorro, ariadne_zorro_tbl); +netif_stop_queue (dev); -static struct zorro_driver ariadne_driver = { - .name ="ariadne" , - .id_table = ariadne_zorro_tbl, - .probe = ariadne_init_one, - .remove =__devexit_p (ariadne_remove_one), -}; + priv->tx_full =0 ; + priv->cur_rx = priv->cur_tx =0 ; + priv->dirty_tx =0 ; + +/* Set up TX Ring */ +for (i =0 ; i <TX_RING_SIZE ; i++) { +volatile struct TDRE *t = &lancedata->tx_ring[i]; + t->TMD0 =swloww (ARIADNE_RAM + + offsetof(struct lancedata, tx_buff[i])); + t->TMD1 =swhighw (ARIADNE_RAM + + offsetof(struct lancedata, tx_buff[i])) | +TF_STP |TF_ENP ; + t->TMD2 =swapw ((u_short)-PKT_BUF_SIZE ); + t->TMD3 =0 ; + priv->tx_ring[i] = &lancedata->tx_ring[i]; + priv->tx_buff[i] = lancedata->tx_buff[i]; +netdev_dbg (dev,"TX Entry %2d at %p, Buf at %p\n" , + i, &lancedata->tx_ring[i], lancedata->tx_buff[i]); + } -static const struct net_device_ops ariadne_netdev_ops = { - .ndo_open = ariadne_open, - .ndo_stop = ariadne_close, - .ndo_start_xmit = ariadne_start_xmit, - .ndo_tx_timeout = ariadne_tx_timeout, - .ndo_get_stats = ariadne_get_stats, - .ndo_set_multicast_list = set_multicast_list, - .ndo_validate_addr = eth_validate_addr, - .ndo_change_mtu = eth_change_mtu, - .ndo_set_mac_address = eth_mac_addr, -}; +/* Set up RX Ring */ +for (i =0 ; i <RX_RING_SIZE ; i++) { +volatile struct RDRE *r = &lancedata->rx_ring[i]; + r->RMD0 =swloww (ARIADNE_RAM + + offsetof(struct lancedata, rx_buff[i])); + r->RMD1 =swhighw (ARIADNE_RAM + + offsetof(struct lancedata, rx_buff[i])) | +RF_OWN ; + r->RMD2 =swapw ((u_short)-PKT_BUF_SIZE ); + r->RMD3 =0x0000 ; + priv->rx_ring[i] = &lancedata->rx_ring[i]; + priv->rx_buff[i] = lancedata->rx_buff[i]; +netdev_dbg (dev,"RX Entry %2d at %p, Buf at %p\n" , + i, &lancedata->rx_ring[i], lancedata->rx_buff[i]); + } +} -static int __devinit ariadne_init_one (struct zorro_dev *z, -const struct zorro_device_id *ent) +static int ariadne_rx (struct net_device *dev) { -unsigned long board = z->resource.start; -unsigned long base_addr = board+ARIADNE_LANCE ; -unsigned long mem_start = board+ARIADNE_RAM ; -struct resource *r1, *r2; -struct net_device *dev; -struct ariadne_private *priv; -int err; - - r1 =request_mem_region (base_addr,sizeof (struct Am79C960 ),"Am79C960" ); -if (!r1) -return -EBUSY ; - r2 =request_mem_region (mem_start,ARIADNE_RAM_SIZE ,"RAM" ); -if (!r2) { -release_mem_region (base_addr,sizeof (struct Am79C960 )); -return -EBUSY ; - } - - dev =alloc_etherdev (sizeof (struct ariadne_private )); -if (dev ==NULL ) { -release_mem_region (base_addr,sizeof (struct Am79C960 )); -release_mem_region (mem_start,ARIADNE_RAM_SIZE ); -return -ENOMEM ; - } - - priv =netdev_priv (dev); - - r1->name = dev->name; - r2->name = dev->name; - - dev->dev_addr[0 ] =0x00 ; - dev->dev_addr[1 ] =0x60 ; - dev->dev_addr[2 ] =0x30 ; - dev->dev_addr[3 ] = (z->rom.er_SerialNumber>>16 ) &0xff ; - dev->dev_addr[4 ] = (z->rom.er_SerialNumber>>8 ) &0xff ; - dev->dev_addr[5 ] = z->rom.er_SerialNumber &0xff ; - dev->base_addr =ZTWO_VADDR (base_addr); - dev->mem_start =ZTWO_VADDR (mem_start); - dev->mem_end = dev->mem_start+ARIADNE_RAM_SIZE ; - - dev->netdev_ops = &ariadne_netdev_ops; - dev->watchdog_timeo =5 *HZ ; - - err =register_netdev (dev); -if (err) { -release_mem_region (base_addr,sizeof (struct Am79C960 )); -release_mem_region (mem_start,ARIADNE_RAM_SIZE ); -free_netdev (dev); -return err; - } -zorro_set_drvdata (z, dev); +struct ariadne_private *priv =netdev_priv (dev); +int entry = priv->cur_rx %RX_RING_SIZE ; +int i; -printk (KERN_INFO "%s: Ariadne at 0x%08lx, Ethernet Address %pM\n" , - dev->name, board, dev->dev_addr); +/* If we own the next entry, it's a new packet. Send it up */ +while (!(lowb (priv->rx_ring[entry]->RMD1) &RF_OWN )) { +int status =lowb (priv->rx_ring[entry]->RMD1); + +if (status != (RF_STP |RF_ENP )) {/* There was an error */ +/* There is a tricky error noted by +* John Murphy <[email protected]> to Russ Nelson: +* Even with full-sized buffers it's possible for a +* jabber packet to use two buffers, with only the +* last correctly noting the error +*/ +/* Only count a general error at the end of a packet */ +if (status &RF_ENP ) + dev->stats.rx_errors++; +if (status &RF_FRAM ) + dev->stats.rx_frame_errors++; +if (status &RF_OFLO ) + dev->stats.rx_over_errors++; +if (status &RF_CRC ) + dev->stats.rx_crc_errors++; +if (status &RF_BUFF ) + dev->stats.rx_fifo_errors++; + priv->rx_ring[entry]->RMD1 &=0xff00 |RF_STP |RF_ENP ; + }else { +/* Malloc up new buffer, compatible with net-3 */ +short pkt_len =swapw (priv->rx_ring[entry]->RMD3); +struct sk_buff *skb; + + skb =dev_alloc_skb (pkt_len +2 ); +if (skb ==NULL ) { +netdev_warn (dev,"Memory squeeze, deferring packet\n" ); +for (i =0 ; i <RX_RING_SIZE ; i++) +if (lowb (priv->rx_ring[(entry + i) %RX_RING_SIZE ]->RMD1) &RF_OWN ) +break ; + +if (i >RX_RING_SIZE -2 ) { + dev->stats.rx_dropped++; + priv->rx_ring[entry]->RMD1 |=RF_OWN ; + priv->cur_rx++; + } +break ; + } + + +skb_reserve (skb,2 );/* 16 byte align */ +skb_put (skb, pkt_len);/* Make room */ +skb_copy_to_linear_data (skb, + (const void *)priv->rx_buff[entry], + pkt_len); + skb->protocol =eth_type_trans (skb, dev); +netdev_dbg (dev,"RX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n" , + ((u_short *)skb->data)[6 ], + skb->data +6 , skb->data, + (int )skb->data, (int )skb->len); + +netif_rx (skb); + dev->stats.rx_packets++; + dev->stats.rx_bytes += pkt_len; + } -return 0 ; -} + priv->rx_ring[entry]->RMD1 |=RF_OWN ; + entry = (++priv->cur_rx) %RX_RING_SIZE ; + } + priv->cur_rx = priv->cur_rx %RX_RING_SIZE ; -static int ariadne_open (struct net_device *dev) -{ -volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; -u_short in; -u_long version; -int i; - -/* Reset the LANCE */ - in = lance->Reset; - -/* Stop the LANCE */ - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ - lance->RDP =STOP ; - -/* Check the LANCE version */ - lance->RAP =CSR88 ;/* Chip ID */ - version =swapw (lance->RDP); - lance->RAP =CSR89 ;/* Chip ID */ - version |=swapw (lance->RDP)<<16 ; -if ((version &0x00000fff ) !=0x00000003 ) { -printk (KERN_WARNING "ariadne_open: Couldn't find AMD Ethernet Chip\n" ); -return -EAGAIN ; - } -if ((version &0x0ffff000 ) !=0x00003000 ) { -printk (KERN_WARNING "ariadne_open: Couldn't find Am79C960 (Wrong part " -"number = %ld)\n" , (version &0x0ffff000 )>>12 ); -return -EAGAIN ; - } -#if 0 -printk (KERN_DEBUG "ariadne_open: Am79C960 (PCnet-ISA) Revision %ld\n" , - (version &0xf0000000 )>>28 ); -#endif +/* We should check that at least two ring entries are free. +* If not, we should free one and mark stats->rx_dropped++ +*/ -ariadne_init_ring (dev); - -/* Miscellaneous Stuff */ - lance->RAP =CSR3 ;/* Interrupt Masks and Deferral Control */ - lance->RDP =0x0000 ; - lance->RAP =CSR4 ;/* Test and Features Control */ - lance->RDP =DPOLL |APAD_XMT |MFCOM |RCVCCOM |TXSTRTM |JABM ; - -/* Set the Multicast Table */ - lance->RAP =CSR8 ;/* Logical Address Filter, LADRF[15:0] */ - lance->RDP =0x0000 ; - lance->RAP =CSR9 ;/* Logical Address Filter, LADRF[31:16] */ - lance->RDP =0x0000 ; - lance->RAP =CSR10 ;/* Logical Address Filter, LADRF[47:32] */ - lance->RDP =0x0000 ; - lance->RAP =CSR11 ;/* Logical Address Filter, LADRF[63:48] */ - lance->RDP =0x0000 ; - -/* Set the Ethernet Hardware Address */ - lance->RAP =CSR12 ;/* Physical Address Register, PADR[15:0] */ - lance->RDP = ((u_short *)&dev->dev_addr[0 ])[0 ]; - lance->RAP =CSR13 ;/* Physical Address Register, PADR[31:16] */ - lance->RDP = ((u_short *)&dev->dev_addr[0 ])[1 ]; - lance->RAP =CSR14 ;/* Physical Address Register, PADR[47:32] */ - lance->RDP = ((u_short *)&dev->dev_addr[0 ])[2 ]; - -/* Set the Init Block Mode */ - lance->RAP =CSR15 ;/* Mode Register */ - lance->RDP =0x0000 ; - -/* Set the Transmit Descriptor Ring Pointer */ - lance->RAP =CSR30 ;/* Base Address of Transmit Ring */ - lance->RDP =swloww (ARIADNE_RAM +offsetof(struct lancedata , tx_ring)); - lance->RAP =CSR31 ;/* Base Address of transmit Ring */ - lance->RDP =swhighw (ARIADNE_RAM +offsetof(struct lancedata , tx_ring)); - -/* Set the Receive Descriptor Ring Pointer */ - lance->RAP =CSR24 ;/* Base Address of Receive Ring */ - lance->RDP =swloww (ARIADNE_RAM +offsetof(struct lancedata , rx_ring)); - lance->RAP =CSR25 ;/* Base Address of Receive Ring */ - lance->RDP =swhighw (ARIADNE_RAM +offsetof(struct lancedata , rx_ring)); - -/* Set the Number of RX and TX Ring Entries */ - lance->RAP =CSR76 ;/* Receive Ring Length */ - lance->RDP =swapw (((u_short)-RX_RING_SIZE )); - lance->RAP =CSR78 ;/* Transmit Ring Length */ - lance->RDP =swapw (((u_short)-TX_RING_SIZE )); - -/* Enable Media Interface Port Auto Select (10BASE-2/10BASE-T) */ - lance->RAP =ISACSR2 ;/* Miscellaneous Configuration */ - lance->IDP =ASEL ; - -/* LED Control */ - lance->RAP =ISACSR5 ;/* LED1 Status */ - lance->IDP =PSE |XMTE ; - lance->RAP =ISACSR6 ;/* LED2 Status */ - lance->IDP =PSE |COLE ; - lance->RAP =ISACSR7 ;/* LED3 Status */ - lance->IDP =PSE |RCVE ; - -netif_start_queue (dev); - - i =request_irq (IRQ_AMIGA_PORTS , ariadne_interrupt,IRQF_SHARED , - dev->name, dev); -if (i)return i; - - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ - lance->RDP =INEA |STRT ; - -return 0 ; +return 0 ; } - -static void ariadne_init_ring (struct net_device *dev) +static irqreturn_t ariadne_interrupt (int irq,void *data) { -struct ariadne_private *priv =netdev_priv (dev); -volatile struct lancedata *lancedata = (struct lancedata *)dev->mem_start; -int i; - -netif_stop_queue (dev); - - priv->tx_full =0 ; - priv->cur_rx = priv->cur_tx =0 ; - priv->dirty_tx =0 ; - -/* Set up TX Ring */ -for (i =0 ; i <TX_RING_SIZE ; i++) { -volatile struct TDRE *t = &lancedata->tx_ring[i]; - t->TMD0 = swloww(ARIADNE_RAM+offsetof(struct lancedata, tx_buff[i])); - t->TMD1 = swhighw(ARIADNE_RAM+offsetof(struct lancedata, tx_buff[i])) | -TF_STP |TF_ENP ; - t->TMD2 =swapw ((u_short)-PKT_BUF_SIZE ); - t->TMD3 =0 ; - priv->tx_ring[i] = &lancedata->tx_ring[i]; - priv->tx_buff[i] = lancedata->tx_buff[i]; -#if 0 -printk (KERN_DEBUG "TX Entry %2d at %p, Buf at %p\n" , i, - &lancedata->tx_ring[i], lancedata->tx_buff[i]); -#endif - } - -/* Set up RX Ring */ -for (i =0 ; i <RX_RING_SIZE ; i++) { -volatile struct RDRE *r = &lancedata->rx_ring[i]; - r->RMD0 = swloww(ARIADNE_RAM+offsetof(struct lancedata, rx_buff[i])); - r->RMD1 = swhighw(ARIADNE_RAM+offsetof(struct lancedata, rx_buff[i])) | -RF_OWN ; - r->RMD2 =swapw ((u_short)-PKT_BUF_SIZE ); - r->RMD3 =0x0000 ; - priv->rx_ring[i] = &lancedata->rx_ring[i]; - priv->rx_buff[i] = lancedata->rx_buff[i]; -#if 0 -printk (KERN_DEBUG "RX Entry %2d at %p, Buf at %p\n" , i, - &lancedata->rx_ring[i], lancedata->rx_buff[i]); +struct net_device *dev = (struct net_device *)data; +volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; +struct ariadne_private *priv; +int csr0, boguscnt; +int handled =0 ; + + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ + +if (!(lance->RDP &INTR ))/* Check if any interrupt has been */ +return IRQ_NONE ;/* generated by the board */ + + priv =netdev_priv (dev); + + boguscnt =10 ; +while ((csr0 = lance->RDP) & (ERR |RINT |TINT ) && --boguscnt >=0 ) { +/* Acknowledge all of the current interrupt sources ASAP */ + lance->RDP = csr0 & ~(INEA |TDMD |STOP |STRT |INIT ); + +#ifdef DEBUG +if (ariadne_debug >5 ) { +netdev_dbg (dev,"interrupt csr0=%#02x new csr=%#02x [" , + csr0, lance->RDP); +if (csr0 &INTR ) +pr_cont (" INTR" ); +if (csr0 &INEA ) +pr_cont (" INEA" ); +if (csr0 &RXON ) +pr_cont (" RXON" ); +if (csr0 &TXON ) +pr_cont (" TXON" ); +if (csr0 &TDMD ) +pr_cont (" TDMD" ); +if (csr0 &STOP ) +pr_cont (" STOP" ); +if (csr0 &STRT ) +pr_cont (" STRT" ); +if (csr0 &INIT ) +pr_cont (" INIT" ); +if (csr0 &ERR ) +pr_cont (" ERR" ); +if (csr0 &BABL ) +pr_cont (" BABL" ); +if (csr0 &CERR ) +pr_cont (" CERR" ); +if (csr0 &MISS ) +pr_cont (" MISS" ); +if (csr0 &MERR ) +pr_cont (" MERR" ); +if (csr0 &RINT ) +pr_cont (" RINT" ); +if (csr0 &TINT ) +pr_cont (" TINT" ); +if (csr0 &IDON ) +pr_cont (" IDON" ); +pr_cont (" ]\n" ); + }#endif - } -} +if (csr0 &RINT ) {/* Rx interrupt */ + handled =1 ; +ariadne_rx (dev); + } -static int ariadne_close (struct net_device *dev) -{ -volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; +if (csr0 &TINT ) {/* Tx-done interrupt */ +int dirty_tx = priv->dirty_tx; + + handled =1 ; +while (dirty_tx < priv->cur_tx) { +int entry = dirty_tx %TX_RING_SIZE ; +int status =lowb (priv->tx_ring[entry]->TMD1); + +if (status &TF_OWN ) +break ;/* It still hasn't been Txed */ + + priv->tx_ring[entry]->TMD1 &=0xff00 ; + +if (status &TF_ERR ) { +/* There was an major error, log it */ +int err_status = priv->tx_ring[entry]->TMD3; + dev->stats.tx_errors++; +if (err_status &EF_RTRY ) + dev->stats.tx_aborted_errors++; +if (err_status &EF_LCAR ) + dev->stats.tx_carrier_errors++; +if (err_status &EF_LCOL ) + dev->stats.tx_window_errors++; +if (err_status &EF_UFLO ) { +/* Ackk! On FIFO errors the Tx unit is turned off! */ + dev->stats.tx_fifo_errors++; +/* Remove this verbosity later! */ +netdev_err (dev,"Tx FIFO error! Status %04x\n" , + csr0); +/* Restart the chip */ + lance->RDP =STRT ; + } + }else { +if (status & (TF_MORE |TF_ONE )) + dev->stats.collisions++; + dev->stats.tx_packets++; + } + dirty_tx++; + } -netif_stop_queue (dev); +#ifndef final_version +if (priv->cur_tx - dirty_tx >=TX_RING_SIZE ) { +netdev_err (dev,"out-of-sync dirty pointer, %d vs. %d, full=%d\n" , + dirty_tx, priv->cur_tx, + priv->tx_full); + dirty_tx +=TX_RING_SIZE ; + } +#endif - lance->RAP =CSR112 ;/* Missed Frame Count */ - dev->stats.rx_missed_errors =swapw (lance->RDP); - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ +if (priv->tx_full &&netif_queue_stopped (dev) && + dirty_tx > priv->cur_tx -TX_RING_SIZE +2 ) { +/* The ring is no longer full */ + priv->tx_full =0 ; +netif_wake_queue (dev); + } -if (ariadne_debug >1 ) { -printk (KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n" , - dev->name, lance->RDP); -printk (KERN_DEBUG "%s: %lu packets missed\n" , dev->name, - dev->stats.rx_missed_errors); - } + priv->dirty_tx = dirty_tx; + } -/* We stop the LANCE here -- it occasionally polls memory if we don't. */ - lance->RDP =STOP ; +/* Log misc errors */ +if (csr0 &BABL ) { + handled =1 ; + dev->stats.tx_errors++;/* Tx babble */ + } +if (csr0 &MISS ) { + handled =1 ; + dev->stats.rx_errors++;/* Missed a Rx frame */ + } +if (csr0 &MERR ) { + handled =1 ; +netdev_err (dev,"Bus master arbitration failure, status %04x\n" , + csr0); +/* Restart the chip */ + lance->RDP =STRT ; + } + } -free_irq (IRQ_AMIGA_PORTS , dev); +/* Clear any other interrupt, and set interrupt enable */ + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ + lance->RDP =INEA |BABL |CERR |MISS |MERR |IDON ; -return 0 ; -} +if (ariadne_debug >4 ) +netdev_dbg (dev,"exiting interrupt, csr%d=%#04x\n" , + lance->RAP, lance->RDP); +return IRQ_RETVAL (handled); +} -static inline void ariadne_reset (struct net_device *dev) +static int ariadne_open (struct net_device *dev) { -volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; - - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ - lance->RDP =STOP ; -ariadne_init_ring (dev); - lance->RDP =INEA |STRT ; -netif_start_queue (dev); -} +volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; +u_short in; +u_long version; +int i; +/* Reset the LANCE */ + in = lance->Reset; + +/* Stop the LANCE */ + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ + lance->RDP =STOP ; + +/* Check the LANCE version */ + lance->RAP =CSR88 ;/* Chip ID */ + version =swapw (lance->RDP); + lance->RAP =CSR89 ;/* Chip ID */ + version |=swapw (lance->RDP) <<16 ; +if ((version &0x00000fff ) !=0x00000003 ) { +pr_warn ("Couldn't find AMD Ethernet Chip\n" ); +return -EAGAIN ; + } +if ((version &0x0ffff000 ) !=0x00003000 ) { +pr_warn ("Couldn't find Am79C960 (Wrong part number = %ld)\n" , + (version &0x0ffff000 ) >>12 ); +return -EAGAIN ; + } -static irqreturn_t ariadne_interrupt (int irq,void *data) -{ -struct net_device *dev = (struct net_device *)data; -volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; -struct ariadne_private *priv; -int csr0, boguscnt; -int handled =0 ; +netdev_dbg (dev,"Am79C960 (PCnet-ISA) Revision %ld\n" , + (version &0xf0000000 ) >>28 ); - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ +ariadne_init_ring (dev); -if (!(lance->RDP &INTR ))/* Check if any interrupt has been */ -return IRQ_NONE ;/* generated by the board. */ +/* Miscellaneous Stuff */ + lance->RAP =CSR3 ;/* Interrupt Masks and Deferral Control */ + lance->RDP =0x0000 ; + lance->RAP =CSR4 ;/* Test and Features Control */ + lance->RDP =DPOLL |APAD_XMT |MFCOM |RCVCCOM |TXSTRTM |JABM ; - priv =netdev_priv (dev); +/* Set the Multicast Table */ + lance->RAP =CSR8 ;/* Logical Address Filter, LADRF[15:0] */ + lance->RDP =0x0000 ; + lance->RAP =CSR9 ;/* Logical Address Filter, LADRF[31:16] */ + lance->RDP =0x0000 ; + lance->RAP =CSR10 ;/* Logical Address Filter, LADRF[47:32] */ + lance->RDP =0x0000 ; + lance->RAP =CSR11 ;/* Logical Address Filter, LADRF[63:48] */ + lance->RDP =0x0000 ; - boguscnt =10 ; -while ((csr0 = lance->RDP) & (ERR |RINT |TINT ) && --boguscnt >=0 ) { -/* Acknowledge all of the current interrupt sources ASAP. */ - lance->RDP = csr0 & ~(INEA |TDMD |STOP |STRT |INIT ); +/* Set the Ethernet Hardware Address */ + lance->RAP =CSR12 ;/* Physical Address Register, PADR[15:0] */ + lance->RDP = ((u_short *)&dev->dev_addr[0 ])[0 ]; + lance->RAP =CSR13 ;/* Physical Address Register, PADR[31:16] */ + lance->RDP = ((u_short *)&dev->dev_addr[0 ])[1 ]; + lance->RAP =CSR14 ;/* Physical Address Register, PADR[47:32] */ + lance->RDP = ((u_short *)&dev->dev_addr[0 ])[2 ]; -#if 0 -if (ariadne_debug >5 ) { -printk (KERN_DEBUG "%s: interrupt csr0=%#2.2x new csr=%#2.2x." , - dev->name, csr0, lance->RDP); -printk ("[" ); -if (csr0 &INTR ) -printk (" INTR" ); -if (csr0 &INEA ) -printk (" INEA" ); -if (csr0 &RXON ) -printk (" RXON" ); -if (csr0 &TXON ) -printk (" TXON" ); -if (csr0 &TDMD ) -printk (" TDMD" ); -if (csr0 &STOP ) -printk (" STOP" ); -if (csr0 &STRT ) -printk (" STRT" ); -if (csr0 &INIT ) -printk (" INIT" ); -if (csr0 &ERR ) -printk (" ERR" ); -if (csr0 &BABL ) -printk (" BABL" ); -if (csr0 &CERR ) -printk (" CERR" ); -if (csr0 &MISS ) -printk (" MISS" ); -if (csr0 &MERR ) -printk (" MERR" ); -if (csr0 &RINT ) -printk (" RINT" ); -if (csr0 &TINT ) -printk (" TINT" ); -if (csr0 &IDON ) -printk (" IDON" ); -printk (" ]\n" ); - } -#endif +/* Set the Init Block Mode */ + lance->RAP =CSR15 ;/* Mode Register */ + lance->RDP =0x0000 ; -if (csr0 &RINT ) {/* Rx interrupt */ - handled =1 ; -ariadne_rx (dev); - } +/* Set the Transmit Descriptor Ring Pointer */ + lance->RAP =CSR30 ;/* Base Address of Transmit Ring */ + lance->RDP =swloww (ARIADNE_RAM + offsetof(struct lancedata , tx_ring)); + lance->RAP =CSR31 ;/* Base Address of transmit Ring */ + lance->RDP =swhighw (ARIADNE_RAM + offsetof(struct lancedata , tx_ring)); + +/* Set the Receive Descriptor Ring Pointer */ + lance->RAP =CSR24 ;/* Base Address of Receive Ring */ + lance->RDP =swloww (ARIADNE_RAM + offsetof(struct lancedata , rx_ring)); + lance->RAP =CSR25 ;/* Base Address of Receive Ring */ + lance->RDP =swhighw (ARIADNE_RAM + offsetof(struct lancedata , rx_ring)); + +/* Set the Number of RX and TX Ring Entries */ + lance->RAP =CSR76 ;/* Receive Ring Length */ + lance->RDP =swapw (((u_short)-RX_RING_SIZE )); + lance->RAP =CSR78 ;/* Transmit Ring Length */ + lance->RDP =swapw (((u_short)-TX_RING_SIZE )); + +/* Enable Media Interface Port Auto Select (10BASE-2/10BASE-T) */ + lance->RAP =ISACSR2 ;/* Miscellaneous Configuration */ + lance->IDP =ASEL ; + +/* LED Control */ + lance->RAP =ISACSR5 ;/* LED1 Status */ + lance->IDP =PSE |XMTE ; + lance->RAP =ISACSR6 ;/* LED2 Status */ + lance->IDP =PSE |COLE ; + lance->RAP =ISACSR7 ;/* LED3 Status */ + lance->IDP =PSE |RCVE ; + +netif_start_queue (dev); + + i =request_irq (IRQ_AMIGA_PORTS , ariadne_interrupt,IRQF_SHARED , + dev->name, dev); +if (i) +return i; + + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ + lance->RDP =INEA |STRT ; + +return 0 ; +} -if (csr0 &TINT ) {/* Tx-done interrupt */ -int dirty_tx = priv->dirty_tx; - - handled =1 ; -while (dirty_tx < priv->cur_tx) { -int entry = dirty_tx %TX_RING_SIZE ; -int status =lowb (priv->tx_ring[entry]->TMD1); - -if (status &TF_OWN ) -break ;/* It still hasn't been Txed */ - - priv->tx_ring[entry]->TMD1 &=0xff00 ; - -if (status &TF_ERR ) { -/* There was an major error, log it. */ -int err_status = priv->tx_ring[entry]->TMD3; - dev->stats.tx_errors++; -if (err_status &EF_RTRY ) - dev->stats.tx_aborted_errors++; -if (err_status &EF_LCAR ) - dev->stats.tx_carrier_errors++; -if (err_status &EF_LCOL ) - dev->stats.tx_window_errors++; -if (err_status &EF_UFLO ) { -/* Ackk! On FIFO errors the Tx unit is turned off! */ - dev->stats.tx_fifo_errors++; -/* Remove this verbosity later! */ -printk (KERN_ERR "%s: Tx FIFO error! Status %4.4x.\n" , - dev->name, csr0); -/* Restart the chip. */ - lance->RDP =STRT ; - } - }else { -if (status & (TF_MORE |TF_ONE )) - dev->stats.collisions++; - dev->stats.tx_packets++; - } - dirty_tx++; - } +static int ariadne_close (struct net_device *dev) +{ +volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; -#ifndef final_version -if (priv->cur_tx - dirty_tx >=TX_RING_SIZE ) { -printk (KERN_ERR "out-of-sync dirty pointer, %d vs. %d, " -"full=%d.\n" , dirty_tx, priv->cur_tx, priv->tx_full); - dirty_tx +=TX_RING_SIZE ; - } -#endif +netif_stop_queue (dev); -if (priv->tx_full &&netif_queue_stopped (dev) && - dirty_tx > priv->cur_tx -TX_RING_SIZE +2 ) { -/* The ring is no longer full. */ - priv->tx_full =0 ; -netif_wake_queue (dev); - } + lance->RAP =CSR112 ;/* Missed Frame Count */ + dev->stats.rx_missed_errors =swapw (lance->RDP); + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ - priv->dirty_tx = dirty_tx; +if (ariadne_debug >1 ) { +netdev_dbg (dev,"Shutting down ethercard, status was %02x\n" , + lance->RDP); +netdev_dbg (dev,"%lu packets missed\n" , + dev->stats.rx_missed_errors); } -/* Log misc errors. */ -if (csr0 &BABL ) { - handled =1 ; - dev->stats.tx_errors++;/* Tx babble. */ - } -if (csr0 &MISS ) { - handled =1 ; - dev->stats.rx_errors++;/* Missed a Rx frame. */ - } -if (csr0 &MERR ) { - handled =1 ; -printk (KERN_ERR "%s: Bus master arbitration failure, status " -"%4.4x.\n" , dev->name, csr0); -/* Restart the chip. */ - lance->RDP =STRT ; - } - } +/* We stop the LANCE here -- it occasionally polls memory if we don't */ + lance->RDP =STOP ; -/* Clear any other interrupt, and set interrupt enable. */ - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ - lance->RDP =INEA |BABL |CERR |MISS |MERR |IDON ; +free_irq (IRQ_AMIGA_PORTS , dev); -#if 0 -if (ariadne_debug >4 ) -printk (KERN_DEBUG "%s: exiting interrupt, csr%d=%#4.4x.\n" , dev->name, - lance->RAP, lance->RDP); -#endif -return IRQ_RETVAL (handled); +return 0 ; } +static inline void ariadne_reset (struct net_device *dev) +{ +volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; + + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ + lance->RDP =STOP ; +ariadne_init_ring (dev); + lance->RDP =INEA |STRT ; +netif_start_queue (dev); +}static void ariadne_tx_timeout (struct net_device *dev) { -volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; +volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; -printk (KERN_ERR "%s: transmit timed out, status %4.4x, resetting.\n" , - dev->name, lance->RDP); -ariadne_reset (dev); -netif_wake_queue (dev); +netdev_err (dev,"transmit timed out, status %04x, resetting\n" , + lance->RDP); +ariadne_reset (dev); +netif_wake_queue (dev); } -static netdev_tx_t ariadne_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct ariadne_private *priv =netdev_priv (dev); -volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; -int entry; -unsigned long flags; -int len = skb->len; - -#if 0 -if (ariadne_debug >3 ) { - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ -printk (KERN_DEBUG "%s: ariadne_start_xmit() called, csr0 %4.4x.\n" , - dev->name, lance->RDP); - lance->RDP =0x0000 ; - } -#endif - -/* FIXME: is the 79C960 new enough to do its own padding right ? */ -if (skb->len <ETH_ZLEN ) - { -if (skb_padto (skb,ETH_ZLEN )) -return NETDEV_TX_OK ; - len =ETH_ZLEN ; - } - -/* Fill in a Tx ring entry */ +struct ariadne_private *priv =netdev_priv (dev); +volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; +int entry; +unsigned long flags; +int len = skb->len;#if 0 -{ -printk (KERN_DEBUG "TX pkt type 0x%04x from %pM to %pM " -" data 0x%08x len %d\n" , - ((u_short *)skb->data)[6 ], - skb->data +6 , skb->data, - (int )skb->data, (int )skb->len); -} +if (ariadne_debug >3 ) { + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ +netdev_dbg (dev,"%s: csr0 %04x\n" , __func__, lance->RDP); + lance->RDP =0x0000 ; + }#endif -local_irq_save (flags); - - entry = priv->cur_tx %TX_RING_SIZE ; - -/* Caution: the write order is important here, set the base address with -the "ownership" bits last. */ - - priv->tx_ring[entry]->TMD2 =swapw ((u_short)-skb->len); - priv->tx_ring[entry]->TMD3 =0x0000 ; -memcpyw (priv->tx_buff[entry], (u_short *)skb->data, len); - -#if 0 - { -int i, len; - - len = skb->len >64 ?64 : skb->len; - len >>=1 ; -for (i =0 ; i < len; i +=8 ) { -int j; -printk (KERN_DEBUG "%04x:" , i); -for (j =0 ; (j <8 ) && ((i+j) < len); j++) { -if (!(j &1 )) -printk (" " ); -printk ("%04x" , priv->tx_buff[entry][i+j]); - } -printk ("\n" ); +/* FIXME: is the 79C960 new enough to do its own padding right ? */ +if (skb->len <ETH_ZLEN ) { +if (skb_padto (skb,ETH_ZLEN )) +return NETDEV_TX_OK ; + len =ETH_ZLEN ; } - } -#endif - priv->tx_ring[entry]->TMD1 = (priv->tx_ring[entry]->TMD1&0xff00 )|TF_OWN |TF_STP |TF_ENP ; +/* Fill in a Tx ring entry */ -dev_kfree_skb (skb); +netdev_dbg (dev,"TX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n" , + ((u_short *)skb->data)[6 ], + skb->data +6 , skb->data, + (int )skb->data, (int )skb->len); - priv->cur_tx++; -if ((priv->cur_tx >=TX_RING_SIZE ) && (priv->dirty_tx >=TX_RING_SIZE )) { +local_irq_save (flags); -#if 0 -printk (KERN_DEBUG "*** Subtracting TX_RING_SIZE from cur_tx (%d) and " -"dirty_tx (%d)\n" , priv->cur_tx, priv->dirty_tx); -#endif + entry = priv->cur_tx %TX_RING_SIZE ; - priv->cur_tx -=TX_RING_SIZE ; - priv->dirty_tx -=TX_RING_SIZE ; - } - dev->stats.tx_bytes += len; +/* Caution: the write order is important here, set the base address with +the "ownership" bits last */ -/* Trigger an immediate send poll. */ - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ - lance->RDP =INEA |TDMD ; + priv->tx_ring[entry]->TMD2 =swapw ((u_short)-skb->len); + priv->tx_ring[entry]->TMD3 =0x0000 ; +memcpyw (priv->tx_buff[entry], (u_short *)skb->data, len); -if (lowb (priv->tx_ring[(entry+1 ) %TX_RING_SIZE ]->TMD1) !=0 ) { -netif_stop_queue (dev); - priv->tx_full =1 ; - } -local_irq_restore (flags); +#ifdef DEBUG +print_hex_dump (KERN_DEBUG ,"tx_buff: " ,DUMP_PREFIX_OFFSET ,16 ,1 , + (void *)priv->tx_buff[entry], + skb->len >64 ?64 : skb->len, true); +#endif -return NETDEV_TX_OK ; -} + priv->tx_ring[entry]->TMD1 = (priv->tx_ring[entry]->TMD1 &0xff00 ) + |TF_OWN |TF_STP |TF_ENP ; +dev_kfree_skb (skb); -static int ariadne_rx (struct net_device *dev) -{ -struct ariadne_private *priv =netdev_priv (dev); -int entry = priv->cur_rx %RX_RING_SIZE ; -int i; - -/* If we own the next entry, it's a new packet. Send it up. */ -while (!(lowb (priv->rx_ring[entry]->RMD1) &RF_OWN )) { -int status =lowb (priv->rx_ring[entry]->RMD1); - -if (status != (RF_STP |RF_ENP )) {/* There was an error. */ -/* There is a tricky error noted by John Murphy, -<[email protected]> to Russ Nelson: Even with full-sized -buffers it's possible for a jabber packet to use two -buffers, with only the last correctly noting the error. */ -if (status &RF_ENP ) -/* Only count a general error at the end of a packet.*/ - dev->stats.rx_errors++; -if (status &RF_FRAM ) - dev->stats.rx_frame_errors++; -if (status &RF_OFLO ) - dev->stats.rx_over_errors++; -if (status &RF_CRC ) - dev->stats.rx_crc_errors++; -if (status &RF_BUFF ) - dev->stats.rx_fifo_errors++; - priv->rx_ring[entry]->RMD1 &=0xff00 |RF_STP |RF_ENP ; - }else { -/* Malloc up new buffer, compatible with net-3. */ -short pkt_len =swapw (priv->rx_ring[entry]->RMD3); -struct sk_buff *skb; - - skb =dev_alloc_skb (pkt_len+2 ); -if (skb ==NULL ) { -printk (KERN_WARNING "%s: Memory squeeze, deferring packet.\n" , - dev->name); -for (i =0 ; i <RX_RING_SIZE ; i++) -if (lowb (priv->rx_ring[(entry+i) %RX_RING_SIZE ]->RMD1) &RF_OWN ) -break ; - -if (i >RX_RING_SIZE -2 ) { - dev->stats.rx_dropped++; - priv->rx_ring[entry]->RMD1 |=RF_OWN ; - priv->cur_rx++; - } -break ; - } + priv->cur_tx++; +if ((priv->cur_tx >=TX_RING_SIZE ) && + (priv->dirty_tx >=TX_RING_SIZE )) { +netdev_dbg (dev,"*** Subtracting TX_RING_SIZE from cur_tx (%d) and dirty_tx (%d)\n" , + priv->cur_tx, priv->dirty_tx); -skb_reserve (skb,2 );/* 16 byte align */ -skb_put (skb,pkt_len);/* Make room */ -skb_copy_to_linear_data (skb, (char *)priv->rx_buff[entry], pkt_len); - skb->protocol=eth_type_trans (skb,dev); -#if 0 -{ -printk (KERN_DEBUG "RX pkt type 0x%04x from " , - ((u_short *)skb->data)[6 ]); - { -u_char *ptr = &((u_char *)skb->data)[6 ]; -printk ("%pM" , ptr); - } -printk (" to " ); - { -u_char *ptr = (u_char *)skb->data; -printk ("%pM" , ptr); - } -printk (" data 0x%08x len %d\n" , (int )skb->data, (int )skb->len); -} -#endif - -netif_rx (skb); - dev->stats.rx_packets++; - dev->stats.rx_bytes += pkt_len; + priv->cur_tx -=TX_RING_SIZE ; + priv->dirty_tx -=TX_RING_SIZE ; } + dev->stats.tx_bytes += len; - priv->rx_ring[entry]->RMD1 |=RF_OWN ; - entry = (++priv->cur_rx) %RX_RING_SIZE ; - } +/* Trigger an immediate send poll */ + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ + lance->RDP =INEA |TDMD ; - priv->cur_rx = priv->cur_rx %RX_RING_SIZE ; - -/* We should check that at least two ring entries are free. If not, -we should free one and mark stats->rx_dropped++. */ +if (lowb (priv->tx_ring[(entry +1 ) %TX_RING_SIZE ]->TMD1) !=0 ) { +netif_stop_queue (dev); + priv->tx_full =1 ; + } +local_irq_restore (flags); -return 0 ; +return NETDEV_TX_OK ; } -static struct net_device_stats *ariadne_get_stats (struct net_device *dev) { -volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; -short saved_addr; -unsigned long flags; - -local_irq_save (flags); - saved_addr = lance->RAP; - lance->RAP =CSR112 ;/* Missed Frame Count */ - dev->stats.rx_missed_errors =swapw (lance->RDP); - lance->RAP = saved_addr; -local_irq_restore (flags); - -return &dev->stats; +volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; +short saved_addr; +unsigned long flags; + +local_irq_save (flags); + saved_addr = lance->RAP; + lance->RAP =CSR112 ;/* Missed Frame Count */ + dev->stats.rx_missed_errors =swapw (lance->RDP); + lance->RAP = saved_addr; +local_irq_restore (flags); + +return &dev->stats; } -/* Set or clear the multicast filter for this adaptor. -num_addrs == -1 Promiscuous mode, receive all packets -num_addrs == 0 Normal mode, clear multicast list -num_addrs > 0 Multicast mode, receive normal and MC packets, and do -best-effort filtering. +* num_addrs == -1 Promiscuous mode, receive all packets +* num_addrs == 0 Normal mode, clear multicast list +* num_addrs > 0 Multicast mode, receive normal and MC packets, +* and do best-effort filtering. */ static void set_multicast_list (struct net_device *dev) { -volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; +volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr; -if (!netif_running (dev)) -return ; +if (!netif_running (dev)) +return ; -netif_stop_queue (dev); +netif_stop_queue (dev); -/* We take the simple way out and always enable promiscuous mode. */ - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ - lance->RDP =STOP ;/* Temporarily stop the lance. */ -ariadne_init_ring (dev); +/* We take the simple way out and always enable promiscuous mode */ + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ + lance->RDP =STOP ;/* Temporarily stop the lance */ +ariadne_init_ring (dev); -if (dev->flags &IFF_PROMISC ) { - lance->RAP =CSR15 ;/* Mode Register */ - lance->RDP =PROM ;/* Set promiscuous mode */ - }else { -short multicast_table[4 ]; -int num_addrs =netdev_mc_count (dev); -int i; -/* We don't use the multicast table, but rely on upper-layer filtering. */ -memset (multicast_table, (num_addrs ==0 ) ?0 :-1 , -sizeof (multicast_table)); -for (i =0 ; i <4 ; i++) { - lance->RAP =CSR8 +(i<<8 );/* Logical Address Filter */ - lance->RDP =swapw (multicast_table[i]); +if (dev->flags &IFF_PROMISC ) { + lance->RAP =CSR15 ;/* Mode Register */ + lance->RDP =PROM ;/* Set promiscuous mode */ + }else { +short multicast_table[4 ]; +int num_addrs =netdev_mc_count (dev); +int i; +/* We don't use the multicast table, +* but rely on upper-layer filtering +*/ +memset (multicast_table, (num_addrs ==0 ) ?0 :-1 , +sizeof (multicast_table)); +for (i =0 ; i <4 ; i++) { + lance->RAP =CSR8 + (i <<8 ); +/* Logical Address Filter */ + lance->RDP =swapw (multicast_table[i]); + } + lance->RAP =CSR15 ;/* Mode Register */ + lance->RDP =0x0000 ;/* Unset promiscuous mode */ } - lance->RAP =CSR15 ;/* Mode Register */ - lance->RDP =0x0000 ;/* Unset promiscuous mode */ - } - lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ - lance->RDP =INEA |STRT |IDON ;/* Resume normal operation. */ + lance->RAP =CSR0 ;/* PCnet-ISA Controller Status */ + lance->RDP =INEA |STRT |IDON ;/* Resume normal operation */ -netif_wake_queue (dev); +netif_wake_queue (dev); } static void __devexit ariadne_remove_one(struct zorro_dev *z) { -struct net_device *dev =zorro_get_drvdata (z); +struct net_device *dev =zorro_get_drvdata (z); -unregister_netdev (dev); -release_mem_region (ZTWO_PADDR (dev->base_addr),sizeof (struct Am79C960 )); -release_mem_region (ZTWO_PADDR (dev->mem_start),ARIADNE_RAM_SIZE ); -free_netdev (dev); +unregister_netdev (dev); +release_mem_region (ZTWO_PADDR (dev->base_addr),sizeof (struct Am79C960 )); +release_mem_region (ZTWO_PADDR (dev->mem_start),ARIADNE_RAM_SIZE ); +free_netdev (dev); } +static struct zorro_device_id ariadne_zorro_tbl[]__devinitdata = { + {ZORRO_PROD_VILLAGE_TRONIC_ARIADNE }, + {0 } +}; +MODULE_DEVICE_TABLE (zorro, ariadne_zorro_tbl); + +static const struct net_device_ops ariadne_netdev_ops = { + .ndo_open = ariadne_open, + .ndo_stop = ariadne_close, + .ndo_start_xmit = ariadne_start_xmit, + .ndo_tx_timeout = ariadne_tx_timeout, + .ndo_get_stats = ariadne_get_stats, + .ndo_set_multicast_list = set_multicast_list, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, +}; + +static int __devinit ariadne_init_one (struct zorro_dev *z, +const struct zorro_device_id *ent) +{ +unsigned long board = z->resource.start; +unsigned long base_addr = board +ARIADNE_LANCE ; +unsigned long mem_start = board +ARIADNE_RAM ; +struct resource *r1, *r2; +struct net_device *dev; +struct ariadne_private *priv; +int err; + + r1 =request_mem_region (base_addr,sizeof (struct Am79C960 ),"Am79C960" ); +if (!r1) +return -EBUSY ; + r2 =request_mem_region (mem_start,ARIADNE_RAM_SIZE ,"RAM" ); +if (!r2) { +release_mem_region (base_addr,sizeof (struct Am79C960 )); +return -EBUSY ; + } + + dev =alloc_etherdev (sizeof (struct ariadne_private )); +if (dev ==NULL ) { +release_mem_region (base_addr,sizeof (struct Am79C960 )); +release_mem_region (mem_start,ARIADNE_RAM_SIZE ); +return -ENOMEM ; + } + + priv =netdev_priv (dev); + + r1->name = dev->name; + r2->name = dev->name; + + dev->dev_addr[0 ] =0x00 ; + dev->dev_addr[1 ] =0x60 ; + dev->dev_addr[2 ] =0x30 ; + dev->dev_addr[3 ] = (z->rom.er_SerialNumber >>16 ) &0xff ; + dev->dev_addr[4 ] = (z->rom.er_SerialNumber >>8 ) &0xff ; + dev->dev_addr[5 ] = z->rom.er_SerialNumber &0xff ; + dev->base_addr =ZTWO_VADDR (base_addr); + dev->mem_start =ZTWO_VADDR (mem_start); + dev->mem_end = dev->mem_start +ARIADNE_RAM_SIZE ; + + dev->netdev_ops = &ariadne_netdev_ops; + dev->watchdog_timeo =5 *HZ ; + + err =register_netdev (dev); +if (err) { +release_mem_region (base_addr,sizeof (struct Am79C960 )); +release_mem_region (mem_start,ARIADNE_RAM_SIZE ); +free_netdev (dev); +return err; + } +zorro_set_drvdata (z, dev); + +netdev_info (dev,"Ariadne at 0x%08lx, Ethernet Address %pM\n" , + board, dev->dev_addr); + +return 0 ; +} + +static struct zorro_driver ariadne_driver = { + .name ="ariadne" , + .id_table = ariadne_zorro_tbl, + .probe = ariadne_init_one, + .remove =__devexit_p (ariadne_remove_one), +}; +static int __init ariadne_init_module (void ) { -return zorro_register_driver (&ariadne_driver); +return zorro_register_driver (&ariadne_driver); } static void __exit ariadne_cleanup_module(void) { -zorro_unregister_driver (&ariadne_driver); +zorro_unregister_driver (&ariadne_driver); }module_init (ariadne_init_module);
Signature · 1 line
1.7.6.rc3
PATCH 2/8 a2065: Use pr_fmt, pr_<level> and netdev_<level>
In reply to Joe PerchesUse current logging styles.
Other miscellaneous cleanups:
Space removal and additions for checkpatch warnings.
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/a2065.c | 336 +++++++++++++++++++++++++-------------------------- 1 files changed, 162 insertions(+), 174 deletions(-)
drivers/net/a2065.c +162 -174
@@ -37,6 +37,11 @@* both 10BASE-2 (thin coax) and AUI (DB-15) connectors */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +/*#define DEBUG*/ +/*#define TEST_HITS*/ +#include <linux/errno.h> #include <linux/netdevice.h> #include <linux/etherdevice.h>
@@ -58,29 +63,22 @@#include "a2065.h" - -/* -* Transmit/Receive Ring Definitions -*/ +/* Transmit/Receive Ring Definitions */ #define LANCE_LOG_TX_BUFFERS (2)#define LANCE_LOG_RX_BUFFERS (4) -#define TX_RING_SIZE (1<<LANCE_LOG_TX_BUFFERS) -#define RX_RING_SIZE (1<<LANCE_LOG_RX_BUFFERS) +#define TX_RING_SIZE (1 << LANCE_LOG_TX_BUFFERS) +#define RX_RING_SIZE (1 << LANCE_LOG_RX_BUFFERS) -#define TX_RING_MOD_MASK (TX_RING_SIZE-1) -#define RX_RING_MOD_MASK (RX_RING_SIZE-1) +#define TX_RING_MOD_MASK (TX_RING_SIZE - 1) +#define RX_RING_MOD_MASK (RX_RING_SIZE - 1)#define PKT_BUF_SIZE (1544)#define RX_BUFF_SIZE PKT_BUF_SIZE#define TX_BUFF_SIZE PKT_BUF_SIZE - -/* -* Layout of the Lance's RAM Buffer -*/ - +/* Layout of the Lance's RAM Buffer */ struct lance_init_block {unsigned short mode;/* Pre-set mode (reg. 15) */
@@ -97,14 +95,11 @@ struct lance_init_block {struct lance_rx_desc brx_ring[RX_RING_SIZE ];struct lance_tx_desc btx_ring[TX_RING_SIZE ]; -char rx_buf [RX_RING_SIZE ][RX_BUFF_SIZE ]; -char tx_buf [TX_RING_SIZE ][TX_BUFF_SIZE ]; +char rx_buf[RX_RING_SIZE ][RX_BUFF_SIZE ]; +char tx_buf[TX_RING_SIZE ][TX_BUFF_SIZE ]; }; - -/* -* Private Device Data -*/ +/* Private Device Data */ struct lance_private {char *name;
@@ -129,21 +124,14 @@ struct lance_private {struct timer_list multicast_timer; }; -#define TX_BUFFS_AVAIL ((lp->tx_old<=lp->tx_new)?\ - lp->tx_old+lp->tx_ring_mod_mask-lp->tx_new:\ - lp->tx_old - lp->tx_new-1) - -#define LANCE_ADDR (x) ((int)(x) & ~0xff000000)/* Load the CSR registers */ -static void load_csrs (struct lance_private *lp) +static void load_csrs (struct lance_private *lp) {volatile struct lance_regs *ll = lp->ll;volatile struct lance_init_block *aib = lp->lance_init_block; -int leptr; - - leptr =LANCE_ADDR (aib); +int leptr =LANCE_ADDR (aib); ll->rap =LE_CSR1 ; ll->rdp = (leptr &0xFFFF );
@@ -156,19 +144,16 @@ static void load_csrs (struct lance_private *lp) ll->rap =LE_CSR0 ; } -#define ZERO 0 -/* Setup the Lance Rx and Tx rings */ -static void lance_init_ring (struct net_device *dev) +static void lance_init_ring (struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_init_block *ib = lp->init_block; -volatile struct lance_init_block *aib;/* for LANCE_ADDR computations */ +volatile struct lance_init_block *aib = lp->lance_init_block; +/* for LANCE_ADDR computations */ int leptr;int i; - aib = lp->lance_init_block; -/* Lock out other processes while setting up hardware */ netif_stop_queue (dev); lp->rx_new = lp->tx_new =0 ;
@@ -179,41 +164,38 @@ static void lance_init_ring (struct net_device *dev)/* Copy the ethernet address to the lance init block * Note that on the sparc you need to swap the ethernet address. */ - ib->phys_addr [0 ] = dev->dev_addr [1 ]; - ib->phys_addr [1 ] = dev->dev_addr [0 ]; - ib->phys_addr [2 ] = dev->dev_addr [3 ]; - ib->phys_addr [3 ] = dev->dev_addr [2 ]; - ib->phys_addr [4 ] = dev->dev_addr [5 ]; - ib->phys_addr [5 ] = dev->dev_addr [4 ]; - -if (ZERO ) -printk (KERN_DEBUG "TX rings:\n" ); + ib->phys_addr[0 ] = dev->dev_addr[1 ]; + ib->phys_addr[1 ] = dev->dev_addr[0 ]; + ib->phys_addr[2 ] = dev->dev_addr[3 ]; + ib->phys_addr[3 ] = dev->dev_addr[2 ]; + ib->phys_addr[4 ] = dev->dev_addr[5 ]; + ib->phys_addr[5 ] = dev->dev_addr[4 ];/* Setup the Tx ring entries */ -for (i =0 ; i <= (1 <<lp->lance_log_tx_bufs); i++) { +netdev_dbg (dev,"TX rings:\n" ); +for (i =0 ; i <=1 << lp->lance_log_tx_bufs; i++) { leptr =LANCE_ADDR (&aib->tx_buf[i][0 ]); - ib->btx_ring [i].tmd0 = leptr; - ib->btx_ring [i].tmd1_hadr = leptr >>16 ; - ib->btx_ring [i].tmd1_bits =0 ; - ib->btx_ring [i].length =0xf000 ;/* The ones required by tmd2 */ - ib->btx_ring [i].misc =0 ; -if (i <3 &&ZERO ) -printk (KERN_DEBUG "%d: 0x%8.8x\n" , i, leptr); + ib->btx_ring[i].tmd0 = leptr; + ib->btx_ring[i].tmd1_hadr = leptr >>16 ; + ib->btx_ring[i].tmd1_bits =0 ; + ib->btx_ring[i].length =0xf000 ;/* The ones required by tmd2 */ + ib->btx_ring[i].misc =0 ; +if (i <3 ) +netdev_dbg (dev,"%d: 0x%08x\n" , i, leptr); }/* Setup the Rx ring entries */ -if (ZERO ) -printk (KERN_DEBUG "RX rings:\n" ); -for (i =0 ; i < (1 <<lp->lance_log_rx_bufs); i++) { +netdev_dbg (dev,"RX rings:\n" ); +for (i =0 ; i <1 << lp->lance_log_rx_bufs; i++) { leptr =LANCE_ADDR (&aib->rx_buf[i][0 ]); - ib->brx_ring [i].rmd0 = leptr; - ib->brx_ring [i].rmd1_hadr = leptr >>16 ; - ib->brx_ring [i].rmd1_bits =LE_R1_OWN ; - ib->brx_ring [i].length = -RX_BUFF_SIZE |0xf000 ; - ib->brx_ring [i].mblength =0 ; -if (i <3 &&ZERO ) -printk (KERN_DEBUG "%d: 0x%8.8x\n" , i, leptr); + ib->brx_ring[i].rmd0 = leptr; + ib->brx_ring[i].rmd1_hadr = leptr >>16 ; + ib->brx_ring[i].rmd1_bits =LE_R1_OWN ; + ib->brx_ring[i].length = -RX_BUFF_SIZE |0xf000 ; + ib->brx_ring[i].mblength =0 ; +if (i <3 ) +netdev_dbg (dev,"%d: 0x%08x\n" , i, leptr); }/* Setup the initialization block */
@@ -222,22 +204,20 @@ static void lance_init_ring (struct net_device *dev) leptr =LANCE_ADDR (&aib->brx_ring); ib->rx_len = (lp->lance_log_rx_bufs <<13 ) | (leptr >>16 ); ib->rx_ptr = leptr; -if (ZERO ) -printk (KERN_DEBUG "RX ptr: %8.8x\n" , leptr); +netdev_dbg (dev,"RX ptr: %08x\n" , leptr);/* Setup tx descriptor pointer */ leptr =LANCE_ADDR (&aib->btx_ring); ib->tx_len = (lp->lance_log_tx_bufs <<13 ) | (leptr >>16 ); ib->tx_ptr = leptr; -if (ZERO ) -printk (KERN_DEBUG "TX ptr: %8.8x\n" , leptr); +netdev_dbg (dev,"TX ptr: %08x\n" , leptr);/* Clear the multicast filter */ - ib->filter [0 ] =0 ; - ib->filter [1 ] =0 ; + ib->filter[0 ] =0 ; + ib->filter[1 ] =0 ; } -static int init_restart_lance (struct lance_private *lp) +static int init_restart_lance (struct lance_private *lp) {volatile struct lance_regs *ll = lp->ll;int i;
@@ -249,8 +229,7 @@ static int init_restart_lance (struct lance_private *lp)for (i =0 ; (i <100 ) && !(ll->rdp & (LE_C0_ERR |LE_C0_IDON )); i++)barrier ();if ((i ==100 ) || (ll->rdp &LE_C0_ERR )) { -printk (KERN_ERR "LANCE unopened after %d ticks, csr0=%4.4x.\n" , - i, ll->rdp); +pr_err ("unopened after %d ticks, csr0=%04x\n" , i, ll->rdp);return -EIO ; }
@@ -261,7 +240,7 @@ static int init_restart_lance (struct lance_private *lp)return 0 ; } -static int lance_rx (struct net_device *dev) +static int lance_rx (struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_init_block *ib = lp->init_block;
@@ -271,22 +250,24 @@ static int lance_rx (struct net_device *dev)#ifdef TEST_HITS int i; -printk (KERN_DEBUG "[" ); +char buf[RX_RING_SIZE +1 ]; +for (i =0 ; i <RX_RING_SIZE ; i++) { +char r1_own = ib->brx_ring[i].rmd1_bits &LE_R1_OWN ;if (i == lp->rx_new) -printk ("%s" , - ib->brx_ring [i].rmd1_bits &LE_R1_OWN ?"_" :"X" ); + buf[i] = r1_own ?'_' :'X' ;else -printk ("%s" , - ib->brx_ring [i].rmd1_bits &LE_R1_OWN ?"." :"1" ); + buf[i] = r1_own ?'.' :'1' ; } -printk ("]\n" ); + buf[RX_RING_SIZE ] =0 ; + +pr_debug ("RxRing TestHits: [%s]\n" , buf);#endif - ll->rdp =LE_C0_RINT |LE_C0_INEA ; -for (rd = &ib->brx_ring [lp->rx_new]; + ll->rdp =LE_C0_RINT |LE_C0_INEA ; +for (rd = &ib->brx_ring[lp->rx_new]; !((bits = rd->rmd1_bits) &LE_R1_OWN ); - rd = &ib->brx_ring [lp->rx_new]) { + rd = &ib->brx_ring[lp->rx_new]) {/* We got an incomplete frame? */ if ((bits &LE_R1_POK ) !=LE_R1_POK ) {
@@ -297,18 +278,22 @@ static int lance_rx (struct net_device *dev)/* Count only the end frame as a rx error, * not the beginning */ -if (bits &LE_R1_BUF ) dev->stats.rx_fifo_errors++; -if (bits &LE_R1_CRC ) dev->stats.rx_crc_errors++; -if (bits &LE_R1_OFL ) dev->stats.rx_over_errors++; -if (bits &LE_R1_FRA ) dev->stats.rx_frame_errors++; -if (bits &LE_R1_EOP ) dev->stats.rx_errors++; +if (bits &LE_R1_BUF ) + dev->stats.rx_fifo_errors++; +if (bits &LE_R1_CRC ) + dev->stats.rx_crc_errors++; +if (bits &LE_R1_OFL ) + dev->stats.rx_over_errors++; +if (bits &LE_R1_FRA ) + dev->stats.rx_frame_errors++; +if (bits &LE_R1_EOP ) + dev->stats.rx_errors++; }else {int len = (rd->mblength &0xfff ) -4 ; -struct sk_buff *skb =dev_alloc_skb (len+2 ); +struct sk_buff *skb =dev_alloc_skb (len +2 );if (!skb) { -printk (KERN_WARNING "%s: Memory squeeze, " -"deferring packet.\n" , dev->name); +netdev_warn (dev,"Memory squeeze, deferring packet\n" ); dev->stats.rx_dropped++; rd->mblength =0 ; rd->rmd1_bits =LE_R1_OWN ;
@@ -316,13 +301,13 @@ static int lance_rx (struct net_device *dev)return 0 ; } -skb_reserve (skb,2 );/* 16 byte align */ -skb_put (skb, len);/* make room */ +skb_reserve (skb,2 );/* 16 byte align */ +skb_put (skb, len);/* make room */ skb_copy_to_linear_data (skb, - (unsigned char *)&(ib->rx_buf [lp->rx_new][0 ]), - len); - skb->protocol =eth_type_trans (skb, dev); -netif_rx (skb); + (unsigned char *)&ib->rx_buf[lp->rx_new][0 ], + len); + skb->protocol =eth_type_trans (skb, dev); +netif_rx (skb); dev->stats.rx_packets++; dev->stats.rx_bytes += len; }
@@ -335,7 +320,7 @@ static int lance_rx (struct net_device *dev)return 0 ; } -static int lance_tx (struct net_device *dev) +static int lance_tx (struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_init_block *ib = lp->init_block;
@@ -350,7 +335,7 @@ static int lance_tx (struct net_device *dev) j = lp->tx_old;for (i = j; i != lp->tx_new; i = j) { - td = &ib->btx_ring [i]; + td = &ib->btx_ring[i];/* If we hit a packet not owned by us, stop */ if (td->tmd1_bits &LE_T1_OWN )
@@ -360,45 +345,44 @@ static int lance_tx (struct net_device *dev) status = td->misc; dev->stats.tx_errors++; -if (status &LE_T3_RTY ) dev->stats.tx_aborted_errors++; -if (status &LE_T3_LCOL ) dev->stats.tx_window_errors++; +if (status &LE_T3_RTY ) + dev->stats.tx_aborted_errors++; +if (status &LE_T3_LCOL ) + dev->stats.tx_window_errors++;if (status &LE_T3_CLOS ) { dev->stats.tx_carrier_errors++;if (lp->auto_select) { lp->tpe =1 - lp->tpe; -printk (KERN_ERR "%s: Carrier Lost, " -"trying %s\n" , dev->name, - lp->tpe?"TPE" :"AUI" ); +netdev_err (dev,"Carrier Lost, trying %s\n" , + lp->tpe ?"TPE" :"AUI" );/* Stop the lance */ ll->rap =LE_CSR0 ; ll->rdp =LE_C0_STOP ; -lance_init_ring (dev); -load_csrs (lp); -init_restart_lance (lp); +lance_init_ring (dev); +load_csrs (lp); +init_restart_lance (lp);return 0 ; } } -/* buffer errors and underflows turn off the transmitter */ -/* Restart the adapter */ -if (status & (LE_T3_BUF |LE_T3_UFL )) { +/* buffer errors and underflows turn off +* the transmitter, so restart the adapter +*/ +if (status & (LE_T3_BUF |LE_T3_UFL )) { dev->stats.tx_fifo_errors++; -printk (KERN_ERR "%s: Tx: ERR_BUF|ERR_UFL, " -"restarting\n" , dev->name); +netdev_err (dev,"Tx: ERR_BUF|ERR_UFL, restarting\n" );/* Stop the lance */ ll->rap =LE_CSR0 ; ll->rdp =LE_C0_STOP ; -lance_init_ring (dev); -load_csrs (lp); -init_restart_lance (lp); +lance_init_ring (dev); +load_csrs (lp); +init_restart_lance (lp);return 0 ; } }else if ((td->tmd1_bits &LE_T1_POK ) ==LE_T1_POK ) { -/* -* So we don't count the packet more than once. -*/ +/* So we don't count the packet more than once. */ td->tmd1_bits &= ~(LE_T1_POK );/* One collision before packet was sent. */
@@ -419,7 +403,14 @@ static int lance_tx (struct net_device *dev)return 0 ; } -static irqreturn_t lance_interrupt (int irq,void *dev_id) +static int lance_tx_buffs_avail (struct lance_private *lp) +{ +if (lp->tx_old <= lp->tx_new) +return lp->tx_old + lp->tx_ring_mod_mask - lp->tx_new; +return lp->tx_old - lp->tx_new -1 ; +} + +static irqreturn_t lance_interrupt (int irq,void *dev_id) {struct net_device *dev = dev_id;struct lance_private *lp =netdev_priv (dev);
@@ -433,19 +424,19 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id)return IRQ_NONE ;/* been generated by the Lance. */ /* Acknowledge all the interrupt sources ASAP */ - ll->rdp = csr0 & ~(LE_C0_INEA |LE_C0_TDMD |LE_C0_STOP |LE_C0_STRT | + ll->rdp = csr0 & ~(LE_C0_INEA |LE_C0_TDMD |LE_C0_STOP |LE_C0_STRT |LE_C0_INIT ); -if ((csr0 &LE_C0_ERR )) { +if (csr0 &LE_C0_ERR ) {/* Clear the error condition */ - ll->rdp =LE_C0_BABL |LE_C0_ERR |LE_C0_MISS |LE_C0_INEA ; + ll->rdp =LE_C0_BABL |LE_C0_ERR |LE_C0_MISS |LE_C0_INEA ; }if (csr0 &LE_C0_RINT ) -lance_rx (dev); +lance_rx (dev);if (csr0 &LE_C0_TINT ) -lance_tx (dev); +lance_tx (dev);/* Log misc errors. */ if (csr0 &LE_C0_BABL )
@@ -453,22 +444,22 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id)if (csr0 &LE_C0_MISS ) dev->stats.rx_errors++;/* Missed a Rx frame. */ if (csr0 &LE_C0_MERR ) { -printk (KERN_ERR "%s: Bus master arbitration failure, status " -"%4.4x.\n" , dev->name, csr0); +netdev_err (dev,"Bus master arbitration failure, status %04x\n" , + csr0);/* Restart the chip. */ ll->rdp =LE_C0_STRT ; } -if (netif_queue_stopped (dev) &&TX_BUFFS_AVAIL >0 ) +if (netif_queue_stopped (dev) &&lance_tx_buffs_avail (lp) >0 )netif_wake_queue (dev); ll->rap =LE_CSR0 ; - ll->rdp =LE_C0_BABL |LE_C0_CERR |LE_C0_MISS |LE_C0_MERR | -LE_C0_IDON |LE_C0_INEA ; + ll->rdp = (LE_C0_BABL |LE_C0_CERR |LE_C0_MISS |LE_C0_MERR | +LE_C0_IDON |LE_C0_INEA );return IRQ_HANDLED ; } -static int lance_open (struct net_device *dev) +static int lance_open (struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
@@ -481,17 +472,18 @@ static int lance_open (struct net_device *dev)/* Install the Interrupt handler */ ret =request_irq (IRQ_AMIGA_PORTS , lance_interrupt,IRQF_SHARED , dev->name, dev); -if (ret)return ret; +if (ret) +return ret; -load_csrs (lp); -lance_init_ring (dev); +load_csrs (lp); +lance_init_ring (dev);netif_start_queue (dev); -return init_restart_lance (lp); +return init_restart_lance (lp); } -static int lance_close (struct net_device *dev) +static int lance_close (struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
@@ -507,7 +499,7 @@ static int lance_close (struct net_device *dev)return 0 ; } -static inline int lance_reset (struct net_device *dev) +static inline int lance_reset (struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
@@ -517,16 +509,15 @@ static inline int lance_reset (struct net_device *dev) ll->rap =LE_CSR0 ; ll->rdp =LE_C0_STOP ; -load_csrs (lp); +load_csrs (lp); -lance_init_ring (dev); +lance_init_ring (dev); dev->trans_start = jiffies;/* prevent tx timeout */ netif_start_queue (dev); - status =init_restart_lance (lp); -#ifdef DEBUG_DRIVER -printk (KERN_DEBUG "Lance restart=%d\n" , status); -#endif + status =init_restart_lance (lp); +netdev_dbg (dev,"Lance restart=%d\n" , status); +return status; }
@@ -535,14 +526,13 @@ static void lance_tx_timeout(struct net_device *dev)struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll; -printk (KERN_ERR "%s: transmit timed out, status %04x, reset\n" , - dev->name, ll->rdp); +netdev_err (dev,"transmit timed out, status %04x, reset\n" , ll->rdp);lance_reset (dev);netif_wake_queue (dev); } -static netdev_tx_t lance_start_xmit (struct sk_buff *skb, -struct net_device *dev) +static netdev_tx_t lance_start_xmit (struct sk_buff *skb, +struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
@@ -557,33 +547,33 @@ static netdev_tx_t lance_start_xmit (struct sk_buff *skb,local_irq_save (flags); -if (!TX_BUFFS_AVAIL ){ +if (!lance_tx_buffs_avail (lp)) {local_irq_restore (flags);return NETDEV_TX_LOCKED ; } -#ifdef DEBUG_DRIVER +#ifdef DEBUG /* dump the packet */ print_hex_dump (KERN_DEBUG ,"skb->data: " ,DUMP_PREFIX_NONE ,16 ,1 , skb->data,64 , true);#endif entry = lp->tx_new & lp->tx_ring_mod_mask; - ib->btx_ring [entry].length = (-skblen) |0xf000 ; - ib->btx_ring [entry].misc =0 ; + ib->btx_ring[entry].length = (-skblen) |0xf000 ; + ib->btx_ring[entry].misc =0 ; -skb_copy_from_linear_data (skb, (void *)&ib->tx_buf [entry][0 ], skblen); +skb_copy_from_linear_data (skb, (void *)&ib->tx_buf[entry][0 ], skblen);/* Now, give the packet to the lance */ - ib->btx_ring [entry].tmd1_bits = (LE_T1_POK |LE_T1_OWN ); + ib->btx_ring[entry].tmd1_bits = (LE_T1_POK |LE_T1_OWN ); lp->tx_new = (lp->tx_new+1 ) & lp->tx_ring_mod_mask; dev->stats.tx_bytes += skblen; -if (TX_BUFFS_AVAIL <=0 ) +if (lance_tx_buffs_avail (lp) <=0 )netif_stop_queue (dev);/* Kick the lance: transmit now */ ll->rdp =LE_C0_INEA |LE_C0_TDMD ; -dev_kfree_skb (skb); +dev_kfree_skb (skb);local_irq_restore (flags);
@@ -591,7 +581,7 @@ static netdev_tx_t lance_start_xmit (struct sk_buff *skb, }/* taken from the depca driver */ -static void lance_load_multicast (struct net_device *dev) +static void lance_load_multicast (struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_init_block *ib = lp->init_block;
@@ -601,14 +591,14 @@ static void lance_load_multicast (struct net_device *dev)u32 crc;/* set all multicast bits */ -if (dev->flags &IFF_ALLMULTI ){ - ib->filter [0 ] =0xffffffff ; - ib->filter [1 ] =0xffffffff ; +if (dev->flags &IFF_ALLMULTI ) { + ib->filter[0 ] =0xffffffff ; + ib->filter[1 ] =0xffffffff ;return ; }/* clear the multicast filter */ - ib->filter [0 ] =0 ; - ib->filter [1 ] =0 ; + ib->filter[0 ] =0 ; + ib->filter[1 ] =0 ;/* Add addresses */ netdev_for_each_mc_addr (ha, dev) {
@@ -620,11 +610,11 @@ static void lance_load_multicast (struct net_device *dev) crc =ether_crc_le (6 , addrs); crc = crc >>26 ; - mcast_table [crc >>4 ] |=1 << (crc &0xf ); + mcast_table[crc >>4 ] |=1 << (crc &0xf ); } } -static void lance_set_multicast (struct net_device *dev) +static void lance_set_multicast (struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_init_block *ib = lp->init_block;
@@ -643,16 +633,16 @@ static void lance_set_multicast (struct net_device *dev) ll->rap =LE_CSR0 ; ll->rdp =LE_C0_STOP ; -lance_init_ring (dev); +lance_init_ring (dev);if (dev->flags &IFF_PROMISC ) { ib->mode |=LE_MO_PROM ; }else { ib->mode &= ~LE_MO_PROM ; -lance_load_multicast (dev); +lance_load_multicast (dev); } -load_csrs (lp); -init_restart_lance (lp); +load_csrs (lp); +init_restart_lance (lp);netif_wake_queue (dev); }
@@ -692,14 +682,12 @@ static int __devinit a2065_init_one(struct zorro_dev *z, {struct net_device *dev;struct lance_private *priv; -unsigned long board, base_addr, mem_start; +unsigned long board = z->resource.start; +unsigned long base_addr = board +A2065_LANCE ; +unsigned long mem_start = board +A2065_RAM ;struct resource *r1, *r2;int err; - board = z->resource.start; - base_addr = board+A2065_LANCE ; - mem_start = board+A2065_RAM ; - r1 =request_mem_region (base_addr,sizeof (struct lance_regs ),"Am7990" );if (!r1)
@@ -730,12 +718,12 @@ static int __devinit a2065_init_one(struct zorro_dev *z, dev->dev_addr[1 ] =0x00 ; dev->dev_addr[2 ] =0x9f ; } - dev->dev_addr[3 ] = (z->rom.er_SerialNumber>>16 ) &0xff ; - dev->dev_addr[4 ] = (z->rom.er_SerialNumber>>8 ) &0xff ; + dev->dev_addr[3 ] = (z->rom.er_SerialNumber >>16 ) &0xff ; + dev->dev_addr[4 ] = (z->rom.er_SerialNumber >>8 ) &0xff ; dev->dev_addr[5 ] = z->rom.er_SerialNumber &0xff ; dev->base_addr =ZTWO_VADDR (base_addr); dev->mem_start =ZTWO_VADDR (mem_start); - dev->mem_end = dev->mem_start+A2065_RAM_SIZE ; + dev->mem_end = dev->mem_start +A2065_RAM_SIZE ; priv->ll = (volatile struct lance_regs *)dev->base_addr; priv->init_block = (struct lance_init_block *)dev->mem_start;
@@ -755,7 +743,7 @@ static int __devinit a2065_init_one(struct zorro_dev *z,init_timer (&priv->multicast_timer); priv->multicast_timer.data = (unsigned long ) dev; priv->multicast_timer.function = - (void (*)(unsigned long )) &lance_set_multicast; + (void (*)(unsigned long ))lance_set_multicast; err =register_netdev (dev);if (err) {
@@ -766,8 +754,8 @@ static int __devinit a2065_init_one(struct zorro_dev *z, }zorro_set_drvdata (z, dev); -printk (KERN_INFO "%s: A2065 at 0x%08lx, Ethernet Address " -"%pM\n" , dev->name, board, dev->dev_addr); +netdev_info (dev,"A2065 at 0x%08lx, Ethernet Address %pM\n" , + board, dev->dev_addr);return 0 ; }
Signature · 1 line
1.7.6.rc3
PATCH 3/8 lib8390: Use pr_<level> and netdev_<level>
In reply to Joe PerchesUse the current logging styles.
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/lib8390.c | 86 ++++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 43 deletions(-)
drivers/net/lib8390.c +43 -43
@@ -267,9 +267,10 @@ static void __ei_tx_timeout(struct net_device *dev) isr =ei_inb (e8390_base+EN0_ISR );spin_unlock_irqrestore (&ei_local->page_lock, flags); -printk (KERN_DEBUG "%s: Tx timed out, %s TSR=%#2x, ISR=%#2x, t=%d.\n" , - dev->name, (txsr &ENTSR_ABT ) ?"excess collisions." : - (isr) ?"lost interrupt?" :"cable problem?" , txsr, isr, tickssofar); +netdev_dbg (dev,"Tx timed out, %s TSR=%#2x, ISR=%#2x, t=%d\n" , + (txsr &ENTSR_ABT ) ?"excess collisions." : + (isr) ?"lost interrupt?" :"cable problem?" , + txsr, isr, tickssofar);if (!isr && !dev->stats.tx_packets) {
@@ -349,22 +350,22 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, output_page = ei_local->tx_start_page; ei_local->tx1 = send_length;if (ei_debug && ei_local->tx2 >0 ) -printk (KERN_DEBUG "%s: idle transmitter tx2=%d, lasttx=%d, txing=%d.\n" , - dev->name, ei_local->tx2, ei_local->lasttx, ei_local->txing); +netdev_dbg (dev,"idle transmitter tx2=%d, lasttx=%d, txing=%d\n" , + ei_local->tx2, ei_local->lasttx, ei_local->txing); }else if (ei_local->tx2 ==0 ) { output_page = ei_local->tx_start_page +TX_PAGES /2 ; ei_local->tx2 = send_length;if (ei_debug && ei_local->tx1 >0 ) -printk (KERN_DEBUG "%s: idle transmitter, tx1=%d, lasttx=%d, txing=%d.\n" , - dev->name, ei_local->tx1, ei_local->lasttx, ei_local->txing); +netdev_dbg (dev,"idle transmitter, tx1=%d, lasttx=%d, txing=%d\n" , + ei_local->tx1, ei_local->lasttx, ei_local->txing); }else {/* We should never get here. */ if (ei_debug) -printk (KERN_DEBUG "%s: No Tx buffers free! tx1=%d tx2=%d last=%d\n" , - dev->name, ei_local->tx1, ei_local->tx2, ei_local->lasttx); +netdev_dbg (dev,"No Tx buffers free! tx1=%d tx2=%d last=%d\n" , + ei_local->tx1, ei_local->tx2, ei_local->lasttx); ei_local->irqlock =0 ;netif_stop_queue (dev);ei_outb_p (ENISR_ALL , e8390_base +EN0_IMR );
@@ -448,9 +449,8 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)* This might just be an interrupt for a PCI device sharing * this line */ -printk ("%s: Interrupted while interrupts are masked!" -" isr=%#2x imr=%#2x.\n" , - dev->name,ei_inb_p (e8390_base +EN0_ISR ), +netdev_err (dev,"Interrupted while interrupts are masked! isr=%#2x imr=%#2x\n" , +ei_inb_p (e8390_base +EN0_ISR ),ei_inb_p (e8390_base +EN0_IMR ));spin_unlock (&ei_local->page_lock);return IRQ_NONE ;
@@ -459,7 +459,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)/* Change to page 0 and read the intr status reg. */ ei_outb_p (E8390_NODMA +E8390_PAGE0 , e8390_base +E8390_CMD );if (ei_debug >3 ) -printk (KERN_DEBUG "%s: interrupt(isr=%#2.2x).\n" , dev->name, +netdev_dbg (dev,"interrupt(isr=%#2.2x)\n" ,ei_inb_p (e8390_base +EN0_ISR ));/* !!Assumption!! -- we stay in page 0. Don't break this. */
@@ -467,7 +467,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) ++nr_serviced < MAX_SERVICE) {if (!netif_running (dev)) { -printk (KERN_WARNING "%s: interrupt from stopped card\n" , dev->name); +netdev_warn (dev,"interrupt from stopped card\n" );/* rmk - acknowledge the interrupts */ ei_outb_p (interrupts, e8390_base +EN0_ISR ); interrupts =0 ;
@@ -510,11 +510,11 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) {/* 0xFF is valid for a card removal */ if (interrupts!=0xFF ) -printk (KERN_WARNING "%s: Too much work at interrupt, status %#2.2x\n" , - dev->name, interrupts); +netdev_warn (dev,"Too much work at interrupt, status %#2.2x\n" , + interrupts);ei_outb_p (ENISR_ALL , e8390_base +EN0_ISR );/* Ack. most intrs. */ } else { -printk (KERN_WARNING "%s: unknown interrupt %#2x\n" , dev->name, interrupts); +netdev_warn (dev,"unknown interrupt %#2x\n" , interrupts);ei_outb_p (0xff , e8390_base +EN0_ISR );/* Ack. all intrs. */ } }
@@ -554,18 +554,18 @@ static void ei_tx_err(struct net_device *dev)unsigned char tx_was_aborted = txsr & (ENTSR_ABT +ENTSR_FU );#ifdef VERBOSE_ERROR_DUMP -printk (KERN_DEBUG "%s: transmitter error (%#2x): " , dev->name, txsr); +netdev_dbg (dev,"transmitter error (%#2x):" , txsr);if (txsr &ENTSR_ABT ) -printk ("excess-collisions " ); +pr_cont (" excess-collisions " );if (txsr &ENTSR_ND ) -printk ("non-deferral " ); +pr_cont (" non-deferral " );if (txsr &ENTSR_CRS ) -printk ("lost-carrier " ); +pr_cont (" lost-carrier " );if (txsr &ENTSR_FU ) -printk ("FIFO-underrun " ); +pr_cont (" FIFO-underrun " );if (txsr &ENTSR_CDH ) -printk ("lost-heartbeat " ); -printk ("\n" ); +pr_cont (" lost-heartbeat " ); +pr_cont ("\n" );#endif ei_outb_p (ENISR_TX_ERR , e8390_base +EN0_ISR );/* Ack intr. */
@@ -606,8 +606,8 @@ static void ei_tx_intr(struct net_device *dev)if (ei_local->tx1 <0 ) {if (ei_local->lasttx !=1 && ei_local->lasttx !=-1 ) -printk (KERN_ERR "%s: bogus last_tx_buffer %d, tx1=%d.\n" , - ei_local->name, ei_local->lasttx, ei_local->tx1); +pr_err ("%s: bogus last_tx_buffer %d, tx1=%d\n" , + ei_local->name, ei_local->lasttx, ei_local->tx1); ei_local->tx1 =0 ;if (ei_local->tx2 >0 ) {
@@ -622,8 +622,8 @@ static void ei_tx_intr(struct net_device *dev)else if (ei_local->tx2 <0 ) {if (ei_local->lasttx !=2 && ei_local->lasttx !=-2 ) -printk ("%s: bogus last_tx_buffer %d, tx2=%d.\n" , - ei_local->name, ei_local->lasttx, ei_local->tx2); +pr_err ("%s: bogus last_tx_buffer %d, tx2=%d\n" , + ei_local->name, ei_local->lasttx, ei_local->tx2); ei_local->tx2 =0 ;if (ei_local->tx1 >0 ) {
@@ -703,8 +703,8 @@ static void ei_receive(struct net_device *dev)is that some clones crash in roughly the same way. */ if (ei_debug >0 && this_frame != ei_local->current_page && (this_frame!=0x0 || rxing_page!=0xFF )) -printk (KERN_ERR "%s: mismatched read page pointers %2x vs %2x.\n" , - dev->name, this_frame, ei_local->current_page); +netdev_err (dev,"mismatched read page pointers %2x vs %2x\n" , + this_frame, ei_local->current_page);if (this_frame == rxing_page)/* Read all the frames? */ break ;/* Done for now */
@@ -733,8 +733,8 @@ static void ei_receive(struct net_device *dev)if (pkt_len <60 || pkt_len >1518 ) {if (ei_debug) -printk (KERN_DEBUG "%s: bogus packet size: %d, status=%#2x nxpg=%#2x.\n" , - dev->name, rx_frame.count, rx_frame.status, +netdev_dbg (dev,"bogus packet size: %d, status=%#2x nxpg=%#2x\n" , + rx_frame.count, rx_frame.status, rx_frame.next); dev->stats.rx_errors++; dev->stats.rx_length_errors++;
@@ -747,8 +747,8 @@ static void ei_receive(struct net_device *dev)if (skb ==NULL ) {if (ei_debug >1 ) -printk (KERN_DEBUG "%s: Couldn't allocate a sk_buff of size %d.\n" , - dev->name, pkt_len); +netdev_dbg (dev,"Couldn't allocate a sk_buff of size %d\n" , + pkt_len); dev->stats.rx_dropped++;break ; }
@@ -769,8 +769,8 @@ static void ei_receive(struct net_device *dev)else {if (ei_debug) -printk (KERN_DEBUG "%s: bogus packet: status=%#2x nxpg=%#2x size=%d\n" , - dev->name, rx_frame.status, rx_frame.next, +netdev_dbg (dev,"bogus packet: status=%#2x nxpg=%#2x size=%d\n" , + rx_frame.status, rx_frame.next, rx_frame.count); dev->stats.rx_errors++;/* NB: The NIC counts CRC, frame and missed errors. */
@@ -781,8 +781,8 @@ static void ei_receive(struct net_device *dev)/* This _should_ never happen: it's here for avoiding bad clones. */ if (next_frame >= ei_local->stop_page) { -printk ("%s: next frame inconsistency, %#2x\n" , dev->name, - next_frame); +netdev_notice (dev,"next frame inconsistency, %#2x\n" , + next_frame); next_frame = ei_local->rx_start_page; } ei_local->current_page = next_frame;
@@ -822,7 +822,7 @@ static void ei_rx_overrun(struct net_device *dev)ei_outb_p (E8390_NODMA +E8390_PAGE0 +E8390_STOP , e8390_base+E8390_CMD );if (ei_debug >1 ) -printk (KERN_DEBUG "%s: Receiver overrun.\n" , dev->name); +netdev_dbg (dev,"Receiver overrun\n" ); dev->stats.rx_over_errors++;/*
@@ -960,7 +960,8 @@ static void do_set_multicast_list(struct net_device *dev)ei_outb_p (ei_local->mcfilter[i], e8390_base +EN1_MULT_SHIFT (i));#ifndef BUG_83C690 if (ei_inb_p (e8390_base +EN1_MULT_SHIFT (i))!=ei_local->mcfilter[i]) -printk (KERN_ERR "Multicast filter read/write mismap %d\n" ,i); +netdev_err (dev,"Multicast filter read/write mismap %d\n" , + i);#endif }ei_outb_p (E8390_NODMA +E8390_PAGE0 , e8390_base +E8390_CMD );
@@ -1072,7 +1073,7 @@ static void __NS8390_init(struct net_device *dev, int startp) {ei_outb_p (dev->dev_addr[i], e8390_base +EN1_PHYS_SHIFT (i));if (ei_debug >1 &&ei_inb_p (e8390_base +EN1_PHYS_SHIFT (i))!=dev->dev_addr[i]) -printk (KERN_ERR "Hw. address read/write mismap %d\n" ,i); +netdev_err (dev,"Hw. address read/write mismap %d\n" , i); }ei_outb_p (ei_local->rx_start_page, e8390_base +EN1_CURPAG );
@@ -1106,8 +1107,7 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length,if (ei_inb_p (e8390_base +E8390_CMD ) &E8390_TRANS ) { -printk (KERN_WARNING "%s: trigger_send() called with the transmitter busy.\n" , - dev->name); +netdev_warn (dev,"trigger_send() called with the transmitter busy\n" );return ; }ei_outb_p (length &0xff , e8390_base +EN0_TCNTLO );
Signature · 1 line
1.7.6.rc3
PATCH 4/8 lib8390: Indent braces appropriately
In reply to Joe PerchesMove the braces around to conform to kernel standard style.
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/lib8390.c | 119 ++++++++++++++++--------------------------------- 1 files changed, 38 insertions(+), 81 deletions(-)
drivers/net/lib8390.c +38 -81
@@ -272,8 +272,7 @@ static void __ei_tx_timeout(struct net_device *dev) (isr) ?"lost interrupt?" :"cable problem?" , txsr, isr, tickssofar); -if (!isr && !dev->stats.tx_packets) - { +if (!isr && !dev->stats.tx_packets) {/* The 8390 probably hasn't gotten on the cable yet. */ ei_local->interface_num ^=1 ;/* Try a different xcvr. */ }
@@ -345,24 +344,19 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb,* card, leaving a substantial gap between each transmitted packet. */ -if (ei_local->tx1 ==0 ) - { +if (ei_local->tx1 ==0 ) { output_page = ei_local->tx_start_page; ei_local->tx1 = send_length;if (ei_debug && ei_local->tx2 >0 )netdev_dbg (dev,"idle transmitter tx2=%d, lasttx=%d, txing=%d\n" , ei_local->tx2, ei_local->lasttx, ei_local->txing); - } -else if (ei_local->tx2 ==0 ) - { + }else if (ei_local->tx2 ==0 ) { output_page = ei_local->tx_start_page +TX_PAGES /2 ; ei_local->tx2 = send_length;if (ei_debug && ei_local->tx1 >0 )netdev_dbg (dev,"idle transmitter, tx1=%d, lasttx=%d, txing=%d\n" , ei_local->tx1, ei_local->lasttx, ei_local->txing); - } -else - {/* We should never get here. */ + }else {/* We should never get here. */ if (ei_debug)netdev_dbg (dev,"No Tx buffers free! tx1=%d tx2=%d last=%d\n" , ei_local->tx1, ei_local->tx2, ei_local->lasttx);
@@ -383,22 +377,18 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb,ei_block_output (dev, send_length, data, output_page); -if (! ei_local->txing) - { +if (! ei_local->txing) { ei_local->txing =1 ;NS8390_trigger_send (dev, send_length, output_page); -if (output_page == ei_local->tx_start_page) - { +if (output_page == ei_local->tx_start_page) { ei_local->tx1 =-1 ; ei_local->lasttx =-1 ; - } -else - { + }else { ei_local->tx2 =-1 ; ei_local->lasttx =-2 ; } - } -else ei_local->txqueue++; + }else + ei_local->txqueue++;if (ei_local->tx1 && ei_local->tx2)netif_stop_queue (dev);
@@ -443,8 +433,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)spin_lock (&ei_local->page_lock); -if (ei_local->irqlock) - { +if (ei_local->irqlock) {/* * This might just be an interrupt for a PCI device sharing * this line
@@ -464,8 +453,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)/* !!Assumption!! -- we stay in page 0. Don't break this. */ while ((interrupts =ei_inb_p (e8390_base +EN0_ISR )) !=0 && - ++nr_serviced <MAX_SERVICE ) - { + ++nr_serviced <MAX_SERVICE ) {if (!netif_running (dev)) {netdev_warn (dev,"interrupt from stopped card\n" );/* rmk - acknowledge the interrupts */
@@ -475,8 +463,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) }if (interrupts &ENISR_OVER )ei_rx_overrun (dev); -else if (interrupts & (ENISR_RX +ENISR_RX_ERR )) - { +else if (interrupts & (ENISR_RX +ENISR_RX_ERR )) {/* Got a good (?) packet. */ ei_receive (dev); }
@@ -486,8 +473,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)else if (interrupts &ENISR_TX_ERR )ei_tx_err (dev); -if (interrupts &ENISR_COUNTERS ) - { +if (interrupts &ENISR_COUNTERS ) { dev->stats.rx_frame_errors +=ei_inb_p (e8390_base +EN0_COUNTER0 ); dev->stats.rx_crc_errors +=ei_inb_p (e8390_base +EN0_COUNTER1 ); dev->stats.rx_missed_errors+=ei_inb_p (e8390_base +EN0_COUNTER2 );
@@ -496,18 +482,14 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)/* Ignore any RDC interrupts that make it back to here. */ if (interrupts &ENISR_RDC ) - {ei_outb_p (ENISR_RDC , e8390_base +EN0_ISR ); - }ei_outb_p (E8390_NODMA +E8390_PAGE0 +E8390_START , e8390_base +E8390_CMD ); } -if (interrupts && ei_debug) - { +if (interrupts && ei_debug) {ei_outb_p (E8390_NODMA +E8390_PAGE0 +E8390_START , e8390_base +E8390_CMD ); -if (nr_serviced >=MAX_SERVICE ) - { +if (nr_serviced >=MAX_SERVICE ) {/* 0xFF is valid for a card removal */ if (interrupts!=0xFF ) netdev_warn(dev, "Too much work at interrupt, status %#2.2x\n",
@@ -572,8 +554,7 @@ static void ei_tx_err(struct net_device *dev)if (tx_was_aborted)ei_tx_intr (dev); -else - { +else { dev->stats.tx_errors++;if (txsr &ENTSR_CRS ) dev->stats.tx_carrier_errors++;if (txsr &ENTSR_CDH ) dev->stats.tx_heartbeat_errors++;
@@ -603,37 +584,31 @@ static void ei_tx_intr(struct net_device *dev)*/ ei_local->txqueue--; -if (ei_local->tx1 <0 ) - { +if (ei_local->tx1 <0 ) {if (ei_local->lasttx !=1 && ei_local->lasttx !=-1 )pr_err ("%s: bogus last_tx_buffer %d, tx1=%d\n" , ei_local->name, ei_local->lasttx, ei_local->tx1); ei_local->tx1 =0 ; -if (ei_local->tx2 >0 ) - { +if (ei_local->tx2 >0 ) { ei_local->txing =1 ;NS8390_trigger_send (dev, ei_local->tx2, ei_local->tx_start_page +6 ); dev->trans_start = jiffies; ei_local->tx2 =-1 , ei_local->lasttx =2 ; - } -else ei_local->lasttx =20 , ei_local->txing =0 ; - } -else if (ei_local->tx2 <0 ) - { + }else + ei_local->lasttx =20 , ei_local->txing =0 ; + }else if (ei_local->tx2 <0 ) {if (ei_local->lasttx !=2 && ei_local->lasttx !=-2 )pr_err ("%s: bogus last_tx_buffer %d, tx2=%d\n" , ei_local->name, ei_local->lasttx, ei_local->tx2); ei_local->tx2 =0 ; -if (ei_local->tx1 >0 ) - { +if (ei_local->tx1 >0 ) { ei_local->txing =1 ;NS8390_trigger_send (dev, ei_local->tx1, ei_local->tx_start_page); dev->trans_start = jiffies; ei_local->tx1 =-1 ; ei_local->lasttx =1 ; - } -else + }else ei_local->lasttx =10 , ei_local->txing =0 ; }// else printk(KERN_WARNING "%s: unexpected TX-done interrupt, lasttx=%d.\n",
@@ -644,11 +619,9 @@ static void ei_tx_intr(struct net_device *dev) dev->stats.collisions++;if (status &ENTSR_PTX ) dev->stats.tx_packets++; -else - { +else { dev->stats.tx_errors++; -if (status &ENTSR_ABT ) - { +if (status &ENTSR_ABT ) { dev->stats.tx_aborted_errors++; dev->stats.collisions +=16 ; }
@@ -682,8 +655,7 @@ static void ei_receive(struct net_device *dev)struct e8390_pkt_hdr rx_frame;int num_rx_pages = ei_local->stop_page-ei_local->rx_start_page; -while (++rx_pkt_count <10 ) - { +while (++rx_pkt_count <10 ) {int pkt_len, pkt_stat;/* Get the rx page (incoming packet pointer). */
@@ -730,30 +702,24 @@ static void ei_receive(struct net_device *dev)continue ; } -if (pkt_len <60 || pkt_len >1518 ) - { +if (pkt_len <60 || pkt_len >1518 ) {if (ei_debug)netdev_dbg (dev,"bogus packet size: %d, status=%#2x nxpg=%#2x\n" , rx_frame.count, rx_frame.status, rx_frame.next); dev->stats.rx_errors++; dev->stats.rx_length_errors++; - } -else if ((pkt_stat &0x0F ) ==ENRSR_RXOK ) - { + }else if ((pkt_stat &0x0F ) ==ENRSR_RXOK ) {struct sk_buff *skb; skb =dev_alloc_skb (pkt_len+2 ); -if (skb ==NULL ) - { +if (skb ==NULL ) {if (ei_debug >1 )netdev_dbg (dev,"Couldn't allocate a sk_buff of size %d\n" , pkt_len); dev->stats.rx_dropped++;break ; - } -else - { + }else {skb_reserve (skb,2 );/* IP headers on 16 byte boundaries */ skb_put (skb, pkt_len);/* Make room */ ei_block_input (dev, pkt_len, skb, current_offset +sizeof (rx_frame));
@@ -765,9 +731,7 @@ static void ei_receive(struct net_device *dev)if (pkt_stat &ENRSR_PHY ) dev->stats.multicast++; } - } -else - { + }else {if (ei_debug) netdev_dbg(dev, "bogus packet: status=%#2x nxpg=%#2x size=%d\n", rx_frame.status, rx_frame.next,
@@ -845,8 +809,7 @@ static void ei_rx_overrun(struct net_device *dev)* step is vital, and skipping it will cause no end of havoc. */ -if (was_txing) - { +if (was_txing) {unsigned char tx_completed =ei_inb_p (e8390_base+EN0_ISR ) & (ENISR_TX +ENISR_TX_ERR );if (!tx_completed) must_resend =1 ;
@@ -930,13 +893,11 @@ static void do_set_multicast_list(struct net_device *dev)int i;struct ei_device *ei_local =netdev_priv (dev); -if (!(dev->flags&(IFF_PROMISC |IFF_ALLMULTI ))) - { +if (!(dev->flags&(IFF_PROMISC |IFF_ALLMULTI ))) {memset (ei_local->mcfilter,0 ,8 );if (!netdev_mc_empty (dev))make_mc_bits (ei_local->mcfilter, dev); - } -else + }else memset (ei_local->mcfilter,0xFF ,8 );/* mcast set to accept-all */ /*
@@ -955,8 +916,7 @@ static void do_set_multicast_list(struct net_device *dev)if (netif_running (dev))ei_outb_p (E8390_RXCONFIG , e8390_base +EN0_RXCR );ei_outb_p (E8390_NODMA +E8390_PAGE1 , e8390_base +E8390_CMD ); -for (i =0 ; i <8 ; i++) - { +for (i =0 ; i <8 ; i++) {ei_outb_p (ei_local->mcfilter[i], e8390_base +EN1_MULT_SHIFT (i));#ifndef BUG_83C690 if (ei_inb_p (e8390_base +EN1_MULT_SHIFT (i))!=ei_local->mcfilter[i])
@@ -1069,8 +1029,7 @@ static void __NS8390_init(struct net_device *dev, int startp)/* Copy the station address into the DS8390 registers. */ ei_outb_p (E8390_NODMA +E8390_PAGE1 +E8390_STOP , e8390_base+E8390_CMD );/* 0x61 */ -for (i =0 ; i <6 ; i++) - { +for (i =0 ; i <6 ; i++) {ei_outb_p (dev->dev_addr[i], e8390_base +EN1_PHYS_SHIFT (i));if (ei_debug >1 &&ei_inb_p (e8390_base +EN1_PHYS_SHIFT (i))!=dev->dev_addr[i])netdev_err (dev,"Hw. address read/write mismap %d\n" , i);
@@ -1082,8 +1041,7 @@ static void __NS8390_init(struct net_device *dev, int startp) ei_local->tx1 = ei_local->tx2 =0 ; ei_local->txing =0 ; -if (startp) - { +if (startp) {ei_outb_p (0xff , e8390_base +EN0_ISR );ei_outb_p (ENISR_ALL , e8390_base +EN0_IMR );ei_outb_p (E8390_NODMA +E8390_PAGE0 +E8390_START , e8390_base+E8390_CMD );
@@ -1105,8 +1063,7 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length,ei_outb_p (E8390_NODMA +E8390_PAGE0 , e8390_base+E8390_CMD ); -if (ei_inb_p (e8390_base +E8390_CMD ) &E8390_TRANS ) - { +if (ei_inb_p (e8390_base +E8390_CMD ) &E8390_TRANS ) {netdev_warn (dev,"trigger_send() called with the transmitter busy\n" );return ; }
Signature · 1 line
1.7.6.rc3
PATCH 5/8 lib8390: Normalize source code spacing
In reply to Joe PerchesMake more conformant to normal kernel style.
Long line lengths > 80 columns ignored.
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/lib8390.c | 81 ++++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 37 deletions(-)
drivers/net/lib8390.c +44 -37
@@ -36,7 +36,7 @@ Paul Gortmaker : tweak ANK's above multicast changes a bit. Paul Gortmaker : update packet statistics for v2.1.x Alan Cox : support arbitrary stupid port mappings on the - 68K Macintosh. Support >16bit I/O spaces + 68K Macintosh. Support >16bit I/O spaces Paul Gortmaker : add kmod support for auto-loading of the 8390 module by all drivers that require it. Alan Cox : Spinlocking work, added 'BUG_83C690'
@@ -206,19 +206,19 @@ static int __ei_open(struct net_device *dev)struct ei_device *ei_local =netdev_priv (dev);if (dev->watchdog_timeo <=0 ) - dev->watchdog_timeo =TX_TIMEOUT ; + dev->watchdog_timeo =TX_TIMEOUT ;/* * Grab the page lock so we own the register set, then call * the init function. */ -spin_lock_irqsave (&ei_local->page_lock, flags); +spin_lock_irqsave (&ei_local->page_lock, flags);__NS8390_init (dev,1 );/* Set the flag before we drop the lock, That way the IRQ arrives after its set and we get no silly warnings */ netif_start_queue (dev); -spin_unlock_irqrestore (&ei_local->page_lock, flags); +spin_unlock_irqrestore (&ei_local->page_lock, flags); ei_local->irqlock =0 ;return 0 ; }
@@ -238,9 +238,9 @@ static int __ei_close(struct net_device *dev)* Hold the page lock during close */ -spin_lock_irqsave (&ei_local->page_lock, flags); +spin_lock_irqsave (&ei_local->page_lock, flags);__NS8390_init (dev,0 ); -spin_unlock_irqrestore (&ei_local->page_lock, flags); +spin_unlock_irqrestore (&ei_local->page_lock, flags);netif_stop_queue (dev);return 0 ; }
@@ -377,7 +377,7 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb,ei_block_output (dev, send_length, data, output_page); -if (! ei_local->txing) { +if (!ei_local->txing) { ei_local->txing =1 ;NS8390_trigger_send (dev, send_length, output_page);if (output_page == ei_local->tx_start_page) {
@@ -402,7 +402,7 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb,spin_unlock (&ei_local->page_lock);enable_irq_lockdep_irqrestore (dev->irq, &flags);skb_tx_timestamp (skb); -dev_kfree_skb (skb); +dev_kfree_skb (skb); dev->stats.tx_bytes += send_length;return NETDEV_TX_OK ;
@@ -476,7 +476,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)if (interrupts &ENISR_COUNTERS ) { dev->stats.rx_frame_errors +=ei_inb_p (e8390_base +EN0_COUNTER0 ); dev->stats.rx_crc_errors +=ei_inb_p (e8390_base +EN0_COUNTER1 ); - dev->stats.rx_missed_errors+=ei_inb_p (e8390_base +EN0_COUNTER2 ); + dev->stats.rx_missed_errors +=ei_inb_p (e8390_base +EN0_COUNTER2 );ei_outb_p (ENISR_COUNTERS , e8390_base +EN0_ISR );/* Ack intr. */ }
@@ -491,7 +491,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)ei_outb_p (E8390_NODMA +E8390_PAGE0 +E8390_START , e8390_base +E8390_CMD );if (nr_serviced >=MAX_SERVICE ) {/* 0xFF is valid for a card removal */ -if (interrupts!=0xFF ) +if (interrupts !=0xFF )netdev_warn (dev,"Too much work at interrupt, status %#2.2x\n" , interrupts);ei_outb_p (ENISR_ALL , e8390_base +EN0_ISR );/* Ack. most intrs. */
@@ -556,9 +556,12 @@ static void ei_tx_err(struct net_device *dev)ei_tx_intr (dev); else { dev->stats.tx_errors++; -if (txsr &ENTSR_CRS ) dev->stats.tx_carrier_errors++; -if (txsr &ENTSR_CDH ) dev->stats.tx_heartbeat_errors++; -if (txsr &ENTSR_OWC ) dev->stats.tx_window_errors++; +if (txsr &ENTSR_CRS ) + dev->stats.tx_carrier_errors++; +if (txsr &ENTSR_CDH ) + dev->stats.tx_heartbeat_errors++; +if (txsr &ENTSR_OWC ) + dev->stats.tx_window_errors++; } }
@@ -610,9 +613,10 @@ static void ei_tx_intr(struct net_device *dev) ei_local->lasttx =1 ; }else ei_local->lasttx =10 , ei_local->txing =0 ; - } -// else printk(KERN_WARNING "%s: unexpected TX-done interrupt, lasttx=%d.\n", -// dev->name, ei_local->lasttx); + }/* else +netdev_warn(dev, "unexpected TX-done interrupt, lasttx=%d\n", +ei_local->lasttx); +*/ /* Minimize Tx latency: update the statistics after we restart TXing. */ if (status &ENTSR_COL )
@@ -674,7 +678,9 @@ static void ei_receive(struct net_device *dev)Keep quiet if it looks like a card removal. One problem here is that some clones crash in roughly the same way. */ -if (ei_debug >0 && this_frame != ei_local->current_page && (this_frame!=0x0 || rxing_page!=0xFF )) +if (ei_debug >0 && + this_frame != ei_local->current_page && + (this_frame !=0x0 || rxing_page !=0xFF ))netdev_err (dev,"mismatched read page pointers %2x vs %2x\n" , this_frame, ei_local->current_page);
@@ -720,10 +726,10 @@ static void ei_receive(struct net_device *dev) dev->stats.rx_dropped++;break ; }else { -skb_reserve (skb,2 );/* IP headers on 16 byte boundaries */ +skb_reserve (skb,2 );/* IP headers on 16 byte boundaries */ skb_put (skb, pkt_len);/* Make room */ ei_block_input (dev, pkt_len, skb, current_offset +sizeof (rx_frame)); - skb->protocol=eth_type_trans (skb,dev); + skb->protocol =eth_type_trans (skb, dev);if (!skb_defer_rx_timestamp (skb))netif_rx (skb); dev->stats.rx_packets++;
@@ -833,7 +839,7 @@ static void ei_rx_overrun(struct net_device *dev)*/ ei_outb_p (E8390_TXCONFIG , e8390_base +EN0_TXCR );if (must_resend) -ei_outb_p (E8390_NODMA +E8390_PAGE0 +E8390_START +E8390_TRANS , e8390_base +E8390_CMD ); +ei_outb_p (E8390_NODMA +E8390_PAGE0 +E8390_START +E8390_TRANS , e8390_base +E8390_CMD ); }/*
@@ -850,11 +856,11 @@ static struct net_device_stats *__ei_get_stats(struct net_device *dev)if (!netif_running (dev))return &dev->stats; -spin_lock_irqsave (&ei_local->page_lock,flags); +spin_lock_irqsave (&ei_local->page_lock, flags);/* Read the counter registers, assuming we are in page 0. */ - dev->stats.rx_frame_errors +=ei_inb_p (ioaddr +EN0_COUNTER0 ); - dev->stats.rx_crc_errors +=ei_inb_p (ioaddr +EN0_COUNTER1 ); - dev->stats.rx_missed_errors+=ei_inb_p (ioaddr +EN0_COUNTER2 ); + dev->stats.rx_frame_errors +=ei_inb_p (ioaddr +EN0_COUNTER0 ); + dev->stats.rx_crc_errors +=ei_inb_p (ioaddr +EN0_COUNTER1 ); + dev->stats.rx_missed_errors +=ei_inb_p (ioaddr +EN0_COUNTER2 );spin_unlock_irqrestore (&ei_local->page_lock, flags);return &dev->stats;
@@ -916,23 +922,23 @@ static void do_set_multicast_list(struct net_device *dev)if (netif_running (dev))ei_outb_p (E8390_RXCONFIG , e8390_base +EN0_RXCR );ei_outb_p (E8390_NODMA +E8390_PAGE1 , e8390_base +E8390_CMD ); -for (i =0 ; i <8 ; i++) { +for (i =0 ; i <8 ; i++) {ei_outb_p (ei_local->mcfilter[i], e8390_base +EN1_MULT_SHIFT (i));#ifndef BUG_83C690 -if (ei_inb_p (e8390_base +EN1_MULT_SHIFT (i))!=ei_local->mcfilter[i]) +if (ei_inb_p (e8390_base +EN1_MULT_SHIFT (i)) != ei_local->mcfilter[i])netdev_err (dev,"Multicast filter read/write mismap %d\n" , i);#endif }ei_outb_p (E8390_NODMA +E8390_PAGE0 , e8390_base +E8390_CMD ); -if (dev->flags&IFF_PROMISC ) -ei_outb_p (E8390_RXCONFIG |0x18 , e8390_base +EN0_RXCR ); +if (dev->flags&IFF_PROMISC ) +ei_outb_p (E8390_RXCONFIG |0x18 , e8390_base +EN0_RXCR );else if (dev->flags &IFF_ALLMULTI || !netdev_mc_empty (dev)) -ei_outb_p (E8390_RXCONFIG |0x08 , e8390_base +EN0_RXCR ); -else -ei_outb_p (E8390_RXCONFIG , e8390_base +EN0_RXCR ); - } +ei_outb_p (E8390_RXCONFIG |0x08 , e8390_base +EN0_RXCR ); +else +ei_outb_p (E8390_RXCONFIG , e8390_base +EN0_RXCR ); +}/* * Called without lock held. This is invoked from user context and may
@@ -1004,8 +1010,8 @@ static void __NS8390_init(struct net_device *dev, int startp) ? (0x48 |ENDCFG_WTS | (ei_local->bigendian ?ENDCFG_BOS :0 )) :0x48 ; -if (sizeof (struct e8390_pkt_hdr )!=4 ) -panic ("8390.c: header struct mispacked\n" ); +if (sizeof (struct e8390_pkt_hdr ) !=4 ) +panic ("8390.c: header struct mispacked\n" );/* Follow National Semi's recommendations for initing the DP83902. */ ei_outb_p (E8390_NODMA +E8390_PAGE0 +E8390_STOP , e8390_base+E8390_CMD );/* 0x21 */ ei_outb_p (endcfg, e8390_base +EN0_DCFG );/* 0x48 or 0x49 */
@@ -1029,9 +1035,10 @@ static void __NS8390_init(struct net_device *dev, int startp)/* Copy the station address into the DS8390 registers. */ ei_outb_p (E8390_NODMA +E8390_PAGE1 +E8390_STOP , e8390_base+E8390_CMD );/* 0x61 */ -for (i =0 ; i <6 ; i++) { +for (i =0 ; i <6 ; i++) {ei_outb_p (dev->dev_addr[i], e8390_base +EN1_PHYS_SHIFT (i)); -if (ei_debug >1 &&ei_inb_p (e8390_base +EN1_PHYS_SHIFT (i))!=dev->dev_addr[i]) +if (ei_debug >1 && +ei_inb_p (e8390_base +EN1_PHYS_SHIFT (i)) != dev->dev_addr[i])netdev_err (dev,"Hw. address read/write mismap %d\n" , i); }
@@ -1059,7 +1066,7 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length, int start_page) {unsigned long e8390_base = dev->base_addr; - struct ei_device *ei_local __attribute((unused)) = netdev_priv(dev); + struct ei_device *ei_local __attribute((unused)) = netdev_priv(dev);ei_outb_p (E8390_NODMA +E8390_PAGE0 , e8390_base+E8390_CMD );
Signature · 1 line
1.7.6.rc3
PATCH 6/8 lib8390: Convert include <asm to include <linux
In reply to Joe PerchesSigned-off-by Joe Perches <[email protected]>
--- drivers/net/lib8390.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/lib8390.c +2 -2
@@ -58,8 +58,8 @@#include <linux/string.h> #include <linux/bitops.h> #include <asm/system.h> -#include <asm/uaccess.h> -#include <asm/io.h> +#include <linux/uaccess.h> +#include <linux/io.h> #include <asm/irq.h> #include <linux/delay.h> #include <linux/errno.h>
Signature · 1 line
1.7.6.rc3
PATCH 7/8 lib8390: Remove unnecessary extern
In reply to Joe PerchesAlready declared in 8390.h
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/lib8390.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/lib8390.c +0 -1
@@ -108,7 +108,6 @@ int ei_debug = 1;/* Index to functions. */ static void ei_tx_intr (struct net_device *dev);static void ei_tx_err (struct net_device *dev); -void ei_tx_timeout (struct net_device *dev);static void ei_receive (struct net_device *dev);static void ei_rx_overrun (struct net_device *dev);
Signature · 1 line
1.7.6.rc3
PATCH 8/8 zorro8390: Update style, neaten, restructure to eliminate prototypes
In reply to Joe PerchesConvert to current logging styles.
Move code blocks to eliminate need for prototypes. Use tabs for code indent and standardize spacing. Comment neatening.
Signed-off-by Joe Perches <[email protected]>
--- drivers/net/zorro8390.c | 673 +++++++++++++++++++++++------------------------ 1 files changed, 333 insertions(+), 340 deletions(-)
drivers/net/zorro8390.c +333 -340
@@ -19,6 +19,8 @@* Ethernet Controllers. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h>
@@ -34,115 +36,242 @@#include <asm/amigaints.h> #include <asm/amigahw.h> -#define EI_SHIFT (x) (ei_local->reg_offset[x]) -#define ei_inb (port) in_8(port) -#define ei_outb (val,port) out_8(port,val) -#define ei_inb_p (port) in_8(port) -#define ei_outb_p (val,port) out_8(port,val) +#define EI_SHIFT (x) (ei_local->reg_offset[x]) +#define ei_inb (port) in_8(port) +#define ei_outb (val, port) out_8(port, val) +#define ei_inb_p (port) in_8(port) +#define ei_outb_p (val, port) out_8(port, val)static const char version[] = -"8390.c:v1.10cvs 9/23/94 Donald Becker ([email protected])\n" ; +"8390.c:v1.10cvs 9/23/94 Donald Becker ([email protected])\n" ;#include "lib8390.c" #define DRV_NAME "zorro8390"#define NE_BASE (dev->base_addr) -#define NE_CMD (0x00*2) -#define NE_DATAPORT (0x10*2)/* NatSemi-defined port window offset. */ -#define NE_RESET (0x1f*2)/* Issue a read to reset, a write to clear. */ -#define NE_IO_EXTENT (0x20*2) - -#define NE_EN0_ISR (0x07*2) -#define NE_EN0_DCFG (0x0e*2) - -#define NE_EN0_RSARLO (0x08*2) -#define NE_EN0_RSARHI (0x09*2) -#define NE_EN0_RCNTLO (0x0a*2) -#define NE_EN0_RXCR (0x0c*2) -#define NE_EN0_TXCR (0x0d*2) -#define NE_EN0_RCNTHI (0x0b*2) -#define NE_EN0_IMR (0x0f*2) +#define NE_CMD (0x00 * 2) +#define NE_DATAPORT (0x10 * 2)/* NatSemi-defined port window offset */ +#define NE_RESET (0x1f * 2)/* Issue a read to reset, +* a write to clear. */ +#define NE_IO_EXTENT (0x20 * 2) + +#define NE_EN0_ISR (0x07 * 2) +#define NE_EN0_DCFG (0x0e * 2) + +#define NE_EN0_RSARLO (0x08 * 2) +#define NE_EN0_RSARHI (0x09 * 2) +#define NE_EN0_RCNTLO (0x0a * 2) +#define NE_EN0_RXCR (0x0c * 2) +#define NE_EN0_TXCR (0x0d * 2) +#define NE_EN0_RCNTHI (0x0b * 2) +#define NE_EN0_IMR (0x0f * 2)#define NESM_START_PG 0x40/* First page of TX buffer */ #define NESM_STOP_PG 0x80/* Last page +1 of RX ring */ - -#define WORDSWAP (a) ((((a)>>8)&0xff) | ((a)<<8)) - +#define WORDSWAP (a) ((((a) >> 8) & 0xff) | ((a) << 8))static struct card_info { -zorro_id id; -const char *name; -unsigned int offset; +zorro_id id; +const char *name; +unsigned int offset; } cards[]__devinitdata = { - {ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2 ,"Ariadne II" ,0x0600 }, - {ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF ,"X-Surf" ,0x8600 }, + {ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2 ,"Ariadne II" ,0x0600 }, + {ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF ,"X-Surf" ,0x8600 }, }; -static int __devinit zorro8390_init_one (struct zorro_dev *z, -const struct zorro_device_id *ent); -static int __devinit zorro8390_init (struct net_device *dev, -unsigned long board,const char *name, -unsigned long ioaddr); -static int zorro8390_open (struct net_device *dev); -static int zorro8390_close (struct net_device *dev); -static void zorro8390_reset_8390 (struct net_device *dev); +/* Hard reset the card. This used to pause for the same period that a +* 8390 reset command required, but that shouldn't be necessary. +*/ +static void zorro8390_reset_8390 (struct net_device *dev) +{ +unsigned long reset_start_time = jiffies; + +if (ei_debug >1 ) +netdev_dbg (dev,"resetting - t=%ld...\n" , jiffies); + +z_writeb (z_readb (NE_BASE +NE_RESET ),NE_BASE +NE_RESET ); + + ei_status.txing =0 ; + ei_status.dmaing =0 ; + +/* This check _should_not_ be necessary, omit eventually. */ +while ((z_readb (NE_BASE +NE_EN0_ISR ) &ENISR_RESET ) ==0 ) +if (time_after (jiffies, reset_start_time +2 *HZ /100 )) { +netdev_warn (dev,"%s: did not complete\n" , __func__); +break ; + } +z_writeb (ENISR_RESET ,NE_BASE +NE_EN0_ISR );/* Ack intr */ +} + +/* Grab the 8390 specific header. Similar to the block_input routine, but +* we don't need to be concerned with ring wrap as the header will be at +* the start of a page, so we optimize accordingly. +*/ static void zorro8390_get_8390_hdr (struct net_device *dev, -struct e8390_pkt_hdr *hdr,int ring_page); +struct e8390_pkt_hdr *hdr,int ring_page) +{ +int nic_base = dev->base_addr; +int cnt; +short *ptrs; + +/* This *shouldn't* happen. +* If it does, it's the last thing you'll see +*/ +if (ei_status.dmaing) { +netdev_err (dev,"%s: DMAing conflict [DMAstat:%d][irqlock:%d]\n" , + __func__, ei_status.dmaing, ei_status.irqlock); +return ; + } + + ei_status.dmaing |=0x01 ; +z_writeb (E8390_NODMA +E8390_PAGE0 +E8390_START , nic_base +NE_CMD ); +z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR ); +z_writeb (sizeof (struct e8390_pkt_hdr ), nic_base +NE_EN0_RCNTLO ); +z_writeb (0 , nic_base +NE_EN0_RCNTHI ); +z_writeb (0 , nic_base +NE_EN0_RSARLO );/* On page boundary */ +z_writeb (ring_page, nic_base +NE_EN0_RSARHI ); +z_writeb (E8390_RREAD +E8390_START , nic_base +NE_CMD ); + + ptrs = (short *)hdr; +for (cnt =0 ; cnt <sizeof (struct e8390_pkt_hdr ) >>1 ; cnt++) + *ptrs++ =z_readw (NE_BASE +NE_DATAPORT ); + +z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR );/* Ack intr */ + + hdr->count =WORDSWAP (hdr->count); + + ei_status.dmaing &= ~0x01 ; +} + +/* Block input and output, similar to the Crynwr packet driver. +* If you are porting to a new ethercard, look at the packet driver source +* for hints. The NEx000 doesn't share the on-board packet memory -- +* you have to put the packet out through the "remote DMA" dataport +* using z_writeb. +*/ static void zorro8390_block_input (struct net_device *dev,int count, -struct sk_buff *skb,int ring_offset); -static void zorro8390_block_output (struct net_device *dev,const int count, +struct sk_buff *skb,int ring_offset) +{ +int nic_base = dev->base_addr; +char *buf = skb->data; +short *ptrs; +int cnt; + +/* This *shouldn't* happen. +* If it does, it's the last thing you'll see +*/ +if (ei_status.dmaing) { +netdev_err (dev,"%s: DMAing conflict [DMAstat:%d][irqlock:%d]\n" , + __func__, ei_status.dmaing, ei_status.irqlock); +return ; + } + ei_status.dmaing |=0x01 ; +z_writeb (E8390_NODMA +E8390_PAGE0 +E8390_START , nic_base +NE_CMD ); +z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR ); +z_writeb (count &0xff , nic_base +NE_EN0_RCNTLO ); +z_writeb (count >>8 , nic_base +NE_EN0_RCNTHI ); +z_writeb (ring_offset &0xff , nic_base +NE_EN0_RSARLO ); +z_writeb (ring_offset >>8 , nic_base +NE_EN0_RSARHI ); +z_writeb (E8390_RREAD +E8390_START , nic_base +NE_CMD ); + ptrs = (short *)buf; +for (cnt =0 ; cnt < count >>1 ; cnt++) + *ptrs++ =z_readw (NE_BASE +NE_DATAPORT ); +if (count &0x01 ) + buf[count -1 ] =z_readb (NE_BASE +NE_DATAPORT ); + +z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR );/* Ack intr */ + ei_status.dmaing &= ~0x01 ; +} + +static void zorro8390_block_output (struct net_device *dev,int count,const unsigned char *buf, -const int start_page); -static void __devexit zorro8390_remove_one(struct zorro_dev *z); +const int start_page) +{ +int nic_base =NE_BASE ; +unsigned long dma_start; +short *ptrs; +int cnt; + +/* Round the count up for word writes. Do we need to do this? +* What effect will an odd byte count have on the 8390? +* I should check someday. +*/ +if (count &0x01 ) + count++; + +/* This *shouldn't* happen. +* If it does, it's the last thing you'll see +*/ +if (ei_status.dmaing) { +netdev_err (dev,"%s: DMAing conflict [DMAstat:%d][irqlock:%d]\n" , + __func__, ei_status.dmaing, ei_status.irqlock); +return ; + } + ei_status.dmaing |=0x01 ; +/* We should already be in page 0, but to be safe... */ +z_writeb (E8390_PAGE0 +E8390_START +E8390_NODMA , nic_base +NE_CMD ); + +z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR ); + +/* Now the normal output. */ +z_writeb (count &0xff , nic_base +NE_EN0_RCNTLO ); +z_writeb (count >>8 , nic_base +NE_EN0_RCNTHI ); +z_writeb (0x00 , nic_base +NE_EN0_RSARLO ); +z_writeb (start_page, nic_base +NE_EN0_RSARHI ); + +z_writeb (E8390_RWRITE +E8390_START , nic_base +NE_CMD ); + ptrs = (short *)buf; +for (cnt =0 ; cnt < count >>1 ; cnt++) +z_writew (*ptrs++,NE_BASE +NE_DATAPORT ); + + dma_start = jiffies; + +while ((z_readb (NE_BASE +NE_EN0_ISR ) &ENISR_RDC ) ==0 ) +if (time_after (jiffies, dma_start +2 *HZ /100 )) { +/* 20ms */ +netdev_err (dev,"timeout waiting for Tx RDC\n" ); +zorro8390_reset_8390 (dev); +__NS8390_init (dev,1 ); +break ; + } + +z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR );/* Ack intr */ + ei_status.dmaing &= ~0x01 ; +} -static struct zorro_device_id zorro8390_zorro_tbl[]__devinitdata = { - {ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2 , }, - {ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF , }, - {0 } -}; -MODULE_DEVICE_TABLE (zorro, zorro8390_zorro_tbl); +static int zorro8390_open (struct net_device *dev) +{ +__ei_open (dev); +return 0 ; +} -static struct zorro_driver zorro8390_driver = { - .name ="zorro8390" , - .id_table = zorro8390_zorro_tbl, - .probe = zorro8390_init_one, - .remove =__devexit_p (zorro8390_remove_one), -}; +static int zorro8390_close (struct net_device *dev) +{ +if (ei_debug >1 ) +netdev_dbg (dev,"Shutting down ethercard\n" ); +__ei_close (dev); +return 0 ; +} -static int __devinit zorro8390_init_one (struct zorro_dev *z, -const struct zorro_device_id *ent) +static void __devexit zorro8390_remove_one(struct zorro_dev *z) { -struct net_device *dev; -unsigned long board, ioaddr; -int err, i; - -for (i =ARRAY_SIZE (cards)-1 ; i >=0 ; i--) -if (z->id == cards[i].id) -break ; -if (i <0 ) -return -ENODEV ; - - board = z->resource.start; - ioaddr = board+cards[i].offset; - dev =____alloc_ei_netdev (0 ); -if (!dev) -return -ENOMEM ; -if (!request_mem_region (ioaddr,NE_IO_EXTENT *2 ,DRV_NAME )) { -free_netdev (dev); -return -EBUSY ; - } -if ((err =zorro8390_init (dev, board, cards[i].name, -ZTWO_VADDR (ioaddr)))) { -release_mem_region (ioaddr,NE_IO_EXTENT *2 ); +struct net_device *dev =zorro_get_drvdata (z); + +unregister_netdev (dev); +free_irq (IRQ_AMIGA_PORTS , dev); +release_mem_region (ZTWO_PADDR (dev->base_addr),NE_IO_EXTENT *2 );free_netdev (dev); -return err; - } -zorro_set_drvdata (z, dev); -return 0 ; } +static struct zorro_device_id zorro8390_zorro_tbl[]__devinitdata = { + {ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2 , }, + {ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF , }, + {0 } +}; +MODULE_DEVICE_TABLE (zorro, zorro8390_zorro_tbl); +static const struct net_device_ops zorro8390_netdev_ops = { .ndo_open = zorro8390_open, .ndo_stop = zorro8390_close,
@@ -151,7 +280,7 @@ static const struct net_device_ops zorro8390_netdev_ops = { .ndo_get_stats = __ei_get_stats, .ndo_set_multicast_list = __ei_set_multicast_list, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = __ei_poll,
@@ -162,295 +291,159 @@ static int __devinit zorro8390_init(struct net_device *dev, unsigned long board, const char *name, unsigned long ioaddr) { - int i; -int err; -unsigned char SA_prom[32 ]; -int start_page, stop_page; -static u32 zorro8390_offsets[16 ] = { -0x00 ,0x02 ,0x04 ,0x06 ,0x08 ,0x0a ,0x0c ,0x0e , -0x10 ,0x12 ,0x14 ,0x16 ,0x18 ,0x1a ,0x1c ,0x1e , - }; - -/* Reset card. Who knows what dain-bramaged state it was left in. */ - { -unsigned long reset_start_time = jiffies; - -z_writeb (z_readb (ioaddr +NE_RESET ), ioaddr +NE_RESET ); - -while ((z_readb (ioaddr +NE_EN0_ISR ) &ENISR_RESET ) ==0 ) -if (time_after (jiffies, reset_start_time +2 *HZ /100 )) { -printk (KERN_WARNING " not found (no reset ack).\n" ); -return -ENODEV ; - } - -z_writeb (0xff , ioaddr +NE_EN0_ISR );/* Ack all intr. */ - } - -/* Read the 16 bytes of station address PROM. -We must first initialize registers, similar to NS8390_init(eifdev, 0). -We can't reliably read the SAPROM address without this. -(I learned the hard way!). */ - { -struct { -u32 value; -u32 offset; - } program_seq[] = { - {E8390_NODMA +E8390_PAGE0 +E8390_STOP ,NE_CMD },/* Select page 0*/ - {0x48 ,NE_EN0_DCFG },/* Set byte-wide (0x48) access. */ - {0x00 ,NE_EN0_RCNTLO },/* Clear the count regs. */ - {0x00 ,NE_EN0_RCNTHI }, - {0x00 ,NE_EN0_IMR },/* Mask completion irq. */ - {0xFF ,NE_EN0_ISR }, - {E8390_RXOFF ,NE_EN0_RXCR },/* 0x20 Set to monitor */ - {E8390_TXOFF ,NE_EN0_TXCR },/* 0x02 and loopback mode. */ - {32 ,NE_EN0_RCNTLO }, - {0x00 ,NE_EN0_RCNTHI }, - {0x00 ,NE_EN0_RSARLO },/* DMA starting at 0x0000. */ - {0x00 ,NE_EN0_RSARHI }, - {E8390_RREAD +E8390_START ,NE_CMD }, + int i; +int err; +unsigned char SA_prom[32 ]; +int start_page, stop_page; +static u32 zorro8390_offsets[16 ] = { +0x00 ,0x02 ,0x04 ,0x06 ,0x08 ,0x0a ,0x0c ,0x0e , +0x10 ,0x12 ,0x14 ,0x16 ,0x18 ,0x1a ,0x1c ,0x1e , }; -for (i =0 ; i <ARRAY_SIZE (program_seq); i++) { -z_writeb (program_seq[i].value, ioaddr + program_seq[i].offset); - } - } -for (i =0 ; i <16 ; i++) { - SA_prom[i] =z_readb (ioaddr +NE_DATAPORT ); - (void )z_readb (ioaddr +NE_DATAPORT ); - } -/* We must set the 8390 for word mode. */ -z_writeb (0x49 , ioaddr +NE_EN0_DCFG ); - start_page =NESM_START_PG ; - stop_page =NESM_STOP_PG ; +/* Reset card. Who knows what dain-bramaged state it was left in. */ + { +unsigned long reset_start_time = jiffies; - dev->base_addr = ioaddr; - dev->irq =IRQ_AMIGA_PORTS ; +z_writeb (z_readb (ioaddr +NE_RESET ), ioaddr +NE_RESET ); -/* Install the Interrupt handler */ - i =request_irq (IRQ_AMIGA_PORTS , __ei_interrupt,IRQF_SHARED ,DRV_NAME , dev); -if (i)return i; +while ((z_readb (ioaddr +NE_EN0_ISR ) &ENISR_RESET ) ==0 ) +if (time_after (jiffies, + reset_start_time +2 *HZ /100 )) { +netdev_warn (dev,"not found (no reset ack)\n" ); +return -ENODEV ; + } -for (i =0 ; i <ETHER_ADDR_LEN ; i++) - dev->dev_addr[i] = SA_prom[i]; - -#ifdef DEBUG -printk ("%pM" , dev->dev_addr); -#endif +z_writeb (0xff , ioaddr +NE_EN0_ISR );/* Ack all intr. */ + } - ei_status.name = name; - ei_status.tx_start_page = start_page; - ei_status.stop_page = stop_page; - ei_status.word16 =1 ; +/* Read the 16 bytes of station address PROM. +* We must first initialize registers, +* similar to NS8390_init(eifdev, 0). +* We can't reliably read the SAPROM address without this. +* (I learned the hard way!). +*/ + { +static const struct { +u32 value; +u32 offset; + } program_seq[] = { + {E8390_NODMA +E8390_PAGE0 +E8390_STOP ,NE_CMD }, +/* Select page 0 */ + {0x48 ,NE_EN0_DCFG },/* 0x48: Set byte-wide access */ + {0x00 ,NE_EN0_RCNTLO },/* Clear the count regs */ + {0x00 ,NE_EN0_RCNTHI }, + {0x00 ,NE_EN0_IMR },/* Mask completion irq */ + {0xFF ,NE_EN0_ISR }, + {E8390_RXOFF ,NE_EN0_RXCR },/* 0x20 Set to monitor */ + {E8390_TXOFF ,NE_EN0_TXCR },/* 0x02 and loopback mode */ + {32 ,NE_EN0_RCNTLO }, + {0x00 ,NE_EN0_RCNTHI }, + {0x00 ,NE_EN0_RSARLO },/* DMA starting at 0x0000 */ + {0x00 ,NE_EN0_RSARHI }, + {E8390_RREAD +E8390_START ,NE_CMD }, + }; +for (i =0 ; i <ARRAY_SIZE (program_seq); i++) +z_writeb (program_seq[i].value, + ioaddr + program_seq[i].offset); + } +for (i =0 ; i <16 ; i++) { + SA_prom[i] =z_readb (ioaddr +NE_DATAPORT ); + (void )z_readb (ioaddr +NE_DATAPORT ); + } - ei_status.rx_start_page = start_page +TX_PAGES ; +/* We must set the 8390 for word mode. */ +z_writeb (0x49 , ioaddr +NE_EN0_DCFG ); + start_page =NESM_START_PG ; + stop_page =NESM_STOP_PG ; - ei_status.reset_8390 = &zorro8390_reset_8390; - ei_status.block_input = &zorro8390_block_input; - ei_status.block_output = &zorro8390_block_output; - ei_status.get_8390_hdr = &zorro8390_get_8390_hdr; - ei_status.reg_offset = zorro8390_offsets; + dev->base_addr = ioaddr; + dev->irq =IRQ_AMIGA_PORTS ; - dev->netdev_ops = &zorro8390_netdev_ops; -__NS8390_init (dev,0 ); - err =register_netdev (dev); -if (err) { -free_irq (IRQ_AMIGA_PORTS , dev); -return err; - } +/* Install the Interrupt handler */ + i =request_irq (IRQ_AMIGA_PORTS , __ei_interrupt, +IRQF_SHARED ,DRV_NAME , dev); +if (i) +return i; -printk (KERN_INFO "%s: %s at 0x%08lx, Ethernet Address %pM\n" , - dev->name, name, board, dev->dev_addr); +for (i =0 ; i <ETHER_ADDR_LEN ; i++) + dev->dev_addr[i] = SA_prom[i]; -return 0 ; -} +pr_debug ("Found ethernet address: %pM\n" , dev->dev_addr); -static int zorro8390_open (struct net_device *dev) -{ -__ei_open (dev); -return 0 ; -} + ei_status.name = name; + ei_status.tx_start_page = start_page; + ei_status.stop_page = stop_page; + ei_status.word16 =1 ; -static int zorro8390_close (struct net_device *dev) -{ -if (ei_debug >1 ) -printk (KERN_DEBUG "%s: Shutting down ethercard.\n" , dev->name); -__ei_close (dev); -return 0 ; -} + ei_status.rx_start_page = start_page +TX_PAGES ; -/* Hard reset the card. This used to pause for the same period that a -8390 reset command required, but that shouldn't be necessary. */ -static void zorro8390_reset_8390 (struct net_device *dev) -{ -unsigned long reset_start_time = jiffies; + ei_status.reset_8390 = zorro8390_reset_8390; + ei_status.block_input = zorro8390_block_input; + ei_status.block_output = zorro8390_block_output; + ei_status.get_8390_hdr = zorro8390_get_8390_hdr; + ei_status.reg_offset = zorro8390_offsets; -if (ei_debug >1 ) -printk (KERN_DEBUG "resetting the 8390 t=%ld...\n" , jiffies); - -z_writeb (z_readb (NE_BASE +NE_RESET ),NE_BASE +NE_RESET ); - - ei_status.txing =0 ; - ei_status.dmaing =0 ; - -/* This check _should_not_ be necessary, omit eventually. */ -while ((z_readb (NE_BASE +NE_EN0_ISR ) &ENISR_RESET ) ==0 ) -if (time_after (jiffies, reset_start_time +2 *HZ /100 )) { -printk (KERN_WARNING "%s: ne_reset_8390() did not complete.\n" , - dev->name); -break ; + dev->netdev_ops = &zorro8390_netdev_ops; +__NS8390_init (dev,0 ); + err =register_netdev (dev); +if (err) { +free_irq (IRQ_AMIGA_PORTS , dev); +return err; } -z_writeb (ENISR_RESET ,NE_BASE +NE_EN0_ISR );/* Ack intr. */ -} -/* Grab the 8390 specific header. Similar to the block_input routine, but -we don't need to be concerned with ring wrap as the header will be at -the start of a page, so we optimize accordingly. */ +netdev_info (dev,"%s at 0x%08lx, Ethernet Address %pM\n" , + name, board, dev->dev_addr); -static void zorro8390_get_8390_hdr (struct net_device *dev, -struct e8390_pkt_hdr *hdr,int ring_page) -{ -int nic_base = dev->base_addr; -int cnt; -short *ptrs; - -/* This *shouldn't* happen. If it does, it's the last thing you'll see */ -if (ei_status.dmaing) { -printk (KERN_ERR "%s: DMAing conflict in ne_get_8390_hdr " -"[DMAstat:%d][irqlock:%d].\n" , dev->name, ei_status.dmaing, - ei_status.irqlock); -return ; - } - - ei_status.dmaing |=0x01 ; -z_writeb (E8390_NODMA +E8390_PAGE0 +E8390_START , nic_base+NE_CMD ); -z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR ); -z_writeb (sizeof (struct e8390_pkt_hdr ), nic_base +NE_EN0_RCNTLO ); -z_writeb (0 , nic_base +NE_EN0_RCNTHI ); -z_writeb (0 , nic_base +NE_EN0_RSARLO );/* On page boundary */ -z_writeb (ring_page, nic_base +NE_EN0_RSARHI ); -z_writeb (E8390_RREAD +E8390_START , nic_base +NE_CMD ); - - ptrs = (short *)hdr; -for (cnt =0 ; cnt < (sizeof (struct e8390_pkt_hdr )>>1 ); cnt++) - *ptrs++ =z_readw (NE_BASE +NE_DATAPORT ); - -z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR );/* Ack intr. */ - - hdr->count =WORDSWAP (hdr->count); - - ei_status.dmaing &= ~0x01 ; +return 0 ; } -/* Block input and output, similar to the Crynwr packet driver. If you -are porting to a new ethercard, look at the packet driver source for hints. -The NEx000 doesn't share the on-board packet memory -- you have to put -the packet out through the "remote DMA" dataport using z_writeb. */ - -static void zorro8390_block_input (struct net_device *dev,int count, -struct sk_buff *skb,int ring_offset) +static int __devinit zorro8390_init_one (struct zorro_dev *z, +const struct zorro_device_id *ent) { -int nic_base = dev->base_addr; -char *buf = skb->data; -short *ptrs; -int cnt; - -/* This *shouldn't* happen. If it does, it's the last thing you'll see */ -if (ei_status.dmaing) { -printk (KERN_ERR "%s: DMAing conflict in ne_block_input " -"[DMAstat:%d][irqlock:%d].\n" , - dev->name, ei_status.dmaing, ei_status.irqlock); -return ; - } - ei_status.dmaing |=0x01 ; -z_writeb (E8390_NODMA +E8390_PAGE0 +E8390_START , nic_base+NE_CMD ); -z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR ); -z_writeb (count &0xff , nic_base +NE_EN0_RCNTLO ); -z_writeb (count >>8 , nic_base +NE_EN0_RCNTHI ); -z_writeb (ring_offset &0xff , nic_base +NE_EN0_RSARLO ); -z_writeb (ring_offset >>8 , nic_base +NE_EN0_RSARHI ); -z_writeb (E8390_RREAD +E8390_START , nic_base +NE_CMD ); - ptrs = (short *)buf; -for (cnt =0 ; cnt < (count>>1 ); cnt++) - *ptrs++ =z_readw (NE_BASE +NE_DATAPORT ); -if (count &0x01 ) - buf[count-1 ] =z_readb (NE_BASE +NE_DATAPORT ); - -z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR );/* Ack intr. */ - ei_status.dmaing &= ~0x01 ; -} +struct net_device *dev; +unsigned long board, ioaddr; +int err, i; + +for (i =ARRAY_SIZE (cards) -1 ; i >=0 ; i--) +if (z->id == cards[i].id) +break ; +if (i <0 ) +return -ENODEV ; -static void zorro8390_block_output (struct net_device *dev,int count, -const unsigned char *buf, -const int start_page) -{ -int nic_base =NE_BASE ; -unsigned long dma_start; -short *ptrs; -int cnt; - -/* Round the count up for word writes. Do we need to do this? -What effect will an odd byte count have on the 8390? -I should check someday. */ -if (count &0x01 ) - count++; - -/* This *shouldn't* happen. If it does, it's the last thing you'll see */ -if (ei_status.dmaing) { -printk (KERN_ERR "%s: DMAing conflict in ne_block_output." -"[DMAstat:%d][irqlock:%d]\n" , dev->name, ei_status.dmaing, - ei_status.irqlock); -return ; - } - ei_status.dmaing |=0x01 ; -/* We should already be in page 0, but to be safe... */ -z_writeb (E8390_PAGE0 +E8390_START +E8390_NODMA , nic_base +NE_CMD ); - -z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR ); - -/* Now the normal output. */ -z_writeb (count &0xff , nic_base +NE_EN0_RCNTLO ); -z_writeb (count >>8 , nic_base +NE_EN0_RCNTHI ); -z_writeb (0x00 , nic_base +NE_EN0_RSARLO ); -z_writeb (start_page, nic_base +NE_EN0_RSARHI ); - -z_writeb (E8390_RWRITE +E8390_START , nic_base +NE_CMD ); - ptrs = (short *)buf; -for (cnt =0 ; cnt < count>>1 ; cnt++) -z_writew (*ptrs++,NE_BASE +NE_DATAPORT ); - - dma_start = jiffies; - -while ((z_readb (NE_BASE +NE_EN0_ISR ) &ENISR_RDC ) ==0 ) -if (time_after (jiffies, dma_start +2 *HZ /100 )) {/* 20ms */ -printk (KERN_ERR "%s: timeout waiting for Tx RDC.\n" , - dev->name); -zorro8390_reset_8390 (dev); -__NS8390_init (dev,1 ); -break ; + board = z->resource.start; + ioaddr = board + cards[i].offset; + dev =____alloc_ei_netdev (0 ); +if (!dev) +return -ENOMEM ; +if (!request_mem_region (ioaddr,NE_IO_EXTENT *2 ,DRV_NAME )) { +free_netdev (dev); +return -EBUSY ; } - -z_writeb (ENISR_RDC , nic_base +NE_EN0_ISR );/* Ack intr. */ - ei_status.dmaing &= ~0x01 ; + err =zorro8390_init (dev, board, cards[i].name,ZTWO_VADDR (ioaddr)); +if (err) { +release_mem_region (ioaddr,NE_IO_EXTENT *2 ); +free_netdev (dev); +return err; + } +zorro_set_drvdata (z, dev); +return 0 ; } -static void __devexit zorro8390_remove_one(struct zorro_dev *z) -{ -struct net_device *dev =zorro_get_drvdata (z); - -unregister_netdev (dev); -free_irq (IRQ_AMIGA_PORTS , dev); -release_mem_region (ZTWO_PADDR (dev->base_addr),NE_IO_EXTENT *2 ); -free_netdev (dev); -} +static struct zorro_driver zorro8390_driver = { + .name ="zorro8390" , + .id_table = zorro8390_zorro_tbl, + .probe = zorro8390_init_one, + .remove =__devexit_p (zorro8390_remove_one), +};static int __init zorro8390_init_module (void ) { -return zorro_register_driver (&zorro8390_driver); +return zorro_register_driver (&zorro8390_driver); } static void __exit zorro8390_cleanup_module(void) { -zorro_unregister_driver (&zorro8390_driver); +zorro_unregister_driver (&zorro8390_driver); }module_init (zorro8390_init_module);
Signature · 1 line
1.7.6.rc3
Quoted 11 lines · Joe Perches
Some updates requested by Geert Uytterhoeven
Joe Perches (8):
ariadne: Update style, neaten, restructure to eliminate prototypes
a2065: Usepr_fmt, pr_<level> and netdev_<level>
lib8390: Use pr_<level> and netdev_<level>
lib8390: Indent braces appropriately
lib8390: Normalize source code spacing
lib8390: Convert include <asm to include <linux
lib8390: Remove unnecessary extern
zorro8390: Restructure and eliminate prototypes
Looks good. I had to make some minor adjustments to make it apply to my current tree, though.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
David Miller
maintainerFrom: Joe Perches <[email protected]>
Date: Wed, 22 Jun 2011 23:38:52 -0700
Quoted 11 lines
Some updates requested by Geert Uytterhoeven
Joe Perches (8):
ariadne: Update style, neaten, restructure to eliminate prototypes
a2065: Usepr_fmt, pr_<level> and netdev_<level>
lib8390: Use pr_<level> and netdev_<level>
lib8390: Indent braces appropriately
lib8390: Normalize source code spacing
lib8390: Convert include <asm to include <linux
lib8390: Remove unnecessary extern
zorro8390: Restructure and eliminate prototypes
All applied, thanks Joe.