X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/2401b1a12ae3c84cf6c005789f228d75df075be6..e3f6236124700b0c3b3b3afaf134c03932b02152:/target/linux/rdc/files/drivers/net/r6040.c?ds=inline diff --git a/target/linux/rdc/files/drivers/net/r6040.c b/target/linux/rdc/files/drivers/net/r6040.c index 2334f4ebf..237b7fa09 100644 --- a/target/linux/rdc/files/drivers/net/r6040.c +++ b/target/linux/rdc/files/drivers/net/r6040.c @@ -50,8 +50,44 @@ #include #define DRV_NAME "r6040" -#define DRV_VERSION "0.16" -#define DRV_RELDATE "10Nov2007" +#define DRV_VERSION "0.19" +#define DRV_RELDATE "16Jun2008" + +/* define bits of a debug mask */ +#define DBG_PHY 0x00000001 /*!< show PHY read/write */ +#define DBG_FREE_BUFS 0x00000002 /*!< show calls to r6040_free_*bufs */ +#define DBG_RING 0x00000004 /*!< debug init./freeing of descr rings */ +#define DBG_RX_BUF 0x00000008 /*!< show alloc. of new rx buf (in IRQ context !) */ +#define DBG_TX_BUF 0x00000010 /*!< show arrival of new tx buf */ +#define DBG_TX_DONE 0x00000020 /*!< debug TX done */ +#define DBG_RX_DESCR 0x00000040 /*!< debug rx descr to be processed */ +#define DBG_RX_DATA 0x00000080 /*!< show some user data of incoming packet */ +#define DBG_EXIT 0x00000100 /*!< show exit code calls */ +#define DBG_INIT 0x00000200 /*!< show init. code calls */ +#define DBG_TX_RING_DUMP 0x00000400 /*!< dump the tx ring after creation */ +#define DBG_RX_RING_DUMP 0x00000800 /*!< dump the rx ring after creation */ +#define DBG_TX_DESCR 0x00001000 /*!< dump the setting of a descr for tx */ +#define DBG_TX_DATA 0x00002000 /*!< dump some tx data */ +#define DBG_IRQ 0x00004000 /*!< print inside the irq handler */ +#define DBG_POLL 0x00008000 /*!< dump info on poll procedure */ +#define DBG_MAC_ADDR 0x00010000 /*!< debug mac address setting */ +#define DBG_OPEN 0x00020000 /*!< debug open proc. */ + +static int debug = 0; +module_param(debug, int, 0); +MODULE_PARM_DESC(debug, "debug mask (-1 for all)"); + +/* define which debugs are left in the code during compilation */ +#define DEBUG (-1) /* all debugs */ + +#define dbg(l, f, ...) \ + do { \ + if ((DEBUG & l) && (debug & l)) { \ + printk(KERN_INFO DRV_NAME " %s: " f, __FUNCTION__, ## __VA_ARGS__); \ + } \ + } while (0) + +#define err(f, ...) printk(KERN_WARNING DRV_NAME " %s: " f, __FUNCTION__, ## __VA_ARGS__) /* PHY CHIP Address */ #define PHY1_ADDR 1 /* For MAC1 */ @@ -61,7 +97,6 @@ /* Time in jiffies before concluding the transmitter is hung. */ #define TX_TIMEOUT (6000 * HZ / 1000) -#define TIMER_WUT (jiffies + HZ * 1)/* timer wakeup time : 1 second */ /* RDC MAC I/O Size */ #define R6040_IO_SIZE 256 @@ -92,6 +127,15 @@ #define MISR 0x3C /* Status register */ #define MIER 0x40 /* INT enable register */ #define MSK_INT 0x0000 /* Mask off interrupts */ +#define RX_FINISH 0x0001 /* rx finished irq */ +#define RX_NO_DESC 0x0002 /* rx no descr. avail. irq */ +#define RX_FIFO_FULL 0x0004 /* rx fifo full irq */ +#define RX_EARLY 0x0008 /* rx early irq */ +#define TX_FINISH 0x0010 /* tx finished irq */ +#define TX_EARLY 0x0080 /* tx early irq */ +#define EVENT_OVRFL 0x0100 /* event counter overflow irq */ +#define LINK_CHANGED 0x0200 /* PHY link changed irq */ + #define ME_CISR 0x44 /* Event counter INT status */ #define ME_CIER 0x48 /* Event counter INT enable */ #define MR_CNT 0x50 /* Successfully received packet counter */ @@ -128,7 +172,12 @@ #define MAX_BUF_SIZE 0x600 #define RX_DESC_SIZE (RX_DCNT * sizeof(struct r6040_descriptor)) #define TX_DESC_SIZE (TX_DCNT * sizeof(struct r6040_descriptor)) -#define MBCR_DEFAULT 0x012A /* MAC Bus Control Register */ +#define MBCR_DEFAULT 0x012A /* MAC Bus Control Register: + - wait 1 host clock until SDRAM bus request + becomes high priority + - RX FIFO: 32 byte + - TX FIFO: 64 byte + - FIFO transfer length: 16 byte */ #define MCAST_MAX 4 /* Max number multicast addresses to filter */ /* PHY settings */ @@ -140,10 +189,11 @@ MODULE_AUTHOR("Sten Wang ," MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("RDC R6040 NAPI PCI FastEthernet driver"); -#define RX_INT 0x0001 -#define TX_INT 0x0010 -#define RX_NO_DESC_INT 0x0002 -#define INT_MASK (RX_INT | TX_INT) +/*! which rx interrupts do we allow */ +#define RX_INTS (RX_FIFO_FULL|RX_NO_DESC|RX_FINISH) +/*! which tx interrupts do we allow */ +#define TX_INTS (TX_FINISH) +#define INT_MASK (RX_INTS | TX_INTS) struct r6040_descriptor { u16 status, len; /* 0-3 */ @@ -156,6 +206,21 @@ struct r6040_descriptor { u32 rev2; /* 1C-1F */ } __attribute__((aligned(32))); +/*! defines for the status field in the r6040_descriptor */ +#define DESC_STATUS_OWNER_MAC (1<<15) /*!< if set the MAC is the owner of this descriptor */ +#define DESC_STATUS_RX_OK (1<<14) /*!< rx was successful */ +#define DESC_STATUS_RX_ERR (1<<11) /*!< rx PHY error */ +#define DESC_STATUS_RX_ERR_DRIBBLE (1<<10) /*!< rx dribble packet */ +#define DESC_STATUS_RX_ERR_BUFLEN (1<< 9) /*!< rx length exceeded buffer size */ +#define DESC_STATUS_RX_ERR_LONG (1<< 8) /*!< rx length > maximum packet length */ +#define DESC_STATUS_RX_ERR_RUNT (1<< 7) /*!< rx: packet length < 64 byte */ +#define DESC_STATUS_RX_ERR_CRC (1<< 6) /*!< rx: crc error */ +#define DESC_STATUS_RX_BROADCAST (1<< 5) /*!< rx: broadcast (no error) */ +#define DESC_STATUS_RX_MULTICAST (1<< 4) /*!< rx: multicast (no error) */ +#define DESC_STATUS_RX_MCH_HIT (1<< 3) /*!< rx: multicast hit in hash table (no error) */ +#define DESC_STATUS_RX_MIDH_HIT (1<< 2) /*!< rx: MID table hit (no error) */ +#define DESC_STATUS_RX_IDX_MID_MASK 3 /*!< rx: mask for the index of matched MIDx */ + struct r6040_private { spinlock_t lock; /* driver lock */ struct timer_list timer; @@ -168,28 +233,66 @@ struct r6040_private { struct r6040_descriptor *tx_ring; dma_addr_t rx_ring_dma; dma_addr_t tx_ring_dma; - u16 tx_free_desc, rx_free_desc, phy_addr, phy_mode; + u16 tx_free_desc, phy_addr, phy_mode; u16 mcr0, mcr1; u16 switch_sig; struct net_device *dev; struct mii_if_info mii_if; struct napi_struct napi; - struct net_device_stats stats; - u16 napi_rx_running; void __iomem *base; }; +struct net_device *parent_dev; +static char *parent = "wlan0"; +module_param(parent, charp, 0444); +MODULE_PARM_DESC(parent, "Parent network device name to get the MAC address from"); + static char version[] __devinitdata = KERN_INFO DRV_NAME ": RDC R6040 NAPI net driver," "version "DRV_VERSION " (" DRV_RELDATE ")\n"; static int phy_table[] = { PHY1_ADDR, PHY2_ADDR }; +/* forward declarations */ +void r6040_multicast_list(struct net_device *dev); + +/* jal2: comment out to get more symbols for debugging */ +//#define STATIC static +#define STATIC + +#if DEBUG +/*! hexdump an memory area into a string. delim is taken as the delimiter between two bytes. + It is omitted if delim == '\0' */ +STATIC char *hex2str(void *addr, char *buf, int nr_bytes, int delim) +{ + unsigned char *src = addr; + char *outb = buf; + +#define BIN2HEXDIGIT(x) ((x) < 10 ? '0'+(x) : 'A'-10+(x)) + + while (nr_bytes > 0) { + *outb++ = BIN2HEXDIGIT(*src>>4); + *outb++ = BIN2HEXDIGIT(*src&0xf); + if (delim) + *outb++ = delim; + nr_bytes--; + src++; + } + + if (delim) + outb--; + *outb = '\0'; + return buf; +} + +#endif /* #if DEBUG */ + /* Read a word data from PHY Chip */ -static int phy_read(void __iomem *ioaddr, int phy_addr, int reg) +STATIC int phy_read(void __iomem *ioaddr, int phy_addr, int reg) { int limit = 2048; u16 cmd; + int rc; iowrite16(MDIO_READ + reg + (phy_addr << 8), ioaddr + MMDIO); /* Wait for the read bit to be cleared */ @@ -199,15 +302,24 @@ static int phy_read(void __iomem *ioaddr, int phy_addr, int reg) break; } - return ioread16(ioaddr + MMRD); + if (limit <= 0) + err("phy addr x%x reg x%x timed out\n", + phy_addr, reg); + + rc=ioread16(ioaddr + MMRD); + + dbg(DBG_PHY, "phy addr x%x reg x%x val x%x\n", phy_addr, reg, rc); + return rc; } /* Write a word data from PHY Chip */ -static void phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val) +STATIC void phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val) { int limit = 2048; u16 cmd; + dbg(DBG_PHY, "phy addr x%x reg x%x val x%x\n", phy_addr, reg, val); + iowrite16(val, ioaddr + MMWD); /* Write the command to the MDIO bus */ iowrite16(MDIO_WRITE + reg + (phy_addr << 8), ioaddr + MMDIO); @@ -217,9 +329,12 @@ static void phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val) if (cmd & MDIO_WRITE) break; } + if (limit <= 0) + err("phy addr x%x reg x%x val x%x timed out\n", + phy_addr, reg, val); } -static int mdio_read(struct net_device *dev, int mii_id, int reg) +STATIC int mdio_read(struct net_device *dev, int mii_id, int reg) { struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; @@ -227,7 +342,7 @@ static int mdio_read(struct net_device *dev, int mii_id, int reg) return (phy_read(ioaddr, lp->phy_addr, reg)); } -static void mdio_write(struct net_device *dev, int mii_id, int reg, int val) +STATIC void mdio_write(struct net_device *dev, int mii_id, int reg, int val) { struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; @@ -235,128 +350,316 @@ static void mdio_write(struct net_device *dev, int mii_id, int reg, int val) phy_write(ioaddr, lp->phy_addr, reg, val); } -static void r6040_tx_timeout(struct net_device *dev) +void r6040_free_txbufs(struct net_device *dev) { - struct r6040_private *priv = netdev_priv(dev); + struct r6040_private *lp = netdev_priv(dev); + int i; - disable_irq(dev->irq); - napi_disable(&priv->napi); - spin_lock(&priv->lock); - dev->stats.tx_errors++; - spin_unlock(&priv->lock); + dbg(DBG_FREE_BUFS, "ENTER\n"); + for (i = 0; i < TX_DCNT; i++) { + if (lp->tx_insert_ptr->skb_ptr) { + pci_unmap_single(lp->pdev, + le32_to_cpu(lp->tx_insert_ptr->buf), + MAX_BUF_SIZE, PCI_DMA_TODEVICE); + dev_kfree_skb(lp->tx_insert_ptr->skb_ptr); + lp->rx_insert_ptr->skb_ptr = NULL; + } + lp->tx_insert_ptr = lp->tx_insert_ptr->vndescp; + } + dbg(DBG_FREE_BUFS, "EXIT\n"); +} + +/*! unmap and free all rx skb */ +void r6040_free_rxbufs(struct net_device *dev) +{ + struct r6040_private *lp = netdev_priv(dev); + int i; + + dbg(DBG_FREE_BUFS, "ENTER\n"); + for (i = 0; i < RX_DCNT; i++) { + if (lp->rx_insert_ptr->skb_ptr) { + pci_unmap_single(lp->pdev, + le32_to_cpu(lp->rx_insert_ptr->buf), + MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); + dev_kfree_skb(lp->rx_insert_ptr->skb_ptr); + lp->rx_insert_ptr->skb_ptr = NULL; + } + lp->rx_insert_ptr = lp->rx_insert_ptr->vndescp; + } + dbg(DBG_FREE_BUFS, "EXIT\n"); - netif_stop_queue(dev); } -/* Allocate skb buffer for rx descriptor */ -static void rx_buf_alloc(struct r6040_private *lp, struct net_device *dev) +void r6040_init_ring_desc(struct r6040_descriptor *desc_ring, + dma_addr_t desc_dma, int size) { - struct r6040_descriptor *descptr; - void __iomem *ioaddr = lp->base; + struct r6040_descriptor *desc = desc_ring; + dma_addr_t mapping = desc_dma; - descptr = lp->rx_insert_ptr; - while (lp->rx_free_desc < RX_DCNT) { - descptr->skb_ptr = dev_alloc_skb(MAX_BUF_SIZE); + dbg(DBG_RING, "desc_ring %p desc_dma %08x size x%x\n", + desc_ring, desc_dma, size); - if (!descptr->skb_ptr) - break; - descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, - descptr->skb_ptr->data, - MAX_BUF_SIZE, PCI_DMA_FROMDEVICE)); - descptr->status = 0x8000; - descptr = descptr->vndescp; - lp->rx_free_desc++; - /* Trigger RX DMA */ - iowrite16(lp->mcr0 | 0x0002, ioaddr); + + while (size-- > 0) { + mapping += sizeof(*desc); + memset(desc, 0, sizeof(*desc)); + desc->ndesc = cpu_to_le32(mapping); + desc->vndescp = desc + 1; + desc++; } - lp->rx_insert_ptr = descptr; + + /* last descriptor points to first one to close the descriptor ring */ + desc--; + desc->ndesc = cpu_to_le32(desc_dma); + desc->vndescp = desc_ring; +} + +#if (DEBUG & DBG_TX_RING_DUMP) +/*! dump the tx ring to syslog */ +STATIC void +dump_tx_ring(struct r6040_private *lp) +{ + int i; + struct r6040_descriptor *ptr; + + printk(KERN_INFO "%s: nr_desc x%x tx_ring %p tx_ring_dma %08x " + "tx_insert %p tx_remove %p\n", + DRV_NAME, TX_DCNT, lp->tx_ring, lp->tx_ring_dma, + lp->tx_insert_ptr, lp->tx_remove_ptr); + + if (lp->tx_ring) { + for(i=0, ptr=lp->tx_ring; i < TX_DCNT; i++, ptr++) { + printk(KERN_INFO "%s: %d. descr: status x%x len x%x " + "ndesc %08x vbufp %p vndescp %p skb_ptr %p\n", + DRV_NAME, i, ptr->status, ptr->len, + ptr->ndesc, ptr->vbufp, ptr->vndescp, ptr->skb_ptr); + } + } +} +#endif /* #if (DEBUG & DBG_TX_RING_DUMP) */ + +void r6040_init_txbufs(struct net_device *dev) +{ + struct r6040_private *lp = netdev_priv(dev); + + lp->tx_free_desc = TX_DCNT; + + lp->tx_remove_ptr = lp->tx_insert_ptr = lp->tx_ring; + r6040_init_ring_desc(lp->tx_ring, lp->tx_ring_dma, TX_DCNT); + +#if (DEBUG & DBG_TX_RING_DUMP) + if (debug & DBG_TX_RING_DUMP) { + dump_tx_ring(lp); + } +#endif +} + +#if (DEBUG & DBG_RX_RING_DUMP) +/*! dump the rx ring to syslog */ +STATIC void +dump_rx_ring(struct r6040_private *lp) +{ + int i; + struct r6040_descriptor *ptr; + + printk(KERN_INFO "%s: nr_desc x%x rx_ring %p rx_ring_dma %08x " + "rx_insert %p rx_remove %p\n", + DRV_NAME, RX_DCNT, lp->rx_ring, lp->rx_ring_dma, + lp->rx_insert_ptr, lp->rx_remove_ptr); + + if (lp->rx_ring) { + for(i=0, ptr=lp->rx_ring; i < RX_DCNT; i++, ptr++) { + printk(KERN_INFO "%s: %d. descr: status x%x len x%x " + "ndesc %08x vbufp %p vndescp %p skb_ptr %p\n", + DRV_NAME, i, ptr->status, ptr->len, + ptr->ndesc, ptr->vbufp, ptr->vndescp, ptr->skb_ptr); + } + } +} +#endif /* #if (DEBUG & DBG_TX_RING_DUMP) */ + +int r6040_alloc_rxbufs(struct net_device *dev) +{ + struct r6040_private *lp = netdev_priv(dev); + struct r6040_descriptor *desc; + struct sk_buff *skb; + int rc; + + lp->rx_remove_ptr = lp->rx_insert_ptr = lp->rx_ring; + r6040_init_ring_desc(lp->rx_ring, lp->rx_ring_dma, RX_DCNT); + + /* alloc skbs for the rx descriptors */ + desc = lp->rx_ring; + do { + if (!(skb=netdev_alloc_skb(dev, MAX_BUF_SIZE))) { + err("failed to alloc skb for rx\n"); + rc = -ENOMEM; + goto err_exit; + } + desc->skb_ptr = skb; + desc->buf = cpu_to_le32(pci_map_single(lp->pdev, + desc->skb_ptr->data, + MAX_BUF_SIZE, PCI_DMA_FROMDEVICE)); + desc->status = DESC_STATUS_OWNER_MAC; + desc = desc->vndescp; + } while (desc != lp->rx_ring); + +#if (DEBUG & DBG_RX_RING_DUMP) + if (debug & DBG_RX_RING_DUMP) { + dump_rx_ring(lp); + } +#endif + + return 0; + +err_exit: + /* dealloc all previously allocated skb */ + r6040_free_rxbufs(dev); + return rc; +} + +/*! reset MAC and set all registers */ +void r6040_init_mac_regs(struct r6040_private *lp) +{ + void __iomem *ioaddr = lp->base; + int limit; + char obuf[3*ETH_ALEN] __attribute__ ((unused)); + + /* Mask Off Interrupt */ + iowrite16(MSK_INT, ioaddr + MIER); + + /* reset MAC */ + iowrite16(MAC_RST, ioaddr + MCR1); + udelay(100); + limit=2048; + while ((ioread16(ioaddr + MCR1) & MAC_RST) && limit-- > 0); + + /* Reset internal state machine */ + iowrite16(2, ioaddr + MAC_SM); + iowrite16(0, ioaddr + MAC_SM); + udelay(5000); + + /* Restore MAC Addresses */ + r6040_multicast_list(lp->dev); + + /* TODO: restore multcast and hash table */ + + /* MAC Bus Control Register */ + iowrite16(MBCR_DEFAULT, ioaddr + MBCR); + + /* Buffer Size Register */ + iowrite16(MAX_BUF_SIZE, ioaddr + MR_BSR); + + /* write tx ring start address */ + iowrite16(lp->tx_ring_dma, ioaddr + MTD_SA0); + iowrite16(lp->tx_ring_dma >> 16, ioaddr + MTD_SA1); + + /* write rx ring start address */ + iowrite16(lp->rx_ring_dma, ioaddr + MRD_SA0); + iowrite16(lp->rx_ring_dma >> 16, ioaddr + MRD_SA1); + + /* set interrupt waiting time and packet numbers */ + iowrite16(0, ioaddr + MT_ICR); + iowrite16(0, ioaddr + MR_ICR); + + /* enable interrupts */ + iowrite16(INT_MASK, ioaddr + MIER); + + /* enable tx and rx */ + iowrite16(lp->mcr0 | 0x0002, ioaddr); + + /* let TX poll the descriptors - we may got called by r6040_tx_timeout which has left + some unsent tx buffers */ + iowrite16(0x01, ioaddr + MTPR); } +void r6040_tx_timeout(struct net_device *dev) +{ + struct r6040_private *priv = netdev_priv(dev); + void __iomem *ioaddr = priv->base; + + /* we read MISR, which clears on read (i.e. we may loose an RX interupt, + but this is an error anyhow ... */ + printk(KERN_WARNING "%s: transmit timed out, int enable %4.4x " + "status %4.4x, PHY status %4.4x\n", + dev->name, ioread16(ioaddr + MIER), + ioread16(ioaddr + MISR), + mdio_read(dev, priv->mii_if.phy_id, MII_BMSR)); + + dev->stats.tx_errors++; + + /* Reset MAC and re-init all registers */ + r6040_init_mac_regs(priv); +} -static struct net_device_stats *r6040_get_stats(struct net_device *dev) +struct net_device_stats *r6040_get_stats(struct net_device *dev) { struct r6040_private *priv = netdev_priv(dev); void __iomem *ioaddr = priv->base; unsigned long flags; spin_lock_irqsave(&priv->lock, flags); - priv->stats.rx_crc_errors += ioread8(ioaddr + ME_CNT1); - priv->stats.multicast += ioread8(ioaddr + ME_CNT0); + dev->stats.rx_crc_errors += ioread8(ioaddr + ME_CNT1); + dev->stats.multicast += ioread8(ioaddr + ME_CNT0); spin_unlock_irqrestore(&priv->lock, flags); - return &priv->stats; + return &dev->stats; } /* Stop RDC MAC and Free the allocated resource */ -static void r6040_down(struct net_device *dev) +void r6040_down(struct net_device *dev) { struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; struct pci_dev *pdev = lp->pdev; - int i; int limit = 2048; - u16 *adrp; - u16 cmd; + + dbg(DBG_EXIT, "ENTER\n"); /* Stop MAC */ iowrite16(MSK_INT, ioaddr + MIER); /* Mask Off Interrupt */ iowrite16(MAC_RST, ioaddr + MCR1); /* Reset RDC MAC */ - while (limit--) { - cmd = ioread16(ioaddr + MCR1); - if (cmd & 0x1) - break; - } + udelay(100); + while ((ioread16(ioaddr+MCR1) & 1) && limit-- > 0); + + if (limit <= 0) + err("timeout while waiting for reset done.\n"); - /* Restore MAC Address to MIDx */ - adrp = (u16 *) dev->dev_addr; - iowrite16(adrp[0], ioaddr + MID_0L); - iowrite16(adrp[1], ioaddr + MID_0M); - iowrite16(adrp[2], ioaddr + MID_0H); free_irq(dev->irq, dev); + /* Free RX buffer */ - for (i = 0; i < RX_DCNT; i++) { - if (lp->rx_insert_ptr->skb_ptr) { - pci_unmap_single(lp->pdev, lp->rx_insert_ptr->buf, - MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); - dev_kfree_skb(lp->rx_insert_ptr->skb_ptr); - lp->rx_insert_ptr->skb_ptr = NULL; - } - lp->rx_insert_ptr = lp->rx_insert_ptr->vndescp; - } + r6040_free_rxbufs(dev); /* Free TX buffer */ - for (i = 0; i < TX_DCNT; i++) { - if (lp->tx_insert_ptr->skb_ptr) { - pci_unmap_single(lp->pdev, lp->tx_insert_ptr->buf, - MAX_BUF_SIZE, PCI_DMA_TODEVICE); - dev_kfree_skb(lp->tx_insert_ptr->skb_ptr); - lp->rx_insert_ptr->skb_ptr = NULL; - } - lp->tx_insert_ptr = lp->tx_insert_ptr->vndescp; - } + r6040_free_txbufs(dev); /* Free Descriptor memory */ pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma); pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma); + + dbg(DBG_EXIT, "EXIT\n"); } -static int r6040_close(struct net_device *dev) +int r6040_close(struct net_device *dev) { struct r6040_private *lp = netdev_priv(dev); + dbg(DBG_EXIT, "ENTER\n"); + /* deleted timer */ del_timer_sync(&lp->timer); - spin_lock_irq(&lp->lock); + napi_disable(&lp->napi); netif_stop_queue(dev); r6040_down(dev); spin_unlock_irq(&lp->lock); + dbg(DBG_EXIT, "EXIT\n"); return 0; } -/* Status of PHY CHIP */ -static int phy_mode_chk(struct net_device *dev) +/* Status of PHY CHIP. Returns 0x8000 for full duplex, 0 for half duplex */ +STATIC int phy_mode_chk(struct net_device *dev) { struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; @@ -387,10 +690,11 @@ static int phy_mode_chk(struct net_device *dev) phy_dat = 0x0000; } + dbg(DBG_PHY, "RETURN x%x\n", phy_dat); return phy_dat; }; -static void r6040_set_carrier(struct mii_if_info *mii) +void r6040_set_carrier(struct mii_if_info *mii) { if (phy_mode_chk(mii->dev)) { /* autoneg is off: Link is always assumed to be up */ @@ -400,7 +704,7 @@ static void r6040_set_carrier(struct mii_if_info *mii) phy_mode_chk(mii->dev); } -static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { struct r6040_private *lp = netdev_priv(dev); struct mii_ioctl_data *data = if_mii(rq); @@ -415,76 +719,86 @@ static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) return rc; } -static int r6040_rx(struct net_device *dev, int limit) +int r6040_rx(struct net_device *dev, int limit) { struct r6040_private *priv = netdev_priv(dev); - int count; - void __iomem *ioaddr = priv->base; - u16 err; - - for (count = 0; count < limit; ++count) { - struct r6040_descriptor *descptr = priv->rx_remove_ptr; - struct sk_buff *skb_ptr; + int count=0; + struct r6040_descriptor *descptr = priv->rx_remove_ptr; + struct sk_buff *skb_ptr, *new_skb; + char obuf[2*32+1] __attribute__ ((unused)); /* for debugging */ - /* Disable RX interrupt */ - iowrite16(ioread16(ioaddr + MIER) & (~RX_INT), ioaddr + MIER); - descptr = priv->rx_remove_ptr; + while (count < limit && !(descptr->status & DESC_STATUS_OWNER_MAC)) { + /* limit not reached and the descriptor belongs to the CPU */ + dbg(DBG_RX_DESCR, "descptr %p status x%x data len x%x\n", + descptr, descptr->status, descptr->len); + /* Check for errors */ - err = ioread16(ioaddr + MLSR); - if (err & 0x0400) priv->stats.rx_errors++; - /* RX FIFO over-run */ - if (err & 0x8000) priv->stats.rx_fifo_errors++; - /* RX descriptor unavailable */ - if (err & 0x0080) priv->stats.rx_frame_errors++; - /* Received packet with length over buffer lenght */ - if (err & 0x0020) priv->stats.rx_over_errors++; - /* Received packet with too long or short */ - if (err & (0x0010|0x0008)) priv->stats.rx_length_errors++; - /* Received packet with CRC errors */ - if (err & 0x0004) { - spin_lock(&priv->lock); - priv->stats.rx_crc_errors++; - spin_unlock(&priv->lock); - } + if (descptr->status & DESC_STATUS_RX_ERR) { + + dev->stats.rx_errors++; + + if (descptr->status & (DESC_STATUS_RX_ERR_DRIBBLE| + DESC_STATUS_RX_ERR_BUFLEN| + DESC_STATUS_RX_ERR_LONG| + DESC_STATUS_RX_ERR_RUNT)) { + /* packet too long or too short*/ + dev->stats.rx_length_errors++; + } - while (priv->rx_free_desc) { - /* No RX packet */ - if (descptr->status & 0x8000) - break; - skb_ptr = descptr->skb_ptr; - if (!skb_ptr) { - printk(KERN_ERR "%s: Inconsistent RX" - "descriptor chain\n", - dev->name); - break; + if (descptr->status & DESC_STATUS_RX_ERR_CRC) { + dev->stats.rx_crc_errors++; } - descptr->skb_ptr = NULL; - skb_ptr->dev = priv->dev; - /* Do not count the CRC */ - skb_put(skb_ptr, descptr->len - 4); - pci_unmap_single(priv->pdev, descptr->buf, - MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); - skb_ptr->protocol = eth_type_trans(skb_ptr, priv->dev); - /* Send to upper layer */ - netif_receive_skb(skb_ptr); - dev->last_rx = jiffies; - priv->dev->stats.rx_packets++; - priv->dev->stats.rx_bytes += descptr->len; - /* To next descriptor */ - descptr = descptr->vndescp; - priv->rx_free_desc--; + goto next_descr; } - priv->rx_remove_ptr = descptr; - } - /* Allocate new RX buffer */ - if (priv->rx_free_desc < RX_DCNT) - rx_buf_alloc(priv, priv->dev); + + /* successful received packet */ + + /* first try to allocate new skb. If this fails + we drop the packet and leave the old skb there.*/ + new_skb = netdev_alloc_skb(dev, MAX_BUF_SIZE); + if (!new_skb) { + dev->stats.rx_dropped++; + goto next_descr; + } + skb_ptr = descptr->skb_ptr; + skb_ptr->dev = priv->dev; + /* Do not count the CRC */ + skb_put(skb_ptr, descptr->len - 4); + pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf), + MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); + skb_ptr->protocol = eth_type_trans(skb_ptr, priv->dev); + + dbg(DBG_RX_DATA, "rx len x%x: %s...\n", + descptr->len, + hex2str(skb_ptr->data, obuf, sizeof(obuf)/2, '\0')); + + /* Send to upper layer */ + netif_receive_skb(skb_ptr); + dev->last_rx = jiffies; + dev->stats.rx_packets++; + dev->stats.rx_bytes += (descptr->len-4); + + /* put new skb into descriptor */ + descptr->skb_ptr = new_skb; + descptr->buf = cpu_to_le32(pci_map_single(priv->pdev, + descptr->skb_ptr->data, + MAX_BUF_SIZE, PCI_DMA_FROMDEVICE)); + +next_descr: + /* put the descriptor back to the MAC */ + descptr->status = DESC_STATUS_OWNER_MAC; + descptr = descptr->vndescp; + count++; /* shall we count errors and dropped packets as well? */ + } /* while (limit && !(descptr->status & DESC_STATUS_OWNER_MAC)) */ + + /* remember next descriptor to check for rx */ + priv->rx_remove_ptr = descptr; return count; } -static void r6040_tx(struct net_device *dev) +void r6040_tx(struct net_device *dev) { struct r6040_private *priv = netdev_priv(dev); struct r6040_descriptor *descptr; @@ -498,13 +812,18 @@ static void r6040_tx(struct net_device *dev) /* Check for errors */ err = ioread16(ioaddr + MLSR); - if (err & 0x0200) priv->stats.rx_fifo_errors++; - if (err & (0x2000 | 0x4000)) priv->stats.tx_carrier_errors++; + if (err & 0x0200) + dev->stats.rx_fifo_errors++; + if (err & (0x2000 | 0x4000)) + dev->stats.tx_carrier_errors++; + + dbg(DBG_TX_DONE, "descptr %p status x%x err x%x jiffies %lu\n", + descptr, descptr->status, err, jiffies); if (descptr->status & 0x8000) - break; /* Not complte */ + break; /* Not complete */ skb_ptr = descptr->skb_ptr; - pci_unmap_single(priv->pdev, descptr->buf, + pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf), skb_ptr->len, PCI_DMA_TODEVICE); /* Free buffer */ dev_kfree_skb_irq(skb_ptr); @@ -520,7 +839,7 @@ static void r6040_tx(struct net_device *dev) spin_unlock(&priv->lock); } -static int r6040_poll(struct napi_struct *napi, int budget) +int r6040_poll(struct napi_struct *napi, int budget) { struct r6040_private *priv = container_of(napi, struct r6040_private, napi); @@ -530,46 +849,59 @@ static int r6040_poll(struct napi_struct *napi, int budget) work_done = r6040_rx(dev, budget); + dbg(DBG_POLL, "budget x%x done x%x\n", budget, work_done); + if (work_done < budget) { netif_rx_complete(dev, napi); /* Enable RX interrupt */ - iowrite16(ioread16(ioaddr + MIER) | RX_INT, ioaddr + MIER); + iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER); } return work_done; } /* The RDC interrupt handler. */ -static irqreturn_t r6040_interrupt(int irq, void *dev_id) +irqreturn_t r6040_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; u16 status; - int handled = 1; - /* Mask off RDC MAC interrupt */ - iowrite16(MSK_INT, ioaddr + MIER); /* Read MISR status and clear */ status = ioread16(ioaddr + MISR); + dbg(DBG_IRQ, "status x%x jiffies %lu\n", status, jiffies); + if (status == 0x0000 || status == 0xffff) return IRQ_NONE; - /* RX interrupt request */ - if (status & 0x01) { + /* rx early / rx finish interrupt + or rx descriptor unavail. */ + if (status & RX_INTS) { + if (status & RX_NO_DESC) { + /* rx descriptor unavail. */ + dev->stats.rx_dropped++; + dev->stats.rx_missed_errors++; + } + /* Mask off RX interrupts */ + iowrite16(ioread16(ioaddr + MIER) & ~RX_INTS, ioaddr + MIER); netif_rx_schedule(dev, &lp->napi); - iowrite16(TX_INT, ioaddr + MIER); } + /* rx FIFO full */ + if (status & RX_FIFO_FULL) { + dev->stats.rx_fifo_errors++; + } + /* TX interrupt request */ if (status & 0x10) r6040_tx(dev); - return IRQ_RETVAL(handled); + return IRQ_HANDLED; } #ifdef CONFIG_NET_POLL_CONTROLLER -static void r6040_poll_controller(struct net_device *dev) +void r6040_poll_controller(struct net_device *dev) { disable_irq(dev->irq); r6040_interrupt(dev->irq, dev); @@ -577,56 +909,20 @@ static void r6040_poll_controller(struct net_device *dev) } #endif -static void r6040_init_ring_desc(struct r6040_descriptor *desc_ring, - dma_addr_t desc_dma, int size) -{ - struct r6040_descriptor *desc = desc_ring; - dma_addr_t mapping = desc_dma; - - while (size-- > 0) { - mapping += sizeof(sizeof(*desc)); - desc->ndesc = cpu_to_le32(mapping); - desc->vndescp = desc + 1; - desc++; - } - desc--; - desc->ndesc = cpu_to_le32(desc_dma); - desc->vndescp = desc_ring; -} - /* Init RDC MAC */ -static void r6040_up(struct net_device *dev) +int r6040_up(struct net_device *dev) { struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; + int rc; - /* Initialize */ - lp->tx_free_desc = TX_DCNT; - lp->rx_free_desc = 0; - /* Init descriptor */ - lp->tx_remove_ptr = lp->tx_insert_ptr = lp->tx_ring; - lp->rx_remove_ptr = lp->rx_insert_ptr = lp->rx_ring; - /* Init TX descriptor */ - r6040_init_ring_desc(lp->tx_ring, lp->tx_ring_dma, TX_DCNT); - - /* Init RX descriptor */ - r6040_init_ring_desc(lp->rx_ring, lp->rx_ring_dma, RX_DCNT); - - /* Allocate buffer for RX descriptor */ - rx_buf_alloc(lp, dev); - - /* - * TX and RX descriptor start registers. - * Lower 16-bits to MxD_SA0. Higher 16-bits to MxD_SA1. - */ - iowrite16(lp->tx_ring_dma, ioaddr + MTD_SA0); - iowrite16(lp->tx_ring_dma >> 16, ioaddr + MTD_SA1); + dbg(DBG_INIT, "ENTER\n"); - iowrite16(lp->rx_ring_dma, ioaddr + MRD_SA0); - iowrite16(lp->rx_ring_dma >> 16, ioaddr + MRD_SA1); + /* Initialise and alloc RX/TX buffers */ + r6040_init_txbufs(dev); + if ((rc=r6040_alloc_rxbufs(dev))) + return rc; - /* Buffer Size Register */ - iowrite16(MAX_BUF_SIZE, ioaddr + MR_BSR); /* Read the PHY ID */ lp->switch_sig = phy_read(ioaddr, 0, 2); @@ -643,16 +939,9 @@ static void r6040_up(struct net_device *dev) else lp->phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0; } - /* MAC Bus Control Register */ - iowrite16(MBCR_DEFAULT, ioaddr + MBCR); - - /* MAC TX/RX Enable */ + +/* configure duplex mode */ lp->mcr0 |= lp->phy_mode; - iowrite16(lp->mcr0, ioaddr); - - /* set interrupt waiting time and packet numbers */ - iowrite16(0x0F06, ioaddr + MT_ICR); - iowrite16(0x0F06, ioaddr + MR_ICR); /* improve performance (by RDC guys) */ phy_write(ioaddr, 30, 17, (phy_read(ioaddr, 30, 17) | 0x4000)); @@ -660,15 +949,17 @@ static void r6040_up(struct net_device *dev) phy_write(ioaddr, 0, 19, 0x0000); phy_write(ioaddr, 0, 30, 0x01F0); - /* Interrupt Mask Register */ - iowrite16(INT_MASK, ioaddr + MIER); + /* Reset MAC and init all registers */ + r6040_init_mac_regs(lp); + + return 0; } /* A periodic timer routine Polling PHY Chip Link Status */ -static void r6040_timer(unsigned long data) +void r6040_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; struct r6040_private *lp = netdev_priv(dev); @@ -685,47 +976,26 @@ static void r6040_timer(unsigned long data) lp->phy_mode = phy_mode; lp->mcr0 = (lp->mcr0 & 0x7fff) | phy_mode; iowrite16(lp->mcr0, ioaddr); - printk(KERN_INFO "Link Change %x \n", ioread16(ioaddr)); + printk(KERN_INFO "Link Change x%x \n", ioread16(ioaddr)); } /* Timer active again */ - lp->timer.expires = TIMER_WUT; - add_timer(&lp->timer); -} - -/* Read/set MAC address routines */ -static void r6040_mac_address(struct net_device *dev) -{ - struct r6040_private *lp = netdev_priv(dev); - void __iomem *ioaddr = lp->base; - u16 *adrp; - - /* MAC operation register */ - iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ - iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ - iowrite16(0, ioaddr + MAC_SM); - udelay(5000); - - /* Restore MAC Address */ - adrp = (u16 *) dev->dev_addr; - iowrite16(adrp[0], ioaddr + MID_0L); - iowrite16(adrp[1], ioaddr + MID_0M); - iowrite16(adrp[2], ioaddr + MID_0H); + mod_timer(&lp->timer, jiffies + round_jiffies(HZ)); } -static int r6040_open(struct net_device *dev) +int r6040_open(struct net_device *dev) { struct r6040_private *lp = netdev_priv(dev); int ret; + dbg(DBG_OPEN, "ENTER\n"); /* Request IRQ and Register interrupt handler */ ret = request_irq(dev->irq, &r6040_interrupt, IRQF_SHARED, dev->name, dev); if (ret) return ret; - /* Set MAC address */ - r6040_mac_address(dev); + dbg(DBG_OPEN, "got irq %d\n", dev->irq); /* Allocate Descriptor memory */ lp->rx_ring = @@ -733,6 +1003,8 @@ static int r6040_open(struct net_device *dev) if (!lp->rx_ring) return -ENOMEM; + dbg(DBG_OPEN, "allocated rx ring\n"); + lp->tx_ring = pci_alloc_consistent(lp->pdev, TX_DESC_SIZE, &lp->tx_ring_dma); if (!lp->tx_ring) { @@ -741,23 +1013,27 @@ static int r6040_open(struct net_device *dev) return -ENOMEM; } - r6040_up(dev); + dbg(DBG_OPEN, "allocated tx ring\n"); + if ((ret=r6040_up(dev))) { + pci_free_consistent(lp->pdev, TX_DESC_SIZE, lp->tx_ring, + lp->tx_ring_dma); + pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring, + lp->rx_ring_dma); + return ret; + } + napi_enable(&lp->napi); netif_start_queue(dev); - if (lp->switch_sig != ICPLUS_PHY_ID) { - /* set and active a timer process */ - init_timer(&lp->timer); - lp->timer.expires = TIMER_WUT; - lp->timer.data = (unsigned long)dev; - lp->timer.function = &r6040_timer; - add_timer(&lp->timer); - } + /* set and active a timer process */ + setup_timer(&lp->timer, r6040_timer, (unsigned long) dev); + if (lp->switch_sig != ICPLUS_PHY_ID) + mod_timer(&lp->timer, jiffies + HZ); return 0; } -static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev) +int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct r6040_private *lp = netdev_priv(dev); struct r6040_descriptor *descptr; @@ -791,6 +1067,16 @@ static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev) descptr->skb_ptr = skb; descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, skb->data, skb->len, PCI_DMA_TODEVICE)); + + dbg(DBG_TX_DESCR, "desc @ %p: len x%x buf %08x skb->data %p skb->len x%x jiffies %lu\n", + descptr, descptr->len, descptr->buf, skb->data, skb->len, jiffies); + + { + char obuf[2*32+1]; + dbg(DBG_TX_DATA, "tx len x%x: %s\n", + descptr->len, hex2str(skb->data, obuf, sizeof(obuf)/2, '\0')); + } + descptr->status = 0x8000; /* Trigger the MAC to check the TX descriptor */ iowrite16(0x01, ioaddr + MTPR); @@ -805,7 +1091,8 @@ static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev) return ret; } -static void r6040_multicast_list(struct net_device *dev) +/*! set MAC addresses and promiscous mode */ +void r6040_multicast_list(struct net_device *dev) { struct r6040_private *lp = netdev_priv(dev); void __iomem *ioaddr = lp->base; @@ -814,6 +1101,7 @@ static void r6040_multicast_list(struct net_device *dev) unsigned long flags; struct dev_mc_list *dmi = dev->mc_list; int i; + char obuf[3*ETH_ALEN] __attribute__ ((unused)); /* MAC Address */ adrp = (u16 *)dev->dev_addr; @@ -821,6 +1109,9 @@ static void r6040_multicast_list(struct net_device *dev) iowrite16(adrp[1], ioaddr + MID_0M); iowrite16(adrp[2], ioaddr + MID_0H); + dbg(DBG_MAC_ADDR, "%s: set MAC addr %s\n", + dev->name, hex2str(dev->dev_addr, obuf, ETH_ALEN, ':')); + /* Promiscous Mode */ spin_lock_irqsave(&lp->lock, flags); @@ -883,7 +1174,7 @@ static void r6040_multicast_list(struct net_device *dev) } } -static void netdev_get_drvinfo(struct net_device *dev, +STATIC void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { struct r6040_private *rp = netdev_priv(dev); @@ -893,7 +1184,7 @@ static void netdev_get_drvinfo(struct net_device *dev, strcpy(info->bus_info, pci_name(rp->pdev)); } -static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +STATIC int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct r6040_private *rp = netdev_priv(dev); int rc; @@ -905,7 +1196,7 @@ static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) return rc; } -static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) +STATIC int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct r6040_private *rp = netdev_priv(dev); int rc; @@ -918,7 +1209,7 @@ static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) return rc; } -static u32 netdev_get_link(struct net_device *dev) +STATIC u32 netdev_get_link(struct net_device *dev) { struct r6040_private *rp = netdev_priv(dev); @@ -932,7 +1223,7 @@ static struct ethtool_ops netdev_ethtool_ops = { .get_link = netdev_get_link, }; -static int __devinit r6040_init_one(struct pci_dev *pdev, +int __devinit r6040_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { struct net_device *dev; @@ -942,9 +1233,9 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, static int card_idx = -1; int bar = 0; long pioaddr; - u16 *adrp; printk(KERN_INFO "%s\n", version); + printk(KERN_INFO DRV_NAME ": debug %x\n", debug); err = pci_enable_device(pdev); if (err) @@ -978,7 +1269,6 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, } SET_NETDEV_DEV(dev, &pdev->dev); lp = netdev_priv(dev); - lp->pdev = pdev; if (pci_request_regions(pdev, DRV_NAME)) { printk(KERN_ERR DRV_NAME ": Failed to request PCI regions\n"); @@ -1000,17 +1290,13 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, spin_lock_init(&lp->lock); pci_set_drvdata(pdev, dev); - /* Set MAC address */ card_idx++; - adrp = (u16 *)dev->dev_addr; - adrp[0] = ioread16(ioaddr + MID_0L); - adrp[1] = ioread16(ioaddr + MID_0M); - adrp[2] = ioread16(ioaddr + MID_0H); - /* Link new device into r6040_root_dev */ lp->pdev = pdev; + lp->dev = dev; + /* Init RDC private data */ lp->mcr0 = 0x1002; lp->phy_addr = phy_table[card_idx]; @@ -1026,6 +1312,23 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, dev->ethtool_ops = &netdev_ethtool_ops; dev->tx_timeout = &r6040_tx_timeout; dev->watchdog_timeo = TX_TIMEOUT; + + { + /* TODO: fix the setting of the MAC address. + Right now you must either specify a netdevice with "parent=", whose + address is copied or the (default) address of the Sitecom WL-153 + bootloader is used */ + static const u8 dflt_addr[ETH_ALEN] = {0,0x50,0xfc,2,3,4}; + if (parent_dev) { + memcpy(dev->dev_addr, parent_dev->dev_addr, ETH_ALEN); + } else { + printk(KERN_WARNING "%s: no parent - using default mac address\n", + dev->name); + memcpy(dev->dev_addr, dflt_addr, ETH_ALEN); + } + dev->dev_addr[ETH_ALEN-1] += card_idx ^ 1; /* + 0 or 1 */ + } + #ifdef CONFIG_NET_POLL_CONTROLLER dev->poll_controller = r6040_poll_controller; #endif @@ -1043,6 +1346,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, printk(KERN_ERR DRV_NAME ": Failed to register net device\n"); goto err_out_res; } + + dbg(DBG_INIT, "%s successfully registered\n", dev->name); return 0; err_out_res: @@ -1055,7 +1360,7 @@ err_out_disable: return err; } -static void __devexit r6040_remove_one(struct pci_dev *pdev) +void __devexit r6040_remove_one(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); @@ -1083,6 +1388,9 @@ static struct pci_driver r6040_driver = { static int __init r6040_init(void) { + if (parent) + parent_dev = dev_get_by_name(&init_net, parent); + return pci_register_driver(&r6040_driver); }