===== drivers/net/forcedeth.c 1.1 vs edited ===== --- 1.1/drivers/net/forcedeth.c Thu Feb 5 02:11:13 2004 +++ edited/drivers/net/forcedeth.c Tue Mar 2 21:04:06 2004 @@ -120,6 +120,7 @@ #define NVREG_IRQSTAT_MIIEVENT 0x040 #define NVREG_IRQSTAT_MASK 0x1ff NvRegIrqMask = 0x004, +#define NVREG_IRQ_RX_ERR 0x0001 #define NVREG_IRQ_RX 0x0002 #define NVREG_IRQ_RX_NOBUF 0x0004 #define NVREG_IRQ_TX_ERR 0x0008 @@ -129,7 +130,7 @@ #define NVREG_IRQ_TX1 0x0100 #define NVREG_IRQMASK_WANTED_1 0x005f #define NVREG_IRQMASK_WANTED_2 0x0147 -#define NVREG_IRQ_UNKNOWN (~(NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR|NVREG_IRQ_TX2|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX1)) +#define NVREG_IRQ_UNKNOWN (~(NVREG_IRQ_RX_ERR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR|NVREG_IRQ_TX2|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX1)) NvRegUnknownSetupReg6 = 0x008, #define NVREG_UNKSETUP6_VAL 3 @@ -847,7 +848,7 @@ i = np->cur_rx % RX_RING; prd = &np->rx_ring[i]; - dprintk(KERN_DEBUG "%s: nv_rx_process: looking at packet %d, Flags 0x%x.\n", + printk(KERN_INFO "%s: nv_rx_process: looking at packet %d, Flags 0x%x.\n", dev->name, np->cur_rx, prd->Flags); if (prd->Flags & cpu_to_le16(NV_RX_AVAIL)) @@ -880,25 +881,30 @@ len = le16_to_cpu(prd->Length); if (prd->Flags & cpu_to_le16(NV_RX_MISSEDFRAME)) { + printk(KERN_INFO "%s: nv_rx_process: missed frame\n", dev->name); np->stats.rx_missed_errors++; np->stats.rx_errors++; goto next_pkt; } if (prd->Flags & cpu_to_le16(NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3|NV_RX_ERROR4)) { + printk(KERN_INFO "%s: nv_rx_process: error 1-4\n", dev->name); np->stats.rx_errors++; goto next_pkt; } if (prd->Flags & cpu_to_le16(NV_RX_CRCERR)) { + printk(KERN_INFO "%s: nv_rx_process: crc error\n", dev->name); np->stats.rx_crc_errors++; np->stats.rx_errors++; goto next_pkt; } if (prd->Flags & cpu_to_le16(NV_RX_OVERFLOW)) { + printk(KERN_INFO "%s: nv_rx_process: overflow\n", dev->name); np->stats.rx_over_errors++; np->stats.rx_errors++; goto next_pkt; } if (prd->Flags & cpu_to_le16(NV_RX_ERROR)) { + printk(KERN_INFO "%s: nv_rx_process: generic error\n", dev->name); /* framing errors are soft errors, the rest is fatal. */ if (prd->Flags & cpu_to_le16(NV_RX_FRAMINGERR)) { if (prd->Flags & cpu_to_le16(NV_RX_SUBSTRACT1)) { @@ -1096,7 +1102,7 @@ spin_unlock(&np->lock); } - if (events & (NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF)) { + if (events & (NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_RX_ERR)) { nv_rx_process(dev); if (nv_alloc_rx(dev)) { spin_lock(&np->lock); @@ -1110,6 +1116,10 @@ spin_lock(&np->lock); nv_link_irq(dev); spin_unlock(&np->lock); + } + if (events & (NVREG_IRQ_RX_ERR)) { + printk(KERN_INFO "%s: received irq with events 0x%x. Probably RX fail. Trying to get diagnostics.\n", + dev->name, events); } if (events & (NVREG_IRQ_TX_ERR)) { dprintk(KERN_DEBUG "%s: received irq with events 0x%x. Probably TX fail.\n",