--- Gnu-Mach/linux/src/drivers/net/eepro100.c 2020/09/02 04:41:40 1.1 +++ Gnu-Mach/linux/src/drivers/net/eepro100.c 2020/09/02 04:49:12 1.1.1.4 @@ -1,28 +1,46 @@ -/* drivers/net/eepro100.c: An Intel i82557 Ethernet driver for Linux. */ +/* drivers/net/eepro100.c: An Intel i82557-559 Ethernet driver for Linux. */ /* - NOTICE: this version tested with kernels 1.3.72 and later only! - Written 1996-1998 by Donald Becker. + Written 1998-2003 by Donald Becker. - This software may be used and distributed according to the terms - of the GNU Public License, incorporated herein by reference. + This software may be used and distributed according to the terms of + the GNU General Public License (GPL), incorporated herein by reference. + Drivers based on or derived from this code fall under the GPL and must + retain the authorship, copyright and license notice. This driver is not + a complete program and may only be used when the entire operating + system is licensed under the GPL. + + This driver is for the Intel EtherExpress Pro100 (Speedo3) design. + It should work with all i82557/558/559 boards. - This driver is for the Intel EtherExpress Pro 100B boards. - It should work with other i82557 boards (if any others exist). - To use a built-in driver, install as drivers/net/eepro100.c. To use as a module, use the compile-command at the end of the file. - The author may be reached as becker@CESDIS.usra.edu, or C/O - Center of Excellence in Space Data and Information Sciences - Code 930.5, NASA Goddard Space Flight Center, Greenbelt MD 20771 + The author may be reached as becker@scyld.com, or C/O + Scyld Computing Corporation + 914 Bay Ridge Road, Suite 220 + Annapolis MD 21403 + For updates see - + http://www.scyld.com/network/eepro100.html + For installation instructions + http://www.scyld.com/network/modules.html + The information and support mailing lists are based at + http://www.scyld.com/mailman/listinfo/ */ -static const char *version = -"eepro100.c:v0.99B 4/7/98 Donald Becker linux-eepro100@cesdis.gsfc.nasa.gov\n"; +/* These identify the driver base version and may not be removed. */ +static const char version1[] = +"eepro100.c:v1.28 7/22/2003 Donald Becker \n"; +static const char version2[] = +" http://www.scyld.com/network/eepro100.html\n"; + -/* A few user-configurable values that apply to all boards. - First set are undocumented and spelled per Intel recommendations. */ +/* The user-configurable values. + These may be modified when a driver module is loaded. + The first five are undocumented and spelled per Intel recommendations. +*/ + +/* Message enable level: 0..31 = no..all messages. See NETIF_MSG docs. */ +static int debug = 2; static int congenb = 0; /* Enable congestion control in the DP83840. */ static int txfifo = 8; /* Tx FIFO threshold in 4 byte units, 0-15 */ @@ -31,8 +49,9 @@ static int rxfifo = 8; /* Rx FIFO thres static int txdmacount = 128; static int rxdmacount = 0; -/* Set the copy breakpoint for the copy-only-tiny-buffer Rx method. - Lower values use more memory, but are faster. */ +/* Set the copy breakpoint for the copy-only-tiny-frame Rx method. + Lower values use more memory, but are faster. + Setting to > 1518 disables this feature. */ static int rx_copybreak = 200; /* Maximum events (Rx packets, etc.) to handle at each interrupt. */ @@ -41,45 +60,107 @@ static int max_interrupt_work = 20; /* Maximum number of multicast addresses to filter (vs. rx-all-multicast) */ static int multicast_filter_limit = 64; -#ifdef MODULE -#ifdef MODVERSIONS -#include +/* Used to pass the media type, etc. + Both 'options[]' and 'full_duplex[]' should exist for driver + interoperability, however setting full_duplex[] is deprecated. + The media type is usually passed in 'options[]'. + Use option values 0x10/0x20 for 10Mbps, 0x100,0x200 for 100Mbps. + Use option values 0x10 and 0x100 for forcing half duplex fixed speed. + Use option values 0x20 and 0x200 for forcing full duplex operation. +*/ +#define MAX_UNITS 8 /* More are supported, limit only on options */ +static int options[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; +static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; + +/* Operational parameters that are set at compile time. */ + +/* The ring sizes should be a power of two for efficiency. */ +#define TX_RING_SIZE 32 /* Effectively 2 entries fewer. */ +#define RX_RING_SIZE 32 +/* Actual number of TX packets queued, must be <= TX_RING_SIZE-2. */ +#define TX_QUEUE_LIMIT 12 +#define TX_QUEUE_UNFULL 8 /* Hysteresis marking queue as no longer full. */ + +/* Operational parameters that usually are not changed. */ + +/* Time in jiffies before concluding the transmitter is hung. */ +#define TX_TIMEOUT (6*HZ) + +/* Allocation size of Rx buffers with normal sized Ethernet frames. + Do not change this value without good reason. This is not a limit, + but a way to keep a consistent allocation size among drivers. + */ +#define PKT_BUF_SZ 1536 + +#ifndef __KERNEL__ +#define __KERNEL__ #endif -#include -#else -#define MOD_INC_USE_COUNT -#define MOD_DEC_USE_COUNT +#if !defined(__OPTIMIZE__) +#warning You must compile this file with the correct options! +#warning See the last lines of the source file. +#error You must compile this driver with "-O". +#endif + +#include +#if defined(CONFIG_SMP) && ! defined(__SMP__) +#define __SMP__ +#endif +#if defined(MODULE) && defined(CONFIG_MODVERSIONS) && ! defined(MODVERSIONS) +#define MODVERSIONS #endif #include +#if defined(MODVERSIONS) +#include +#endif +#include + #include -#include #include #include -#include #include #include +#if LINUX_VERSION_CODE >= 0x20400 +#include +#else #include +#endif #include #include -#include -#include /* Processor type for cache alignment. */ -#include -#include -#include - #include #include #include #include +#include +#include -/* Unused in the 2.0.* version, but retained for documentation. */ -#if LINUX_VERSION_CODE > 0x20118 -MODULE_AUTHOR("Donald Becker "); -MODULE_DESCRIPTION("Intel i82557/i82558 EtherExpressPro driver"); +#if LINUX_VERSION_CODE >= 0x20300 +#include +#elif LINUX_VERSION_CODE >= 0x20200 +#include +#endif + +#ifdef INLINE_PCISCAN +#include "k_compat.h" +#else +#include "pci-scan.h" +#include "kern_compat.h" +#endif + +/* Condensed bus+endian portability operations. */ +#define virt_to_le32desc(addr) cpu_to_le32(virt_to_bus(addr)) +#define le32desc_to_virt(addr) bus_to_virt(le32_to_cpu(addr)) + +#if (LINUX_VERSION_CODE >= 0x20100) && defined(MODULE) +char kernel_version[] = UTS_RELEASE; +#endif + +MODULE_AUTHOR("Donald Becker "); +MODULE_DESCRIPTION("Intel PCI EtherExpressPro 100 driver"); +MODULE_LICENSE("GPL"); MODULE_PARM(debug, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(8) "i"); +MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); +MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); MODULE_PARM(congenb, "i"); MODULE_PARM(txfifo, "i"); MODULE_PARM(rxfifo, "i"); @@ -88,20 +169,21 @@ MODULE_PARM(rxdmacount, "i"); MODULE_PARM(rx_copybreak, "i"); MODULE_PARM(max_interrupt_work, "i"); MODULE_PARM(multicast_filter_limit, "i"); +#ifdef MODULE_PARM_DESC +MODULE_PARM_DESC(debug, "EEPro100 message level (0-31)"); +MODULE_PARM_DESC(options, + "EEPro100: force fixed speed+duplex 0x10 0x20 0x100 0x200"); +MODULE_PARM_DESC(max_interrupt_work, + "EEPro100 maximum events handled per interrupt"); +MODULE_PARM_DESC(full_duplex, "EEPro100 set to forced full duplex when not 0" + " (deprecated)"); +MODULE_PARM_DESC(rx_copybreak, + "EEPro100 copy breakpoint for copy-only-tiny-frames"); +MODULE_PARM_DESC(multicast_filter_limit, + "EEPro100 breakpoint for switching to Rx-all-multicast"); +/* Other settings are undocumented per Intel recommendation. */ #endif -#define RUN_AT(x) (jiffies + (x)) - -#if (LINUX_VERSION_CODE < 0x20123) -#define test_and_set_bit(val, addr) set_bit(val, addr) -#endif - -/* The total I/O port extent of the board. - The registers beyond 0x18 only exist on the i82558. */ -#define SPEEDO3_TOTAL_SIZE 0x20 - -int speedo_debug = 1; - /* Theory of Operation @@ -132,7 +214,7 @@ single buffer descriptor with each frame Despite the extra space overhead in each receive skbuff, the driver must use the simplified Rx buffer mode to assure that only a single data buffer is associated with each RxFD. The driver implements this by reserving space -for the Rx descriptor at the head of each Rx skbuff +for the Rx descriptor at the head of each Rx skbuff. The Speedo-3 has receive and command unit base addresses that are added to almost all descriptor pointers. The driver sets these to zero, so that all @@ -147,10 +229,13 @@ IIIB. Transmit structure The driver must use the complex Tx command+descriptor mode in order to have a indirect pointer to the skbuff data section. Each Tx command block -(TxCB) is associated with a single, immediately appended Tx buffer descriptor +(TxCB) is associated with two immediately appended Tx Buffer Descriptor (TxBD). A fixed ring of these TxCB+TxBD pairs are kept as part of the speedo_private data structure for each adapter instance. +The i82558 and later explicitly supports this structure, and can read the two +TxBDs in the same PCI burst as the TxCB. + This ring structure is used for all normal transmit packets, but the transmit packet descriptors aren't long enough for most non-Tx commands such as CmdConfigure. This is complicated by the possibility that the chip has @@ -159,7 +244,7 @@ commands we convert the next free descri that descriptor's link to the complex command. An additional complexity of these non-transmit commands are that they may be -added asynchronous to the normal transmit queue, so we disable interrupts +added asynchronous to the normal transmit queue, so we set a lock whenever the Tx descriptor ring is manipulated. A notable aspect of these special configure commands is that they do @@ -171,27 +256,16 @@ is not a problem. The tx_ring entry can tx_skbuff[] entry is always empty for config_cmd and mc_setup frames. Commands may have bits set e.g. CmdSuspend in the command word to either -suspend or stop the transmit/command unit. This driver always flags the last -command with CmdSuspend, erases the CmdSuspend in the previous command, and -then issues a CU_RESUME. -Note: Watch out for the potential race condition here: imagine - erasing the previous suspend - the chip processes the previous command - the chip processes the final command, and suspends - doing the CU_RESUME - the chip processes the next-yet-valid post-final-command. -So blindly sending a CU_RESUME is only safe if we do it immediately after -erasing the previous CmdSuspend, without the possibility of an intervening -delay. Thus the resume command is always within the interrupts-disabled -region. This is a timing dependence, but handling this condition in a -timing-independent way would considerably complicate the code. +suspend or stop the transmit/command unit. This driver always initializes +the current command with CmdSuspend before erasing the CmdSuspend in the +previous command, and only then issues a CU_RESUME. Note: In previous generation Intel chips, restarting the command unit was a notoriously slow process. This is presumably no longer true. IIIC. Receive structure -Because of the bus-master support on the Speedo3 this driver uses the new +Because of the bus-master support on the Speedo3 this driver uses the SKBUFF_RX_COPYBREAK scheme, rather than a fixed intermediate receive buffer. This scheme allocates full-sized skbuffs as receive buffers. The value SKBUFF_RX_COPYBREAK is used as the copying breakpoint: it is chosen to @@ -231,28 +305,98 @@ having to sign an Intel NDA when I'm hel */ -/* A few values that may be tweaked. */ -/* The ring sizes should be a power of two for efficiency. */ -#define TX_RING_SIZE 16 /* Effectively 2 entries fewer. */ -#define RX_RING_SIZE 16 -/* Size of an pre-allocated Rx buffer: + slack.*/ -#define PKT_BUF_SZ 1536 - -/* Time in jiffies before concluding the transmitter is hung. */ -#define TX_TIMEOUT ((800*HZ)/1000) - -/* How to wait for the command unit to accept a command. - Typically this takes 0 ticks. */ -static inline void wait_for_cmd_done(int cmd_ioaddr) -{ - short wait = 100; - do ; - while(inb(cmd_ioaddr) && --wait >= 0); -} +/* This table drives the PCI probe routines. */ +static void *speedo_found1(struct pci_dev *pdev, void *init_dev, + long ioaddr, int irq, int chip_idx, int fnd_cnt); +static int speedo_pwr_event(void *dev_instance, int event); +enum chip_capability_flags { ResetMII=1, HasChksum=2}; + +/* I/O registers beyond 0x18 do not exist on the i82557. */ +#ifdef USE_IO_OPS +#define SPEEDO_IOTYPE PCI_USES_MASTER|PCI_USES_IO|PCI_ADDR1 +#define SPEEDO_SIZE 32 +#else +#define SPEEDO_IOTYPE PCI_USES_MASTER|PCI_USES_MEM|PCI_ADDR0 +#define SPEEDO_SIZE 0x1000 +#endif -/* Operational parameter that usually are not changed. */ +struct pci_id_info static pci_id_tbl[] = { + {"Intel PCI EtherExpress Pro100 82865", { 0x12278086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel PCI EtherExpress Pro100 Smart (i960RP/RD)", + { 0x12288086, 0xffffffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel i82559 rev 8", { 0x12298086, ~0, 0,0, 8,0xff}, + SPEEDO_IOTYPE, SPEEDO_SIZE, HasChksum, }, + {"Intel PCI EtherExpress Pro100", { 0x12298086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel EtherExpress Pro/100+ i82559ER", { 0x12098086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, ResetMII, }, + {"Intel EtherExpress Pro/100 type 1029", { 0x10298086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel EtherExpress Pro/100 type 1030", { 0x10308086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 V Network", { 0x24498086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel PCI LAN0 Controller 82801E", { 0x24598086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel PCI LAN1 Controller 82801E", { 0x245D8086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VE (type 1031)", { 0x10318086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VE (type 1032)", { 0x10328086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VE (type 1033)", { 0x10338086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VE (type 1034)", { 0x10348086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VE (type 1035)", { 0x10358086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VM (type 1038)", { 0x10388086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VM (type 1039)", { 0x10398086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VM (type 103a)", { 0x103a8086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"HP/Compaq D510 Intel Pro/100 VM", + { 0x103b8086, 0xffffffff, 0x00120e11, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VM (type 103b)", { 0x103b8086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VE (type 103D)", { 0x103d8086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VE (type 103E)", { 0x103e8086, 0xffffffff,}, + SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel EtherExpress Pro/100 865G Northbridge type 1051", + { 0x10518086, 0xffffffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel PCI to PCI Bridge EtherExpress Pro100 Server Adapter", + { 0x52008086, 0xffffffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel PCI EtherExpress Pro100 Server Adapter", + { 0x52018086, 0xffffffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 VM (unknown type series 1030)", + { 0x10308086, 0xfff0ffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {"Intel Pro/100 (unknown type series 1050)", + { 0x10508086, 0xfff0ffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE, 0, }, + {0,}, /* 0 terminated list. */ +}; -/* The rest of these values should never change. */ +struct drv_id_info eepro100_drv_id = { + "eepro100", PCI_HOTSWAP, PCI_CLASS_NETWORK_ETHERNET<<8, pci_id_tbl, + speedo_found1, speedo_pwr_event, }; + +#ifndef USE_IO_OPS +#undef inb +#undef inw +#undef inl +#undef outb +#undef outw +#undef outl +#define inb readb +#define inw readw +#define inl readl +#define outb writeb +#define outw writew +#define outl writel +#endif /* Offsets to the various registers. All accesses need not be longword aligned. */ @@ -266,33 +410,52 @@ enum speedo_offsets { }; /* Commands that can be put in a command list entry. */ enum commands { - CmdNOp = 0, CmdIASetup = 1, CmdConfigure = 2, CmdMulticastList = 3, - CmdTx = 4, CmdTDR = 5, CmdDump = 6, CmdDiagnose = 7, - CmdSuspend = 0x4000, /* Suspend after completion. */ - CmdIntr = 0x2000, /* Interrupt after completion. */ - CmdTxFlex = 0x0008, /* Use "Flexible mode" for CmdTx command. */ + CmdNOp = 0, CmdIASetup = 0x10000, CmdConfigure = 0x20000, + CmdMulticastList = 0x30000, CmdTx = 0x40000, CmdTDR = 0x50000, + CmdDump = 0x60000, CmdDiagnose = 0x70000, + CmdSuspend = 0x40000000, /* Suspend after completion. */ + CmdIntr = 0x20000000, /* Interrupt after completion. */ + CmdTxFlex = 0x00080000, /* Use "Flexible mode" for CmdTx command. */ }; +/* Do atomically if possible. */ +#if defined(__i386__) +#define clear_suspend(cmd) ((char *)(&(cmd)->cmd_status))[3] &= ~0x40 +#elif defined(__alpha__) || defined(__x86_64) || defined(__ia64) +#define clear_suspend(cmd) clear_bit(30, &(cmd)->cmd_status) +#elif defined(__powerpc__) || defined(__sparc__) || (__BIG_ENDIAN) +#define clear_suspend(cmd) clear_bit(6, &(cmd)->cmd_status) +#else +#warning Undefined architecture. +#define clear_suspend(cmd) (cmd)->cmd_status &= cpu_to_le32(~CmdSuspend) +#endif -/* The SCB accepts the following controls for the Tx and Rx units: */ -#define CU_START 0x0010 -#define CU_RESUME 0x0020 -#define CU_STATSADDR 0x0040 -#define CU_SHOWSTATS 0x0050 /* Dump statistics counters. */ -#define CU_CMD_BASE 0x0060 /* Base address to add to add CU commands. */ -#define CU_DUMPSTATS 0x0070 /* Dump then reset stats counters. */ - -#define RX_START 0x0001 -#define RX_RESUME 0x0002 -#define RX_ABORT 0x0004 -#define RX_ADDR_LOAD 0x0006 -#define RX_RESUMENR 0x0007 -#define INT_MASK 0x0100 -#define DRVR_INT 0x0200 /* Driver generated interrupt. */ +enum SCBCmdBits { + SCBMaskCmdDone=0x8000, SCBMaskRxDone=0x4000, SCBMaskCmdIdle=0x2000, + SCBMaskRxSuspend=0x1000, SCBMaskEarlyRx=0x0800, SCBMaskFlowCtl=0x0400, + SCBTriggerIntr=0x0200, SCBMaskAll=0x0100, + /* The rest are Rx and Tx commands. */ + CUStart=0x0010, CUResume=0x0020, CUHiPriStart=0x0030, CUStatsAddr=0x0040, + CUShowStats=0x0050, + CUCmdBase=0x0060, /* CU Base address (set to zero) . */ + CUDumpStats=0x0070, /* Dump then reset stats counters. */ + CUHiPriResume=0x00b0, /* Resume for the high priority Tx queue. */ + RxStart=0x0001, RxResume=0x0002, RxAbort=0x0004, RxAddrLoad=0x0006, + RxResumeNoResources=0x0007, +}; + +enum intr_status_bits { + IntrCmdDone=0x8000, IntrRxDone=0x4000, IntrCmdIdle=0x2000, + IntrRxSuspend=0x1000, IntrMIIDone=0x0800, IntrDrvrIntr=0x0400, + IntrAllNormal=0xfc00, +}; + +enum SCBPort_cmds { + PortReset=0, PortSelfTest=1, PortPartialReset=2, PortDump=3, +}; /* The Speedo3 Rx and Tx frame/buffer descriptors. */ struct descriptor { /* A generic descriptor. */ - s16 status; /* Offset 0. */ - s16 command; /* Offset 2. */ + s32 cmd_status; /* All command and status fields. */ u32 link; /* struct descriptor * */ unsigned char params[0]; }; @@ -302,21 +465,27 @@ struct RxFD { /* Receive frame descr s32 status; u32 link; /* struct RxFD * */ u32 rx_buf_addr; /* void * */ - u16 count; - u16 size; + u32 count; }; -/* Elements of the RxFD.status word. */ -#define RX_COMPLETE 0x8000 +/* Selected elements of the Tx/RxFD.status word. */ +enum RxFD_bits { + RxComplete=0x8000, RxOK=0x2000, + RxErrCRC=0x0800, RxErrAlign=0x0400, RxErrTooBig=0x0200, RxErrSymbol=0x0010, + RxEth2Type=0x0020, RxNoMatch=0x0004, RxNoIAMatch=0x0002, + TxUnderrun=0x1000, StatusComplete=0x8000, +}; struct TxFD { /* Transmit frame descriptor set. */ s32 status; u32 link; /* void * */ u32 tx_desc_addr; /* Always points to the tx_buf_addr element. */ s32 count; /* # of TBD (=1), Tx start thresh., etc. */ - /* This constitutes a single "TBD" entry -- we only use one. */ - u32 tx_buf_addr; /* void *, frame to be transmitted. */ - s32 tx_buf_size; /* Length of Tx frame. */ + /* This constitutes two "TBD" entries. Non-zero-copy uses only one. */ + u32 tx_buf_addr0; /* void *, frame to be transmitted. */ + s32 tx_buf_size0; /* Length of Tx frame. */ + u32 tx_buf_addr1; /* Used only for zero-copy data section. */ + s32 tx_buf_size1; /* Length of second data buffer (0). */ }; /* Elements of the dump_statistics block. This block must be lword aligned. */ @@ -340,49 +509,87 @@ struct speedo_stats { u32 done_marker; }; +/* Do not change the position (alignment) of the first few elements! + The later elements are grouped for cache locality. */ struct speedo_private { - char devname[8]; /* Used only for kernel debugging. */ - const char *product_name; - struct device *next_module; struct TxFD tx_ring[TX_RING_SIZE]; /* Commands (usually CmdTxPacket). */ - /* The saved address of a sent-in-place packet/buffer, for skfree(). */ + struct RxFD *rx_ringp[RX_RING_SIZE]; /* Rx descriptor, used as ring. */ + struct speedo_stats lstats; /* Statistics and self-test region */ + + /* The addresses of a Tx/Rx-in-place packets/buffers. */ struct sk_buff* tx_skbuff[TX_RING_SIZE]; - struct descriptor *last_cmd; /* Last command sent. */ - /* Rx descriptor ring & addresses of receive-in-place skbuffs. */ - struct RxFD *rx_ringp[RX_RING_SIZE]; struct sk_buff* rx_skbuff[RX_RING_SIZE]; - struct RxFD *last_rxf; /* Last command sent. */ - struct enet_statistics stats; - struct speedo_stats lstats; - struct timer_list timer; /* Media selection timer. */ + + /* Transmit and other commands control. */ + struct descriptor *last_cmd; /* Last command sent. */ + unsigned int cur_tx, dirty_tx; /* The ring entries to be free()ed. */ + spinlock_t lock; /* Group with Tx control cache line. */ + u32 tx_threshold; /* The value for txdesc.count. */ + unsigned long last_cmd_time; + + /* Rx control, one cache line. */ + struct RxFD *last_rxf; /* Most recent Rx frame. */ + unsigned int cur_rx, dirty_rx; /* The next free ring entry */ + unsigned int rx_buf_sz; /* Based on MTU+slack. */ long last_rx_time; /* Last Rx, in jiffies, to handle Rx hang. */ - unsigned int cur_rx, cur_tx; /* The next free ring entry */ - unsigned int dirty_rx, dirty_tx; /* The ring entries to be free()ed. */ - struct descriptor config_cmd; /* A configure command, with header... */ - u8 config_cmd_data[22]; /* .. and setup parameters. */ + int rx_copybreak; + + int msg_level; + int max_interrupt_work; + struct net_device *next_module; + void *priv_addr; /* Unaligned address for kfree */ + struct net_device_stats stats; + int alloc_failures; + int chip_id, drv_flags; + struct pci_dev *pci_dev; + unsigned char acpi_pwr; + struct timer_list timer; /* Media selection timer. */ + /* Multicast filter command. */ int mc_setup_frm_len; /* The length of an allocated.. */ struct descriptor *mc_setup_frm; /* ..multicast setup frame. */ + int mc_setup_busy; /* Avoid double-use of setup frame. */ + int multicast_filter_limit; + int in_interrupt; /* Word-aligned dev->interrupt */ - char rx_mode; /* Current PROMISC/ALLMULTI setting. */ + int rx_mode; /* Current PROMISC/ALLMULTI setting. */ unsigned int tx_full:1; /* The Tx queue is full. */ unsigned int full_duplex:1; /* Full-duplex operation requested. */ - unsigned int default_port:1; /* Last dev->if_port value. */ + unsigned int flow_ctrl:1; /* Use 802.3x flow control. */ unsigned int rx_bug:1; /* Work around receiver hang errata. */ unsigned int rx_bug10:1; /* Receiver might hang at 10mbps. */ unsigned int rx_bug100:1; /* Receiver might hang at 100mbps. */ + unsigned int polling:1; /* Hardware blocked interrupt line. */ + unsigned int medialock:1; /* The media speed/duplex is fixed. */ + unsigned char default_port; /* Last dev->if_port value. */ unsigned short phy[2]; /* PHY media interfaces available. */ + unsigned short advertising; /* Current PHY advertised caps. */ + unsigned short partner; /* Link partner caps. */ + long last_reset; +}; + +/* Our internal RxMode state, not tied to the hardware bits. */ +enum rx_mode_bits { + AcceptAllMulticast=0x01, AcceptAllPhys=0x02, + AcceptErr=0x80, AcceptRunt=0x10, + AcceptBroadcast=0x08, AcceptMulticast=0x04, + AcceptMyPhys=0x01, RxInvalidMode=0x7f }; /* The parameters for a CmdConfigure operation. There are so many options that it would be difficult to document each bit. We mostly use the default or recommended settings. */ -const char basic_config_cmd[22] = { - 22, 0x08, 0, 0, 0, 0x80, 0x32, 0x03, 1, /* 1=Use MII 0=Use AUI */ +const char i82557_config_cmd[22] = { + 22, 0x08, 0, 0, 0, 0, 0x32, 0x03, 1, /* 1=Use MII 0=Use AUI */ 0, 0x2E, 0, 0x60, 0, 0xf2, 0x48, 0, 0x40, 0xf2, 0x80, /* 0x40=Force full-duplex */ 0x3f, 0x05, }; +const char i82558_config_cmd[22] = { + 22, 0x08, 0, 1, 0, 0, 0x22, 0x03, 1, /* 1=Use MII 0=Use AUI */ + 0, 0x2E, 0, 0x60, 0x08, 0x88, + 0x68, 0, 0x40, 0xf2, 0xBD, /* 0xBD->0xFD=Force full-duplex */ + 0x31, 0x05, }; -/* PHY media interface chips. */ +/* PHY media interface chips, defined by the databook. */ static const char *phys[] = { "None", "i82553-A/B", "i82553-C", "i82503", "DP83840", "80c240", "80c24", "i82555", @@ -392,124 +599,81 @@ enum phy_chips { NonSuchPhy=0, I82553AB, S80C24, I82555, DP83840A=10, }; static const char is_mii[] = { 0, 1, 1, 0, 1, 1, 0, 1 }; -static void speedo_found1(struct device *dev, int ioaddr, int irq, - int card_idx); +/* Standard serial configuration EEPROM commands. */ +#define EE_READ_CMD (6) -static int read_eeprom(int ioaddr, int location); -static int mdio_read(int ioaddr, int phy_id, int location); -static int mdio_write(int ioaddr, int phy_id, int location, int value); -static int speedo_open(struct device *dev); +static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len); +static int mdio_read(struct net_device *dev, int phy_id, int location); +static int mdio_write(long ioaddr, int phy_id, int location, int value); +static int speedo_open(struct net_device *dev); +static void speedo_resume(struct net_device *dev); static void speedo_timer(unsigned long data); -static void speedo_init_rx_ring(struct device *dev); -static int speedo_start_xmit(struct sk_buff *skb, struct device *dev); -static int speedo_rx(struct device *dev); +static void speedo_init_rx_ring(struct net_device *dev); +static void speedo_tx_timeout(struct net_device *dev); +static int speedo_start_xmit(struct sk_buff *skb, struct net_device *dev); +static int speedo_rx(struct net_device *dev); static void speedo_interrupt(int irq, void *dev_instance, struct pt_regs *regs); -static int speedo_close(struct device *dev); -static struct enet_statistics *speedo_get_stats(struct device *dev); -static int speedo_ioctl(struct device *dev, struct ifreq *rq, int cmd); -static void set_rx_mode(struct device *dev); +static int speedo_close(struct net_device *dev); +static struct net_device_stats *speedo_get_stats(struct net_device *dev); +static int speedo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static void set_rx_mode(struct net_device *dev); -/* The parameters that may be passed in... */ -/* 'options' is used to pass a transceiver override or full-duplex flag - e.g. "options=16" for FD, "options=32" for 100mbps-only. */ -static int full_duplex[] = {-1, -1, -1, -1, -1, -1, -1, -1}; -static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1}; -#ifdef MODULE -static int debug = -1; /* The debug level */ +#ifdef honor_default_port +/* Optional driver feature to allow forcing the transceiver setting. + Not recommended. */ +static int mii_ctrl[8] = { 0x3300, 0x3100, 0x0000, 0x0100, + 0x2000, 0x2100, 0x0400, 0x3100}; #endif /* A list of all installed Speedo devices, for removing the driver module. */ -static struct device *root_speedo_dev = NULL; - -int eepro100_init(struct device *dev) -{ - int cards_found = 0; - - if (pcibios_present()) { - static int pci_index = 0; - for (; pci_index < 8; pci_index++) { - unsigned char pci_bus, pci_device_fn, pci_irq_line, pci_latency; - int pci_ioaddr; - - unsigned short pci_command, new_command; - - if (pcibios_find_device(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82557, - pci_index, &pci_bus, - &pci_device_fn)) - break; - pcibios_read_config_byte(pci_bus, pci_device_fn, - PCI_INTERRUPT_LINE, &pci_irq_line); - /* Note: BASE_ADDRESS_0 is for memory-mapping the registers. */ - pcibios_read_config_dword(pci_bus, pci_device_fn, - PCI_BASE_ADDRESS_1, &pci_ioaddr); - /* Remove I/O space marker in bit 0. */ - pci_ioaddr &= ~3; - if (speedo_debug > 2) - printk("Found Intel i82557 PCI Speedo at I/O %#x, IRQ %d.\n", - (int)pci_ioaddr, pci_irq_line); - - /* Get and check the bus-master and latency values. */ - pcibios_read_config_word(pci_bus, pci_device_fn, - PCI_COMMAND, &pci_command); - new_command = pci_command | PCI_COMMAND_MASTER|PCI_COMMAND_IO; - if (pci_command != new_command) { - printk(KERN_INFO " The PCI BIOS has not enabled this" - " device! Updating PCI command %4.4x->%4.4x.\n", - pci_command, new_command); - pcibios_write_config_word(pci_bus, pci_device_fn, - PCI_COMMAND, new_command); - } - pcibios_read_config_byte(pci_bus, pci_device_fn, - PCI_LATENCY_TIMER, &pci_latency); - if (pci_latency < 32) { - printk(" PCI latency timer (CFLT) is unreasonably low at %d." - " Setting to 32 clocks.\n", pci_latency); - pcibios_write_config_byte(pci_bus, pci_device_fn, - PCI_LATENCY_TIMER, 32); - } else if (speedo_debug > 1) - printk(" PCI latency timer (CFLT) is %#x.\n", pci_latency); - - speedo_found1(dev, pci_ioaddr, pci_irq_line, cards_found); - dev = NULL; - cards_found++; - } - } - - return cards_found; -} +static struct net_device *root_speedo_dev = NULL; -static void speedo_found1(struct device *dev, int ioaddr, int irq, - int card_idx) +static void *speedo_found1(struct pci_dev *pdev, void *init_dev, + long ioaddr, int irq, int chip_idx, int card_idx) { - static int did_version = 0; /* Already printed version info. */ + struct net_device *dev; struct speedo_private *sp; - char *product; + void *priv_mem; int i, option; - u16 eeprom[0x40]; + u16 eeprom[0x100]; + int acpi_idle_state = 0; - if (speedo_debug > 0 && did_version++ == 0) - printk(version); + dev = init_etherdev(init_dev, 0); + if (!dev) + return NULL; - dev = init_etherdev(dev, sizeof(struct speedo_private)); - - if (dev->mem_start > 0) + if (dev->mem_start > 0) option = dev->mem_start; else if (card_idx >= 0 && options[card_idx] >= 0) option = options[card_idx]; else - option = 0; + option = -1; + + acpi_idle_state = acpi_set_pwr_state(pdev, ACPI_D0); /* Read the station address EEPROM before doing the reset. - Perhaps this should even be done before accepting the device, - then we wouldn't have a device name with which to report the error. */ + Nominally his should even be done before accepting the device, but + then we wouldn't have a device name with which to report the error. + The size test is for 6 bit vs. 8 bit address serial EEPROMs. + */ { u16 sum = 0; int j; - for (j = 0, i = 0; i < 0x40; i++) { - u16 value = read_eeprom(ioaddr, i); + int read_cmd, ee_size; + + if ((do_eeprom_cmd(ioaddr, EE_READ_CMD << 24, 27) & 0xffe0000) + == 0xffe0000) { + ee_size = 0x100; + read_cmd = EE_READ_CMD << 24; + } else { + ee_size = 0x40; + read_cmd = EE_READ_CMD << 22; + } + + for (j = 0, i = 0; i < ee_size; i++) { + u16 value = do_eeprom_cmd(ioaddr, read_cmd | (i << 16), 27); eeprom[i] = value; sum += value; if (i < 3) { @@ -528,19 +692,26 @@ static void speedo_found1(struct device /* Reset the chip: stop Tx and Rx processes and clear counters. This takes less than 10usec and will easily finish before the next action. */ - outl(0, ioaddr + SCBPort); + outl(PortReset, ioaddr + SCBPort); - if (eeprom[3] & 0x0100) - product = "OEM i82557/i82558 10/100 Ethernet"; - else - product = "Intel EtherExpress Pro 10/100"; - - printk(KERN_INFO "%s: %s at %#3x, ", dev->name, product, ioaddr); + printk(KERN_INFO "%s: %s%s at %#3lx, ", dev->name, + eeprom[3] & 0x0100 ? "OEM " : "", pci_id_tbl[chip_idx].name, + ioaddr); for (i = 0; i < 5; i++) printk("%2.2X:", dev->dev_addr[i]); printk("%2.2X, IRQ %d.\n", dev->dev_addr[i], irq); + /* We have decided to accept this device. */ + /* Allocate cached private storage. + The PCI coherent descriptor rings are allocated at each open. */ + sp = priv_mem = kmalloc(sizeof(*sp), GFP_KERNEL); + /* Check for the very unlikely case of no memory. */ + if (priv_mem == NULL) + return NULL; + dev->base_addr = ioaddr; + dev->irq = irq; + #ifndef kernel_bloat /* OK, this is pure kernel bloat. I don't like it when other drivers waste non-pageable kernel space to emit similar messages, but I need @@ -548,17 +719,14 @@ static void speedo_found1(struct device { const char *connectors[] = {" RJ45", " BNC", " AUI", " MII"}; /* The self-test results must be paragraph aligned. */ - s32 str[6], *volatile self_test_results; + s32 *volatile self_test_results; int boguscnt = 16000; /* Timeout for set-test. */ - if (eeprom[3] & 0x03) - printk(KERN_INFO " Receiver lock-up bug exists -- enabling" - " work-around.\n"); printk(KERN_INFO " Board assembly %4.4x%2.2x-%3.3d, Physical" " connectors present:", eeprom[8], eeprom[9]>>8, eeprom[9] & 0xff); for (i = 0; i < 4; i++) if (eeprom[5] & (1<>8)&15], eeprom[6] & 0x1f); if (eeprom[7] & 0x0700) @@ -566,27 +734,45 @@ static void speedo_found1(struct device phys[(eeprom[7]>>8)&7]); if (((eeprom[6]>>8) & 0x3f) == DP83840 || ((eeprom[6]>>8) & 0x3f) == DP83840A) { - int mdi_reg23 = mdio_read(ioaddr, eeprom[6] & 0x1f, 23) | 0x0422; + int mdi_reg23 = mdio_read(dev, eeprom[6] & 0x1f, 23) | 0x0422; if (congenb) mdi_reg23 |= 0x0100; printk(KERN_INFO" DP83840 specific setup, setting register 23 to %4.4x.\n", mdi_reg23); mdio_write(ioaddr, eeprom[6] & 0x1f, 23, mdi_reg23); } - if ((option >= 0) && (option & 0x70)) { + if ((option >= 0) && (option & 0x330)) { printk(KERN_INFO " Forcing %dMbs %s-duplex operation.\n", - (option & 0x20 ? 100 : 10), - (option & 0x10 ? "full" : "half")); + (option & 0x300 ? 100 : 10), + (option & 0x220 ? "full" : "half")); mdio_write(ioaddr, eeprom[6] & 0x1f, 0, - ((option & 0x20) ? 0x2000 : 0) | /* 100mbps? */ - ((option & 0x10) ? 0x0100 : 0)); /* Full duplex? */ + ((option & 0x300) ? 0x2000 : 0) | /* 100mbps? */ + ((option & 0x220) ? 0x0100 : 0)); /* Full duplex? */ + } else { + int mii_bmcrctrl = mdio_read(dev, eeprom[6] & 0x1f, 0); + /* Reset out of a transceiver left in 10baseT-fixed mode. */ + if ((mii_bmcrctrl & 0x3100) == 0) + mdio_write(ioaddr, eeprom[6] & 0x1f, 0, 0x8000); } + if (eeprom[10] & 0x0002) + printk(KERN_INFO "\n" KERN_INFO " ** The configuration " + "EEPROM enables Sleep Mode.\n" KERN_INFO "\n" + " ** This will cause PCI bus errors!\n" + KERN_INFO " ** Update the configuration EEPROM " + "with the eepro100-diag program.\n" ); + if (eeprom[6] == 0) + printk(KERN_INFO " ** The configuration EEPROM does not have a " + "transceiver type set.\n" KERN_INFO "\n" + " ** This will cause configuration problems and prevent " + "monitoring the link!\n" + KERN_INFO " ** Update the configuration EEPROM " + "with the eepro100-diag program.\n" ); /* Perform a system self-test. */ - self_test_results = (s32*) ((((long) str) + 15) & ~0xf); + self_test_results = (s32*)(&sp->lstats); self_test_results[0] = 0; self_test_results[1] = -1; - outl(virt_to_bus(self_test_results) | 1, ioaddr + SCBPort); + outl(virt_to_bus(self_test_results) | PortSelfTest, ioaddr + SCBPort); do { udelay(10); } while (self_test_results[1] == -1 && --boguscnt >= 0); @@ -610,27 +796,37 @@ static void speedo_found1(struct device } #endif /* kernel_bloat */ - outl(0, ioaddr + SCBPort); + outl(PortReset, ioaddr + SCBPort); - /* We do a request_region() only to register /proc/ioports info. */ - request_region(ioaddr, SPEEDO3_TOTAL_SIZE, "Intel Speedo3 Ethernet"); + /* Return the chip to its original power state. */ + acpi_set_pwr_state(pdev, acpi_idle_state); - dev->base_addr = ioaddr; - dev->irq = irq; + /* We do a request_region() only to register /proc/ioports info. */ + request_region(ioaddr, pci_id_tbl[chip_idx].io_size, dev->name); - if (dev->priv == NULL) - dev->priv = kmalloc(sizeof(*sp), GFP_KERNEL); - sp = dev->priv; + dev->priv = sp; /* Allocated above. */ memset(sp, 0, sizeof(*sp)); sp->next_module = root_speedo_dev; root_speedo_dev = dev; - sp->full_duplex = option >= 0 && (option & 0x10) ? 1 : 0; + sp->priv_addr = priv_mem; + sp->pci_dev = pdev; + sp->chip_id = chip_idx; + sp->drv_flags = pci_id_tbl[chip_idx].drv_flags; + sp->acpi_pwr = acpi_idle_state; + sp->msg_level = (1 << debug) - 1; + sp->rx_copybreak = rx_copybreak; + sp->max_interrupt_work = max_interrupt_work; + sp->multicast_filter_limit = multicast_filter_limit; + + sp->full_duplex = option >= 0 && (option & 0x220) ? 1 : 0; if (card_idx >= 0) { if (full_duplex[card_idx] >= 0) sp->full_duplex = full_duplex[card_idx]; } sp->default_port = option >= 0 ? (option & 0x0f) : 0; + if (sp->full_duplex) + sp->medialock = 1; sp->phy[0] = eeprom[6]; sp->phy[1] = eeprom[7]; @@ -647,8 +843,52 @@ static void speedo_found1(struct device dev->set_multicast_list = &set_rx_mode; dev->do_ioctl = &speedo_ioctl; - return; + return dev; } + +/* How to wait for the command unit to accept a command. + Typically this takes 0 ticks. */ + +static inline void wait_for_cmd_done(struct net_device *dev) +{ + long cmd_ioaddr = dev->base_addr + SCBCmd; + int wait = 0; + int delayed_cmd; + do + if (inb(cmd_ioaddr) == 0) return; + while(++wait <= 100); + delayed_cmd = inb(cmd_ioaddr); + do + if (inb(cmd_ioaddr) == 0) break; + while(++wait <= 10000); + printk(KERN_ERR "%s: Command %2.2x was not immediately accepted, " + "%d ticks!\n", + dev->name, delayed_cmd, wait); +} + +/* Perform a SCB command known to be slow. + This function checks the status both before and after command execution. */ +static void do_slow_command(struct net_device *dev, int cmd) +{ + long cmd_ioaddr = dev->base_addr + SCBCmd; + int wait = 0; + do + if (inb(cmd_ioaddr) == 0) break; + while(++wait <= 200); + if (wait > 100) + printk(KERN_ERR "%s: Command %4.4x was never accepted (%d polls)!\n", + dev->name, inb(cmd_ioaddr), wait); + outb(cmd, cmd_ioaddr); + for (wait = 0; wait <= 100; wait++) + if (inb(cmd_ioaddr) == 0) return; + for (; wait <= 20000; wait++) + if (inb(cmd_ioaddr) == 0) return; + else udelay(1); + printk(KERN_ERR "%s: Command %4.4x was not accepted after %d polls!" + " Current status %8.8x.\n", + dev->name, cmd, wait, (int)inl(dev->base_addr + SCBStatus)); +} + /* Serial EEPROM section. A "bit" grungy, but we work our way through bit-by-bit :->. */ @@ -656,67 +896,61 @@ static void speedo_found1(struct device #define EE_SHIFT_CLK 0x01 /* EEPROM shift clock. */ #define EE_CS 0x02 /* EEPROM chip select. */ #define EE_DATA_WRITE 0x04 /* EEPROM chip data in. */ -#define EE_WRITE_0 0x01 -#define EE_WRITE_1 0x05 #define EE_DATA_READ 0x08 /* EEPROM chip data out. */ #define EE_ENB (0x4800 | EE_CS) +#define EE_WRITE_0 0x4802 +#define EE_WRITE_1 0x4806 +#define EE_OFFSET SCBeeprom /* Delay between EEPROM clock transitions. - This will actually work with no delay on 33Mhz PCI. */ -#define eeprom_delay(nanosec) udelay(1); - -/* The EEPROM commands include the alway-set leading bit. */ -#define EE_WRITE_CMD (5 << 6) -#define EE_READ_CMD (6 << 6) -#define EE_ERASE_CMD (7 << 6) + The code works with no delay on 33Mhz PCI. */ +#ifndef USE_IO_OPS +#define eeprom_delay(ee_addr) writew(readw(ee_addr), ee_addr) +#else +#define eeprom_delay(ee_addr) inw(ee_addr) +#endif -static int read_eeprom(int ioaddr, int location) +static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len) { - int i; - unsigned short retval = 0; - int ee_addr = ioaddr + SCBeeprom; - int read_cmd = location | EE_READ_CMD; + unsigned retval = 0; + long ee_addr = ioaddr + SCBeeprom; - outw(EE_ENB & ~EE_CS, ee_addr); - outw(EE_ENB, ee_addr); + outw(EE_ENB | EE_SHIFT_CLK, ee_addr); - /* Shift the read command bits out. */ - for (i = 10; i >= 0; i--) { - short dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0; - outw(EE_ENB | dataval, ee_addr); - eeprom_delay(100); - outw(EE_ENB | dataval | EE_SHIFT_CLK, ee_addr); - eeprom_delay(150); - } - outw(EE_ENB, ee_addr); - - for (i = 15; i >= 0; i--) { - outw(EE_ENB | EE_SHIFT_CLK, ee_addr); - eeprom_delay(100); + /* Shift the command bits out. */ + do { + short dataval = (cmd & (1 << cmd_len)) ? EE_WRITE_1 : EE_WRITE_0; + outw(dataval, ee_addr); + eeprom_delay(ee_addr); + outw(dataval | EE_SHIFT_CLK, ee_addr); + eeprom_delay(ee_addr); retval = (retval << 1) | ((inw(ee_addr) & EE_DATA_READ) ? 1 : 0); - outw(EE_ENB, ee_addr); - eeprom_delay(100); - } + } while (--cmd_len >= 0); + outw(EE_ENB, ee_addr); /* Terminate the EEPROM access. */ outw(EE_ENB & ~EE_CS, ee_addr); return retval; } -static int mdio_read(int ioaddr, int phy_id, int location) +static int mdio_read(struct net_device *dev, int phy_id, int location) { + long ioaddr = dev->base_addr; int val, boguscnt = 64*10; /* <64 usec. to complete, typ 27 ticks */ + outl(0x08000000 | (location<<16) | (phy_id<<21), ioaddr + SCBCtrlMDI); do { val = inl(ioaddr + SCBCtrlMDI); if (--boguscnt < 0) { - printk(KERN_ERR " mdio_read() timed out with val = %8.8x.\n", val); + printk(KERN_ERR "%s: mdio_read() timed out with val = %8.8x.\n", + dev->name, val); + break; } } while (! (val & 0x10000000)); return val & 0xffff; } -static int mdio_write(int ioaddr, int phy_id, int location, int value) +static int mdio_write(long ioaddr, int phy_id, int location, int value) { int val, boguscnt = 64*10; /* <64 usec. to complete, typ 27 ticks */ outl(0x04000000 | (location<<16) | (phy_id<<21) | value, @@ -725,6 +959,7 @@ static int mdio_write(int ioaddr, int ph val = inl(ioaddr + SCBCtrlMDI); if (--boguscnt < 0) { printk(KERN_ERR" mdio_write() timed out with val = %8.8x.\n", val); + break; } } while (! (val & 0x10000000)); return val & 0xffff; @@ -732,213 +967,412 @@ static int mdio_write(int ioaddr, int ph static int -speedo_open(struct device *dev) +speedo_open(struct net_device *dev) { struct speedo_private *sp = (struct speedo_private *)dev->priv; - int ioaddr = dev->base_addr; - -#ifdef notdef - /* We could reset the chip, but should not need to. */ - outl(0, ioaddr + SCBPort); - udelay(10); -#endif - - if (request_irq(dev->irq, &speedo_interrupt, SA_SHIRQ, - "Intel EtherExpress Pro 10/100 Ethernet", dev)) { - return -EAGAIN; - } - if (speedo_debug > 1) - printk(KERN_DEBUG "%s: speedo_open() irq %d.\n", dev->name, dev->irq); + long ioaddr = dev->base_addr; MOD_INC_USE_COUNT; + acpi_set_pwr_state(sp->pci_dev, ACPI_D0); - /* Load the statistics block address. */ - wait_for_cmd_done(ioaddr + SCBCmd); - outl(virt_to_bus(&sp->lstats), ioaddr + SCBPointer); - outw(INT_MASK | CU_STATSADDR, ioaddr + SCBCmd); - sp->lstats.done_marker = 0; - - speedo_init_rx_ring(dev); - wait_for_cmd_done(ioaddr + SCBCmd); - outl(0, ioaddr + SCBPointer); - outw(INT_MASK | RX_ADDR_LOAD, ioaddr + SCBCmd); - - /* Todo: verify that we must wait for previous command completion. */ - wait_for_cmd_done(ioaddr + SCBCmd); - outl(virt_to_bus(sp->rx_ringp[0]), ioaddr + SCBPointer); - outw(INT_MASK | RX_START, ioaddr + SCBCmd); - - /* Fill the first command with our physical address. */ - { - u16 *eaddrs = (u16 *)dev->dev_addr; - u16 *setup_frm = (u16 *)&(sp->tx_ring[0].tx_desc_addr); + if (sp->msg_level & NETIF_MSG_IFUP) + printk(KERN_DEBUG "%s: speedo_open() irq %d.\n", dev->name, dev->irq); - /* Avoid a bug(?!) here by marking the command already completed. */ - sp->tx_ring[0].status = ((CmdSuspend | CmdIASetup) << 16) | 0xa000; - sp->tx_ring[0].link = virt_to_bus(&(sp->tx_ring[1])); - *setup_frm++ = eaddrs[0]; - *setup_frm++ = eaddrs[1]; - *setup_frm++ = eaddrs[2]; - } - sp->last_cmd = (struct descriptor *)&sp->tx_ring[0]; - sp->cur_tx = 1; + /* Set up the Tx queue early.. */ + sp->cur_tx = 0; sp->dirty_tx = 0; + sp->last_cmd = 0; sp->tx_full = 0; - - wait_for_cmd_done(ioaddr + SCBCmd); - outl(0, ioaddr + SCBPointer); - outw(INT_MASK | CU_CMD_BASE, ioaddr + SCBCmd); + sp->lock = (spinlock_t) SPIN_LOCK_UNLOCKED; + sp->polling = sp->in_interrupt = 0; dev->if_port = sp->default_port; - sp->in_interrupt = 0; - dev->tbusy = 0; - dev->interrupt = 0; - dev->start = 1; + if ((sp->phy[0] & 0x8000) == 0) + sp->advertising = mdio_read(dev, sp->phy[0] & 0x1f, 4); + /* With some transceivers we must retrigger negotiation to reset + power-up errors. */ + if ((sp->drv_flags & ResetMII) && + (sp->phy[0] & 0x8000) == 0) { + int phy_addr = sp->phy[0] & 0x1f ; + /* Use 0x3300 for restarting NWay, other values to force xcvr: + 0x0000 10-HD + 0x0100 10-FD + 0x2000 100-HD + 0x2100 100-FD + */ +#ifdef honor_default_port + mdio_write(ioaddr, phy_addr, 0, mii_ctrl[dev->default_port & 7]); +#else + mdio_write(ioaddr, phy_addr, 0, 0x3300); +#endif + } + + /* We can safely take handler calls during init. + Doing this after speedo_init_rx_ring() results in a memory leak. */ + if (request_irq(dev->irq, &speedo_interrupt, SA_SHIRQ, dev->name, dev)) { + MOD_DEC_USE_COUNT; + return -EAGAIN; + } - /* Start the chip's Tx process and unmask interrupts. */ - /* Todo: verify that we must wait for previous command completion. */ - wait_for_cmd_done(ioaddr + SCBCmd); - outl(virt_to_bus(&sp->tx_ring[0]), ioaddr + SCBPointer); - outw(CU_START, ioaddr + SCBCmd); + speedo_init_rx_ring(dev); + + /* Fire up the hardware. */ + speedo_resume(dev); + netif_start_tx_queue(dev); /* Setup the chip and configure the multicast list. */ sp->mc_setup_frm = NULL; sp->mc_setup_frm_len = 0; - sp->rx_mode = -1; /* Invalid -> always reset the mode. */ + sp->mc_setup_busy = 0; + sp->rx_mode = RxInvalidMode; /* Invalid -> always reset the mode. */ + sp->flow_ctrl = sp->partner = 0; set_rx_mode(dev); - if (speedo_debug > 2) { + if (sp->msg_level & NETIF_MSG_IFUP) printk(KERN_DEBUG "%s: Done speedo_open(), status %8.8x.\n", - dev->name, inw(ioaddr + SCBStatus)); - } + dev->name, (int)inw(ioaddr + SCBStatus)); + /* Set the timer. The timer serves a dual purpose: 1) to monitor the media interface (e.g. link beat) and perhaps switch to an alternate media type 2) to monitor Rx activity, and restart the Rx process if the receiver hangs. */ init_timer(&sp->timer); - sp->timer.expires = RUN_AT((24*HZ)/10); /* 2.4 sec. */ + sp->timer.expires = jiffies + 3*HZ; sp->timer.data = (unsigned long)dev; sp->timer.function = &speedo_timer; /* timer handler */ add_timer(&sp->timer); - wait_for_cmd_done(ioaddr + SCBCmd); - outw(CU_DUMPSTATS, ioaddr + SCBCmd); + /* No need to wait for the command unit to accept here. */ + if ((sp->phy[0] & 0x8000) == 0) + mdio_read(dev, sp->phy[0] & 0x1f, 0); return 0; } +/* Start the chip hardware after a full reset. */ +static void speedo_resume(struct net_device *dev) +{ + struct speedo_private *sp = (struct speedo_private *)dev->priv; + long ioaddr = dev->base_addr; + + outw(SCBMaskAll, ioaddr + SCBCmd); + + /* Start with a Tx threshold of 256 (0x..20.... 8 byte units). */ + sp->tx_threshold = 0x01208000; + + /* Set the segment registers to '0'. */ + wait_for_cmd_done(dev); + if (inb(ioaddr + SCBCmd)) { + outl(PortPartialReset, ioaddr + SCBPort); + udelay(10); + } + outl(0, ioaddr + SCBPointer); + inl(ioaddr + SCBPointer); /* Flush to PCI. */ + udelay(10); /* Bogus, but it avoids the bug. */ + /* Note: these next two operations can take a while. */ + do_slow_command(dev, RxAddrLoad); + do_slow_command(dev, CUCmdBase); + + /* Load the statistics block and rx ring addresses. */ + outl(virt_to_bus(&sp->lstats), ioaddr + SCBPointer); + inl(ioaddr + SCBPointer); /* Flush to PCI. */ + outb(CUStatsAddr, ioaddr + SCBCmd); + sp->lstats.done_marker = 0; + wait_for_cmd_done(dev); + + outl(virt_to_bus(sp->rx_ringp[sp->cur_rx % RX_RING_SIZE]), + ioaddr + SCBPointer); + inl(ioaddr + SCBPointer); /* Flush to PCI. */ + /* Note: RxStart should complete instantly. */ + do_slow_command(dev, RxStart); + do_slow_command(dev, CUDumpStats); + + /* Fill the first command with our physical address. */ + { + int entry = sp->cur_tx++ % TX_RING_SIZE; + struct descriptor *cur_cmd = (struct descriptor *)&sp->tx_ring[entry]; + + /* Avoid a bug(?!) here by marking the command already completed. */ + cur_cmd->cmd_status = cpu_to_le32((CmdSuspend | CmdIASetup) | 0xa000); + cur_cmd->link = + virt_to_le32desc(&sp->tx_ring[sp->cur_tx % TX_RING_SIZE]); + memcpy(cur_cmd->params, dev->dev_addr, 6); + if (sp->last_cmd) + clear_suspend(sp->last_cmd); + sp->last_cmd = cur_cmd; + } + + /* Start the chip's Tx process and unmask interrupts. */ + outl(virt_to_bus(&sp->tx_ring[sp->dirty_tx % TX_RING_SIZE]), + ioaddr + SCBPointer); + outw(CUStart, ioaddr + SCBCmd); +} + /* Media monitoring and control. */ static void speedo_timer(unsigned long data) { - struct device *dev = (struct device *)data; + struct net_device *dev = (struct net_device *)data; struct speedo_private *sp = (struct speedo_private *)dev->priv; - int tickssofar = jiffies - sp->last_rx_time; + long ioaddr = dev->base_addr; + int phy_num = sp->phy[0] & 0x1f; + int status = inw(ioaddr + SCBStatus); + + if (sp->msg_level & NETIF_MSG_TIMER) + printk(KERN_DEBUG "%s: Interface monitor tick, chip status %4.4x.\n", + dev->name, status); + + /* Normally we check every two seconds. */ + sp->timer.expires = jiffies + 2*HZ; + + if (sp->polling) { + /* Continue to be annoying. */ + if (status & 0xfc00) { + speedo_interrupt(dev->irq, dev, 0); + if (jiffies - sp->last_reset > 10*HZ) { + printk(KERN_ERR "%s: IRQ %d is still blocked!\n", + dev->name, dev->irq); + sp->last_reset = jiffies; + } + } else if (jiffies - sp->last_reset > 10*HZ) + sp->polling = 0; + sp->timer.expires = jiffies + 2; + } + /* We have MII and lost link beat. */ + if ((sp->phy[0] & 0x8000) == 0) { + int partner = mdio_read(dev, phy_num, 5); + if (partner != sp->partner) { + int flow_ctrl = sp->advertising & partner & 0x0400 ? 1 : 0; + sp->partner = partner; + if (flow_ctrl != sp->flow_ctrl) { + sp->flow_ctrl = flow_ctrl; + sp->rx_mode = RxInvalidMode; /* Trigger a reload. */ + } + /* Clear sticky bit. */ + mdio_read(dev, phy_num, 1); + /* If link beat has returned... */ + if (mdio_read(dev, phy_num, 1) & 0x0004) + netif_link_up(dev); + else + netif_link_down(dev); + } + } - if (speedo_debug > 3) { - int ioaddr = dev->base_addr; - printk(KERN_DEBUG "%s: Media selection tick, status %4.4x.\n", - dev->name, inw(ioaddr + SCBStatus)); - } - if (sp->rx_bug) { - if (tickssofar > 2*HZ || sp->rx_mode < 0) { - /* We haven't received a packet in a Long Time. We might have been - bitten by the receiver hang bug. This can be cleared by sending - a set multicast list command. */ - set_rx_mode(dev); - } - /* We must continue to monitor the media. */ - sp->timer.expires = RUN_AT(2*HZ); /* 2.0 sec. */ - add_timer(&sp->timer); + /* This no longer has a false-trigger window. */ + if (sp->cur_tx - sp->dirty_tx > 1 && + (jiffies - dev->trans_start) > TX_TIMEOUT && + (jiffies - sp->last_cmd_time) > TX_TIMEOUT) { + if (status == 0xffff) { + if (jiffies - sp->last_reset > 10*HZ) { + sp->last_reset = jiffies; + printk(KERN_ERR "%s: The EEPro100 chip is missing!\n", + dev->name); + } + } else if (status & 0xfc00) { + /* We have a blocked IRQ line. This should never happen, but + we recover as best we can.*/ + if ( ! sp->polling) { + if (jiffies - sp->last_reset > 10*HZ) { + printk(KERN_ERR "%s: IRQ %d is physically blocked! (%4.4x)" + "Failing back to low-rate polling.\n", + dev->name, dev->irq, status); + sp->last_reset = jiffies; + } + sp->polling = 1; + } + speedo_interrupt(dev->irq, dev, 0); + sp->timer.expires = jiffies + 2; /* Avoid */ + } else { + speedo_tx_timeout(dev); + sp->last_reset = jiffies; + } + } + if (sp->rx_mode == RxInvalidMode || + (sp->rx_bug && jiffies - sp->last_rx_time > 2*HZ)) { + /* We haven't received a packet in a Long Time. We might have been + bitten by the receiver hang bug. This can be cleared by sending + a set multicast list command. */ + set_rx_mode(dev); } + add_timer(&sp->timer); +} + +static void speedo_show_state(struct net_device *dev) +{ + struct speedo_private *sp = (struct speedo_private *)dev->priv; + int phy_num = sp->phy[0] & 0x1f; + int i; + + /* Print a few items for debugging. */ + if (sp->msg_level & NETIF_MSG_DRV) { + int i; + printk(KERN_DEBUG "%s: Tx ring dump, Tx queue %d / %d:\n", dev->name, + sp->cur_tx, sp->dirty_tx); + for (i = 0; i < TX_RING_SIZE; i++) + printk(KERN_DEBUG "%s: %c%c%d %8.8x.\n", dev->name, + i == sp->dirty_tx % TX_RING_SIZE ? '*' : ' ', + i == sp->cur_tx % TX_RING_SIZE ? '=' : ' ', + i, sp->tx_ring[i].status); + } + printk(KERN_DEBUG "%s:Printing Rx ring (next to receive into %d).\n", + dev->name, sp->cur_rx); + + for (i = 0; i < RX_RING_SIZE; i++) + printk(KERN_DEBUG " Rx ring entry %d %8.8x.\n", + i, sp->rx_ringp[i] ? (int)sp->rx_ringp[i]->status : 0); + + for (i = 0; i < 16; i++) { + if (i == 6) i = 21; + printk(KERN_DEBUG " PHY index %d register %d is %4.4x.\n", + phy_num, i, mdio_read(dev, phy_num, i)); + } + } /* Initialize the Rx and Tx rings, along with various 'dev' bits. */ static void -speedo_init_rx_ring(struct device *dev) +speedo_init_rx_ring(struct net_device *dev) { struct speedo_private *sp = (struct speedo_private *)dev->priv; struct RxFD *rxf, *last_rxf = NULL; int i; sp->cur_rx = 0; - sp->dirty_rx = RX_RING_SIZE - 1; +#if defined(CONFIG_VLAN) + /* Note that buffer sizing is not a run-time check! */ + sp->rx_buf_sz = dev->mtu + 14 + sizeof(struct RxFD) + 4; +#else + sp->rx_buf_sz = dev->mtu + 14 + sizeof(struct RxFD); +#endif + if (sp->rx_buf_sz < PKT_BUF_SZ) + sp->rx_buf_sz = PKT_BUF_SZ; for (i = 0; i < RX_RING_SIZE; i++) { struct sk_buff *skb; - skb = alloc_skb(PKT_BUF_SZ, GFP_ATOMIC); + skb = dev_alloc_skb(sp->rx_buf_sz); sp->rx_skbuff[i] = skb; if (skb == NULL) - break; /* Bad news! */ + break; /* OK. Just initially short of Rx bufs. */ skb->dev = dev; /* Mark as being used by this device. */ - rxf = (struct RxFD *)skb->tail; - skb_reserve(skb, sizeof(struct RxFD)); sp->rx_ringp[i] = rxf; + skb_reserve(skb, sizeof(struct RxFD)); if (last_rxf) - last_rxf->link = virt_to_bus(rxf); + last_rxf->link = virt_to_le32desc(rxf); last_rxf = rxf; - rxf->status = 0x00000001; /* '1' is flag value only. */ + rxf->status = cpu_to_le32(0x00000001); /* '1' is flag value only. */ rxf->link = 0; /* None yet. */ /* This field unused by i82557, we use it as a consistency check. */ +#ifdef final_version + rxf->rx_buf_addr = 0xffffffff; +#else rxf->rx_buf_addr = virt_to_bus(skb->tail); - - rxf->count = 0; - rxf->size = PKT_BUF_SZ; +#endif + rxf->count = cpu_to_le32((sp->rx_buf_sz - sizeof(struct RxFD)) << 16); } + sp->dirty_rx = (unsigned int)(i - RX_RING_SIZE); /* Mark the last entry as end-of-list. */ - last_rxf->status = 0xC0000002; /* '2' is flag value only. */ + last_rxf->status = cpu_to_le32(0xC0000002); /* '2' is flag value only. */ sp->last_rxf = last_rxf; } -static void speedo_tx_timeout(struct device *dev) +static void speedo_tx_timeout(struct net_device *dev) { struct speedo_private *sp = (struct speedo_private *)dev->priv; - int ioaddr = dev->base_addr; + long ioaddr = dev->base_addr; + int status = inw(ioaddr + SCBStatus); printk(KERN_WARNING "%s: Transmit timed out: status %4.4x " - "command %4.4x.\n", - dev->name, inw(ioaddr + SCBStatus), inw(ioaddr + SCBCmd)); - - if ((inw(ioaddr + SCBStatus) & 0x00C0) != 0x0080) { - printk(KERN_WARNING "%s: Trying to restart the transmitter...\n", - dev->name); - outl(virt_to_bus(&sp->tx_ring[sp->dirty_tx % TX_RING_SIZE]), - ioaddr + SCBPointer); - outw(CU_START, ioaddr + SCBCmd); + " %4.4x at %d/%d commands %8.8x %8.8x %8.8x.\n", + dev->name, status, (int)inw(ioaddr + SCBCmd), + sp->dirty_tx, sp->cur_tx, + sp->tx_ring[(sp->dirty_tx+0) % TX_RING_SIZE].status, + sp->tx_ring[(sp->dirty_tx+1) % TX_RING_SIZE].status, + sp->tx_ring[(sp->dirty_tx+2) % TX_RING_SIZE].status); + + /* Trigger a stats dump to give time before the reset. */ + speedo_get_stats(dev); + + speedo_show_state(dev); + if ((status & 0x00C0) != 0x0080 + && (status & 0x003C) == 0x0010 && 0) { + /* Only the command unit has stopped. */ + printk(KERN_WARNING "%s: Trying to restart the transmitter...\n", + dev->name); + outl(virt_to_bus(&sp->tx_ring[sp->dirty_tx % TX_RING_SIZE]), + ioaddr + SCBPointer); + outw(CUStart, ioaddr + SCBCmd); } else { - outw(DRVR_INT, ioaddr + SCBCmd); + printk(KERN_WARNING "%s: Restarting the chip...\n", + dev->name); + /* Reset the Tx and Rx units. */ + outl(PortReset, ioaddr + SCBPort); + if (sp->msg_level & NETIF_MSG_TX_ERR) + speedo_show_state(dev); + udelay(10); + speedo_resume(dev); } /* Reset the MII transceiver, suggested by Fred Young @ scalable.com. */ if ((sp->phy[0] & 0x8000) == 0) { int phy_addr = sp->phy[0] & 0x1f; + int advertising = mdio_read(dev, phy_addr, 4); + int mii_bmcr = mdio_read(dev, phy_addr, 0); mdio_write(ioaddr, phy_addr, 0, 0x0400); mdio_write(ioaddr, phy_addr, 1, 0x0000); mdio_write(ioaddr, phy_addr, 4, 0x0000); mdio_write(ioaddr, phy_addr, 0, 0x8000); +#ifdef honor_default_port + mdio_write(ioaddr, phy_addr, 0, mii_ctrl[dev->default_port & 7]); +#else + mdio_read(dev, phy_addr, 0); + mdio_write(ioaddr, phy_addr, 0, mii_bmcr); + mdio_write(ioaddr, phy_addr, 4, advertising); +#endif } sp->stats.tx_errors++; dev->trans_start = jiffies; return; } +/* Handle the interrupt cases when something unexpected happens. */ +static void speedo_intr_error(struct net_device *dev, int intr_status) +{ + long ioaddr = dev->base_addr; + struct speedo_private *sp = (struct speedo_private *)dev->priv; + + if (intr_status & IntrRxSuspend) { + if ((intr_status & 0x003c) == 0x0028) /* No more Rx buffers. */ + outb(RxResumeNoResources, ioaddr + SCBCmd); + else if ((intr_status & 0x003c) == 0x0008) { /* No resources (why?!) */ + printk(KERN_DEBUG "%s: Unknown receiver error, status=%#4.4x.\n", + dev->name, intr_status); + /* No idea of what went wrong. Restart the receiver. */ + outl(virt_to_bus(sp->rx_ringp[sp->cur_rx % RX_RING_SIZE]), + ioaddr + SCBPointer); + outb(RxStart, ioaddr + SCBCmd); + } + sp->stats.rx_errors++; + } +} + + static int -speedo_start_xmit(struct sk_buff *skb, struct device *dev) +speedo_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct speedo_private *sp = (struct speedo_private *)dev->priv; - int ioaddr = dev->base_addr; + long ioaddr = dev->base_addr; int entry; /* Block a timer-based transmit from overlapping. This could better be done with atomic_swap(1, dev->tbusy), but set_bit() works as well. If this ever occurs the queue layer is doing something evil! */ - if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) { + if (netif_pause_tx_queue(dev) != 0) { int tickssofar = jiffies - dev->trans_start; if (tickssofar < TX_TIMEOUT - 2) return 1; if (tickssofar < TX_TIMEOUT) { /* Reap sent packets from the full Tx queue. */ - outw(DRVR_INT, ioaddr + SCBCmd); + outw(SCBTriggerIntr, ioaddr + SCBCmd); return 1; } speedo_tx_timeout(dev); @@ -951,42 +1385,42 @@ speedo_start_xmit(struct sk_buff *skb, s { /* Prevent interrupts from changing the Tx ring from underneath us. */ unsigned long flags; - save_flags(flags); - cli(); + spin_lock_irqsave(&sp->lock, flags); /* Calculate the Tx descriptor entry. */ - entry = sp->cur_tx++ % TX_RING_SIZE; + entry = sp->cur_tx % TX_RING_SIZE; sp->tx_skbuff[entry] = skb; /* Todo: be a little more clever about setting the interrupt bit. */ sp->tx_ring[entry].status = - (CmdSuspend | CmdTx | CmdTxFlex) << 16; + cpu_to_le32(CmdSuspend | CmdTx | CmdTxFlex); + sp->cur_tx++; sp->tx_ring[entry].link = - virt_to_bus(&sp->tx_ring[sp->cur_tx % TX_RING_SIZE]); + virt_to_le32desc(&sp->tx_ring[sp->cur_tx % TX_RING_SIZE]); + /* We may nominally release the lock here. */ sp->tx_ring[entry].tx_desc_addr = - virt_to_bus(&sp->tx_ring[entry].tx_buf_addr); - /* The data region is always in one buffer descriptor, Tx FIFO - threshold of 256. */ - sp->tx_ring[entry].count = 0x01208000; - sp->tx_ring[entry].tx_buf_addr = virt_to_bus(skb->data); - sp->tx_ring[entry].tx_buf_size = skb->len; + virt_to_le32desc(&sp->tx_ring[entry].tx_buf_addr0); + /* The data region is always in one buffer descriptor. */ + sp->tx_ring[entry].count = cpu_to_le32(sp->tx_threshold); + sp->tx_ring[entry].tx_buf_addr0 = virt_to_le32desc(skb->data); + sp->tx_ring[entry].tx_buf_size0 = cpu_to_le32(skb->len); /* Todo: perhaps leave the interrupt bit set if the Tx queue is more than half full. Argument against: we should be receiving packets and scavenging the queue. Argument for: if so, it shouldn't matter. */ - sp->last_cmd->command &= ~(CmdSuspend | CmdIntr); - sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry]; - /* Trigger the command unit resume. */ - wait_for_cmd_done(ioaddr + SCBCmd); - outw(CU_RESUME, ioaddr + SCBCmd); - restore_flags(flags); + { + struct descriptor *last_cmd = sp->last_cmd; + sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry]; + clear_suspend(last_cmd); + } + if (sp->cur_tx - sp->dirty_tx >= TX_QUEUE_LIMIT) { + sp->tx_full = 1; + netif_stop_tx_queue(dev); + } else + netif_unpause_tx_queue(dev); + spin_unlock_irqrestore(&sp->lock, flags); } - - /* Leave room for set_rx_mode() to fill two entries. */ - if (sp->cur_tx - sp->dirty_tx > TX_RING_SIZE - 3) - sp->tx_full = 1; - else - clear_bit(0, (void*)&dev->tbusy); - + wait_for_cmd_done(dev); + outb(CUResume, ioaddr + SCBCmd); dev->trans_start = jiffies; return 0; @@ -996,76 +1430,83 @@ speedo_start_xmit(struct sk_buff *skb, s after the Tx thread. */ static void speedo_interrupt(int irq, void *dev_instance, struct pt_regs *regs) { - struct device *dev = (struct device *)dev_instance; + struct net_device *dev = (struct net_device *)dev_instance; struct speedo_private *sp; - int ioaddr, boguscnt = max_interrupt_work; - unsigned short status; - -#ifndef final_version - if (dev == NULL) { - printk(KERN_ERR "speedo_interrupt(): irq %d for unknown device.\n", irq); - return; - } -#endif + long ioaddr; + int work_limit; + u16 status; ioaddr = dev->base_addr; sp = (struct speedo_private *)dev->priv; + work_limit = sp->max_interrupt_work; #ifndef final_version /* A lock to prevent simultaneous entry on SMP machines. */ if (test_and_set_bit(0, (void*)&sp->in_interrupt)) { printk(KERN_ERR"%s: SMP simultaneous entry of an interrupt handler.\n", dev->name); + sp->in_interrupt = 0; /* Avoid halting machine. */ return; } - dev->interrupt = 1; #endif do { status = inw(ioaddr + SCBStatus); + + if ((status & IntrAllNormal) == 0 || status == 0xffff) + break; /* Acknowledge all of the current interrupt sources ASAP. */ - outw(status & 0xfc00, ioaddr + SCBStatus); + outw(status & IntrAllNormal, ioaddr + SCBStatus); - if (speedo_debug > 4) + if (sp->msg_level & NETIF_MSG_INTR) printk(KERN_DEBUG "%s: interrupt status=%#4.4x.\n", dev->name, status); - if ((status & 0xfc00) == 0) - break; - - if (status & 0x4000) /* Packet received. */ + if (status & (IntrRxDone|IntrRxSuspend)) speedo_rx(dev); - if (status & 0x1000) { - if ((status & 0x003c) == 0x0028) /* No more Rx buffers. */ - outw(RX_RESUMENR, ioaddr + SCBCmd); - else if ((status & 0x003c) == 0x0008) { /* No resources (why?!) */ - /* No idea of what went wrong. Restart the receiver. */ - outl(virt_to_bus(sp->rx_ringp[sp->cur_rx % RX_RING_SIZE]), - ioaddr + SCBPointer); - outw(RX_START, ioaddr + SCBCmd); - } - sp->stats.rx_errors++; - } - - /* User interrupt, Command/Tx unit interrupt or CU not active. */ - if (status & 0xA400) { - unsigned int dirty_tx = sp->dirty_tx; + /* The command unit did something, scavenge finished Tx entries. */ + if (status & (IntrCmdDone | IntrCmdIdle | IntrDrvrIntr)) { + unsigned int dirty_tx; + /* We should nominally not need this lock. */ + spin_lock(&sp->lock); + dirty_tx = sp->dirty_tx; while (sp->cur_tx - dirty_tx > 0) { int entry = dirty_tx % TX_RING_SIZE; - int status = sp->tx_ring[entry].status; + int status = le32_to_cpu(sp->tx_ring[entry].status); - if (speedo_debug > 5) + if (sp->msg_level & NETIF_MSG_INTR) printk(KERN_DEBUG " scavenge candidate %d status %4.4x.\n", entry, status); - if ((status & 0x8000) == 0) - break; /* It still hasn't been processed. */ + if ((status & StatusComplete) == 0) { + /* Special case error check: look for descriptor that the + chip skipped(?). */ + if (sp->cur_tx - dirty_tx > 2 && + (sp->tx_ring[(dirty_tx+1) % TX_RING_SIZE].status + & cpu_to_le32(StatusComplete))) { + printk(KERN_ERR "%s: Command unit failed to mark " + "command %8.8x as complete at %d.\n", + dev->name, status, dirty_tx); + } else + break; /* It still hasn't been processed. */ + } + if ((status & TxUnderrun) && + (sp->tx_threshold < 0x01e08000)) { + sp->tx_threshold += 0x00040000; + if (sp->msg_level & NETIF_MSG_TX_ERR) + printk(KERN_DEBUG "%s: Tx threshold increased, " + "%#8.8x.\n", dev->name, sp->tx_threshold); + } /* Free the original skb. */ if (sp->tx_skbuff[entry]) { sp->stats.tx_packets++; /* Count only user packets. */ - dev_kfree_skb(sp->tx_skbuff[entry], FREE_WRITE); +#if LINUX_VERSION_CODE > 0x20127 + sp->stats.tx_bytes += sp->tx_skbuff[entry]->len; +#endif + dev_free_skb_irq(sp->tx_skbuff[entry]); sp->tx_skbuff[entry] = 0; - } + } else if ((status & 0x70000) == CmdNOp) + sp->mc_setup_busy = 0; dirty_tx++; } @@ -1078,18 +1519,20 @@ static void speedo_interrupt(int irq, vo } #endif - if (sp->tx_full && dev->tbusy - && dirty_tx > sp->cur_tx - TX_RING_SIZE + 2) { + sp->dirty_tx = dirty_tx; + if (sp->tx_full + && sp->cur_tx - dirty_tx < TX_QUEUE_UNFULL) { /* The ring is no longer full, clear tbusy. */ sp->tx_full = 0; - clear_bit(0, (void*)&dev->tbusy); - mark_bh(NET_BH); + netif_resume_tx_queue(dev); } - - sp->dirty_tx = dirty_tx; + spin_unlock(&sp->lock); } - if (--boguscnt < 0) { + if (status & IntrRxSuspend) + speedo_intr_error(dev, status); + + if (--work_limit < 0) { printk(KERN_ERR "%s: Too much work at interrupt, status=0x%4.4x.\n", dev->name, status); /* Clear all interrupt sources. */ @@ -1098,123 +1541,126 @@ static void speedo_interrupt(int irq, vo } } while (1); - if (speedo_debug > 3) + if (sp->msg_level & NETIF_MSG_INTR) printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4x.\n", - dev->name, inw(ioaddr + SCBStatus)); + dev->name, (int)inw(ioaddr + SCBStatus)); - dev->interrupt = 0; clear_bit(0, (void*)&sp->in_interrupt); return; } static int -speedo_rx(struct device *dev) +speedo_rx(struct net_device *dev) { struct speedo_private *sp = (struct speedo_private *)dev->priv; int entry = sp->cur_rx % RX_RING_SIZE; int status; + int rx_work_limit = sp->dirty_rx + RX_RING_SIZE - sp->cur_rx; - if (speedo_debug > 4) + if (sp->msg_level & NETIF_MSG_RX_STATUS) printk(KERN_DEBUG " In speedo_rx().\n"); /* If we own the next entry, it's a new packet. Send it up. */ - while ((status = sp->rx_ringp[entry]->status) & RX_COMPLETE) { + while (sp->rx_ringp[entry] != NULL && + (status = le32_to_cpu(sp->rx_ringp[entry]->status)) & RxComplete) { + int desc_count = le32_to_cpu(sp->rx_ringp[entry]->count); + int pkt_len = desc_count & 0x07ff; - if (speedo_debug > 4) + if (--rx_work_limit < 0) + break; + if (sp->msg_level & NETIF_MSG_RX_STATUS) printk(KERN_DEBUG " speedo_rx() status %8.8x len %d.\n", status, - sp->rx_ringp[entry]->count & 0x3fff); - if (status & 0x0200) { - printk(KERN_ERR "%s: Ethernet frame overran the Rx buffer, " - "status %8.8x!\n", dev->name, status); - } else if ( ! (status & 0x2000)) { - /* There was a fatal error. This *should* be impossible. */ - sp->stats.rx_errors++; - printk(KERN_ERR "%s: Anomalous event in speedo_rx(), status %8.8x.\n", - dev->name, status); + pkt_len); + if ((status & (RxErrTooBig|RxOK|0x0f90)) != RxOK) { + if (status & RxErrTooBig) + printk(KERN_ERR "%s: Ethernet frame overran the Rx buffer, " + "status %8.8x!\n", dev->name, status); + else if ( ! (status & RxOK)) { + /* There was a fatal error. This *should* be impossible. */ + sp->stats.rx_errors++; + printk(KERN_ERR "%s: Anomalous event in speedo_rx(), " + "status %8.8x.\n", dev->name, status); + } } else { - /* Malloc up new buffer, compatible with net-2e. */ - int pkt_len = sp->rx_ringp[entry]->count & 0x3fff; struct sk_buff *skb; - int rx_in_place = 0; + + if (sp->drv_flags & HasChksum) + pkt_len -= 2; /* Check if the packet is long enough to just accept without copying to a properly sized skbuff. */ - if (pkt_len > rx_copybreak) { - struct sk_buff *newskb; - char *temp; - - /* Pass up the skb already on the Rx ring. */ + if (pkt_len < sp->rx_copybreak + && (skb = dev_alloc_skb(pkt_len + 2)) != 0) { + skb->dev = dev; + skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ + /* 'skb_put()' points to the start of sk_buff data area. */ + /* Packet is in one chunk -- we can copy + cksum. */ + eth_copy_and_sum(skb, sp->rx_skbuff[entry]->tail, pkt_len, 0); + skb_put(skb, pkt_len); + } else { + void *temp; + /* Pass up the already-filled skbuff. */ skb = sp->rx_skbuff[entry]; + if (skb == NULL) { + printk(KERN_ERR "%s: Inconsistent Rx descriptor chain.\n", + dev->name); + break; + } + sp->rx_skbuff[entry] = NULL; temp = skb_put(skb, pkt_len); +#if !defined(final_version) && !defined(__powerpc__) if (bus_to_virt(sp->rx_ringp[entry]->rx_buf_addr) != temp) - printk(KERN_ERR "%s: Warning -- the skbuff addresses do not match" - " in speedo_rx: %8.8x vs. %p / %p.\n", dev->name, - sp->rx_ringp[entry]->rx_buf_addr, skb->head, temp); - /* Get a fresh skbuff to replace the filled one. */ - newskb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); - - if (newskb) { - struct RxFD *rxf; - rx_in_place = 1; - sp->rx_skbuff[entry] = newskb; - newskb->dev = dev; - rxf = sp->rx_ringp[entry] = (struct RxFD *)newskb->tail; - skb_reserve(newskb, sizeof(struct RxFD)); - /* Unused by i82557, consistency check only. */ - rxf->rx_buf_addr = virt_to_bus(newskb->tail); - rxf->status = 0x00000001; - } else /* No memory, drop the packet. */ - skb = 0; - } else - skb = dev_alloc_skb(pkt_len + 2); - if (skb == NULL) { - int i; - printk(KERN_ERR "%s: Memory squeeze, deferring packet.\n", dev->name); - /* Check that at least two ring entries are free. - If not, free one and mark stats->rx_dropped++. */ - /* ToDo: This is not correct!!!! We should count the number - of linked-in Rx buffer to very that we have at least two - remaining. */ - for (i = 0; i < RX_RING_SIZE; i++) - if (! ((sp->rx_ringp[(entry+i) % RX_RING_SIZE]->status) - & RX_COMPLETE)) - break; - - if (i > RX_RING_SIZE -2) { - sp->stats.rx_dropped++; - sp->rx_ringp[entry]->status = 0; - sp->cur_rx++; - } - break; - } - skb->dev = dev; - if (! rx_in_place) { - skb_reserve(skb, 2); /* 16 byte align the data fields */ -#if defined(__i386) && notyet - /* Packet is in one chunk -- we can copy + cksum. */ - eth_io_copy_and_sum(skb, bus_to_virt(sp->rx_ringp[entry]->rx_buf_addr), - pkt_len, 0); -#else - memcpy(skb_put(skb, pkt_len), - bus_to_virt(sp->rx_ringp[entry]->rx_buf_addr), pkt_len); + printk(KERN_ERR "%s: Rx consistency error -- the skbuff " + "addresses do not match in speedo_rx: %p vs. %p " + "/ %p.\n", dev->name, + bus_to_virt(sp->rx_ringp[entry]->rx_buf_addr), + skb->head, temp); #endif + sp->rx_ringp[entry] = NULL; } skb->protocol = eth_type_trans(skb, dev); + if (sp->drv_flags & HasChksum) { +#if 0 + u16 csum = get_unaligned((u16*)(skb->head + pkt_len)) + if (desc_count & 0x8000) + skb->ip_summed = CHECKSUM_UNNECESSARY; +#endif + } netif_rx(skb); sp->stats.rx_packets++; +#if LINUX_VERSION_CODE > 0x20127 + sp->stats.rx_bytes += pkt_len; +#endif } + entry = (++sp->cur_rx) % RX_RING_SIZE; + } - /* ToDo: This is better than before, but should be checked. */ - { - struct RxFD *rxf = sp->rx_ringp[entry]; - rxf->status = 0xC0000003; /* '3' for verification only */ - rxf->link = 0; /* None yet. */ - rxf->count = 0; - rxf->size = PKT_BUF_SZ; - sp->last_rxf->link = virt_to_bus(rxf); - sp->last_rxf->status &= ~0xC0000000; - sp->last_rxf = rxf; - entry = (++sp->cur_rx) % RX_RING_SIZE; + /* Refill the Rx ring buffers. */ + for (; sp->cur_rx - sp->dirty_rx > 0; sp->dirty_rx++) { + struct RxFD *rxf; + entry = sp->dirty_rx % RX_RING_SIZE; + if (sp->rx_skbuff[entry] == NULL) { + struct sk_buff *skb; + /* Get a fresh skbuff to replace the consumed one. */ + skb = dev_alloc_skb(sp->rx_buf_sz); + sp->rx_skbuff[entry] = skb; + if (skb == NULL) { + sp->rx_ringp[entry] = NULL; + sp->alloc_failures++; + break; /* Better luck next time! */ + } + rxf = sp->rx_ringp[entry] = (struct RxFD *)skb->tail; + skb->dev = dev; + skb_reserve(skb, sizeof(struct RxFD)); + rxf->rx_buf_addr = virt_to_le32desc(skb->tail); + } else { + rxf = sp->rx_ringp[entry]; } + rxf->status = cpu_to_le32(0xC0000001); /* '1' for driver use only. */ + rxf->link = 0; /* None yet. */ + rxf->count = cpu_to_le32((sp->rx_buf_sz - sizeof(struct RxFD)) << 16); + sp->last_rxf->link = virt_to_le32desc(rxf); + sp->last_rxf->status &= cpu_to_le32(~0xC0000000); + sp->last_rxf = rxf; } sp->last_rx_time = jiffies; @@ -1222,25 +1668,25 @@ speedo_rx(struct device *dev) } static int -speedo_close(struct device *dev) +speedo_close(struct net_device *dev) { - int ioaddr = dev->base_addr; + long ioaddr = dev->base_addr; struct speedo_private *sp = (struct speedo_private *)dev->priv; int i; - dev->start = 0; - dev->tbusy = 1; + netif_stop_tx_queue(dev); - if (speedo_debug > 1) - printk(KERN_DEBUG "%s: Shutting down ethercard, status was %4.4x.\n", - dev->name, inw(ioaddr + SCBStatus)); + if (sp->msg_level & NETIF_MSG_IFDOWN) + printk(KERN_DEBUG "%s: Shutting down ethercard, status was %4.4x.\n" + KERN_DEBUG "%s: Cumlative allocation failures: %d.\n", + dev->name, (int)inw(ioaddr + SCBStatus), + dev->name, sp->alloc_failures); /* Shut off the media monitoring timer. */ del_timer(&sp->timer); - /* Disable interrupts, and stop the chip's Rx process. */ - outw(INT_MASK, ioaddr + SCBCmd); - outw(INT_MASK | RX_ABORT, ioaddr + SCBCmd); + /* Shutting down the chip nicely fails to disable flow control. So.. */ + outl(PortPartialReset, ioaddr + SCBPort); free_irq(dev->irq, dev); @@ -1249,8 +1695,12 @@ speedo_close(struct device *dev) struct sk_buff *skb = sp->rx_skbuff[i]; sp->rx_skbuff[i] = 0; /* Clear the Rx descriptors. */ - if (skb) - dev_kfree_skb(skb, FREE_WRITE); + if (skb) { +#if LINUX_VERSION_CODE < 0x20100 + skb->free = 1; +#endif + dev_free_skb(skb); + } } for (i = 0; i < TX_RING_SIZE; i++) { @@ -1258,7 +1708,7 @@ speedo_close(struct device *dev) sp->tx_skbuff[i] = 0; /* Clear the Tx descriptors. */ if (skb) - dev_kfree_skb(skb, FREE_WRITE); + dev_free_skb(skb); } if (sp->mc_setup_frm) { kfree(sp->mc_setup_frm); @@ -1266,22 +1716,11 @@ speedo_close(struct device *dev) } /* Print a few items for debugging. */ - if (speedo_debug > 3) { - int phy_num = sp->phy[0] & 0x1f; - printk(KERN_DEBUG "%s:Printing Rx ring (next to receive into %d).\n", - dev->name, sp->cur_rx); - - for (i = 0; i < RX_RING_SIZE; i++) - printk(KERN_DEBUG " Rx ring entry %d %8.8x.\n", - i, (int)sp->rx_ringp[i]->status); - - for (i = 0; i < 5; i++) - printk(KERN_DEBUG " PHY index %d register %d is %4.4x.\n", - phy_num, i, mdio_read(ioaddr, phy_num, i)); - for (i = 21; i < 26; i++) - printk(KERN_DEBUG " PHY index %d register %d is %4.4x.\n", - phy_num, i, mdio_read(ioaddr, phy_num, i)); - } + if (sp->msg_level & NETIF_MSG_IFDOWN) + speedo_show_state(dev); + + /* Alt: acpi_set_pwr_state(pdev, sp->acpi_pwr); */ + acpi_set_pwr_state(sp->pci_dev, ACPI_D2); MOD_DEC_USE_COUNT; return 0; @@ -1299,50 +1738,100 @@ speedo_close(struct device *dev) Oh, and incoming frames are dropped while executing dump-stats! */ -static struct enet_statistics * -speedo_get_stats(struct device *dev) +static struct net_device_stats *speedo_get_stats(struct net_device *dev) { struct speedo_private *sp = (struct speedo_private *)dev->priv; - int ioaddr = dev->base_addr; + long ioaddr = dev->base_addr; - if (sp->lstats.done_marker == 0xA007) { /* Previous dump finished */ - sp->stats.tx_aborted_errors += sp->lstats.tx_coll16_errs; - sp->stats.tx_window_errors += sp->lstats.tx_late_colls; - sp->stats.tx_fifo_errors += sp->lstats.tx_underruns; - sp->stats.tx_fifo_errors += sp->lstats.tx_lost_carrier; - /*sp->stats.tx_deferred += sp->lstats.tx_deferred;*/ - sp->stats.collisions += sp->lstats.tx_total_colls; - sp->stats.rx_crc_errors += sp->lstats.rx_crc_errs; - sp->stats.rx_frame_errors += sp->lstats.rx_align_errs; - sp->stats.rx_over_errors += sp->lstats.rx_resource_errs; - sp->stats.rx_fifo_errors += sp->lstats.rx_overrun_errs; - sp->stats.rx_length_errors += sp->lstats.rx_runt_errs; + /* Update only if the previous dump finished. */ + if (sp->lstats.done_marker == le32_to_cpu(0xA007)) { + sp->stats.tx_aborted_errors += le32_to_cpu(sp->lstats.tx_coll16_errs); + sp->stats.tx_window_errors += le32_to_cpu(sp->lstats.tx_late_colls); + sp->stats.tx_fifo_errors += le32_to_cpu(sp->lstats.tx_underruns); + sp->stats.tx_fifo_errors += le32_to_cpu(sp->lstats.tx_lost_carrier); + /*sp->stats.tx_deferred += le32_to_cpu(sp->lstats.tx_deferred);*/ + sp->stats.collisions += le32_to_cpu(sp->lstats.tx_total_colls); + sp->stats.rx_crc_errors += le32_to_cpu(sp->lstats.rx_crc_errs); + sp->stats.rx_frame_errors += le32_to_cpu(sp->lstats.rx_align_errs); + sp->stats.rx_over_errors += le32_to_cpu(sp->lstats.rx_resource_errs); + sp->stats.rx_fifo_errors += le32_to_cpu(sp->lstats.rx_overrun_errs); + sp->stats.rx_length_errors += le32_to_cpu(sp->lstats.rx_runt_errs); sp->lstats.done_marker = 0x0000; - if (dev->start) { - wait_for_cmd_done(ioaddr + SCBCmd); - outw(CU_DUMPSTATS, ioaddr + SCBCmd); + if (netif_running(dev)) { + wait_for_cmd_done(dev); + outb(CUDumpStats, ioaddr + SCBCmd); } } return &sp->stats; } -static int speedo_ioctl(struct device *dev, struct ifreq *rq, int cmd) +static int speedo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { struct speedo_private *sp = (struct speedo_private *)dev->priv; - int ioaddr = dev->base_addr; + long ioaddr = dev->base_addr; u16 *data = (u16 *)&rq->ifr_data; + u32 *data32 = (void *)&rq->ifr_data; int phy = sp->phy[0] & 0x1f; + int saved_acpi; - switch(cmd) { - case SIOCDEVPRIVATE: /* Get the address of the PHY in use. */ + switch(cmd) { + case 0x8947: case 0x89F0: + /* SIOCGMIIPHY: Get the address of the PHY in use. */ data[0] = phy; - case SIOCDEVPRIVATE+1: /* Read the specified MII register. */ - data[3] = mdio_read(ioaddr, data[0], data[1]); + /* Fall Through */ + case 0x8948: case 0x89F1: + /* SIOCGMIIREG: Read the specified MII register. */ + saved_acpi = acpi_set_pwr_state(sp->pci_dev, ACPI_D0); + data[3] = mdio_read(dev, data[0], data[1]); + acpi_set_pwr_state(sp->pci_dev, saved_acpi); return 0; - case SIOCDEVPRIVATE+2: /* Write the specified MII register */ - if (!suser()) + case 0x8949: case 0x89F2: + /* SIOCSMIIREG: Write the specified MII register */ + if (!capable(CAP_NET_ADMIN)) return -EPERM; + if (data[0] == sp->phy[0]) { + u16 value = data[2]; + switch (data[1]) { + case 0: + /* Check for autonegotiation on or reset. */ + sp->medialock = (value & 0x9000) ? 0 : 1; + if (sp->medialock) { + sp->full_duplex = (value & 0x0100) ? 1 : 0; + sp->rx_mode = RxInvalidMode; + } + break; + case 4: sp->advertising = value; break; + } + } + saved_acpi = acpi_set_pwr_state(sp->pci_dev, ACPI_D0); mdio_write(ioaddr, data[0], data[1], data[2]); + acpi_set_pwr_state(sp->pci_dev, saved_acpi); + return 0; + case SIOCGPARAMS: + data32[0] = sp->msg_level; + data32[1] = sp->multicast_filter_limit; + data32[2] = sp->max_interrupt_work; + data32[3] = sp->rx_copybreak; +#if 0 + /* No room in the ioctl() to set these. */ + data32[4] = txfifo; + data32[5] = rxfifo; +#endif + return 0; + case SIOCSPARAMS: + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + sp->msg_level = data32[0]; + sp->multicast_filter_limit = data32[1]; + sp->max_interrupt_work = data32[2]; + sp->rx_copybreak = data32[3]; +#if 0 + /* No room in the ioctl() to set these. */ + if (data32[4] < 16) + txfifo = data32[4]; + if (data32[5] < 16) + rxfifo = data32[5]; +#endif return 0; default: return -EOPNOTSUPP; @@ -1358,85 +1847,92 @@ static int speedo_ioctl(struct device *d loaded the link -- we convert the current command block, normally a Tx command, into a no-op and link it to the new command. */ -static void -set_rx_mode(struct device *dev) +static void set_rx_mode(struct net_device *dev) { struct speedo_private *sp = (struct speedo_private *)dev->priv; - int ioaddr = dev->base_addr; + long ioaddr = dev->base_addr; + struct descriptor *last_cmd; char new_rx_mode; unsigned long flags; int entry, i; if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ - new_rx_mode = 3; + new_rx_mode = AcceptAllMulticast | AcceptAllPhys; } else if ((dev->flags & IFF_ALLMULTI) || - dev->mc_count > multicast_filter_limit) { - new_rx_mode = 1; + dev->mc_count > sp->multicast_filter_limit) { + new_rx_mode = AcceptAllMulticast; } else new_rx_mode = 0; if (sp->cur_tx - sp->dirty_tx >= TX_RING_SIZE - 1) { /* The Tx ring is full -- don't add anything! Presumably the new mode - is in config_cmd_data and will be added anyway. */ - sp->rx_mode = -1; + is in config_cmd_data and will be added anyway, otherwise we wait + for a timer tick or the mode to change again. */ + sp->rx_mode = RxInvalidMode; return; } if (new_rx_mode != sp->rx_mode) { - /* We must change the configuration. Construct a CmdConfig frame. */ - memcpy(sp->config_cmd_data, basic_config_cmd,sizeof(basic_config_cmd)); - sp->config_cmd_data[1] = (txfifo << 4) | rxfifo; - sp->config_cmd_data[4] = rxdmacount; - sp->config_cmd_data[5] = txdmacount + 0x80; - sp->config_cmd_data[15] = (new_rx_mode & 2) ? 0x49 : 0x48; - sp->config_cmd_data[19] = sp->full_duplex ? 0xC0 : 0x80; - sp->config_cmd_data[21] = (new_rx_mode & 1) ? 0x0D : 0x05; + u8 *config_cmd_data; + + spin_lock_irqsave(&sp->lock, flags); + entry = sp->cur_tx % TX_RING_SIZE; + last_cmd = sp->last_cmd; + sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry]; + + sp->tx_skbuff[entry] = 0; /* Redundant. */ + sp->tx_ring[entry].status = cpu_to_le32(CmdSuspend | CmdConfigure); + sp->cur_tx++; + sp->tx_ring[entry].link = + virt_to_le32desc(&sp->tx_ring[(entry + 1) % TX_RING_SIZE]); + /* We may nominally release the lock here. */ + + config_cmd_data = (void *)&sp->tx_ring[entry].tx_desc_addr; + /* Construct a full CmdConfig frame. */ + memcpy(config_cmd_data, i82558_config_cmd, sizeof(i82558_config_cmd)); + config_cmd_data[1] = (txfifo << 4) | rxfifo; + config_cmd_data[4] = rxdmacount; + config_cmd_data[5] = txdmacount + 0x80; + config_cmd_data[6] |= (new_rx_mode & AcceptErr) ? 0x80 : 0; + config_cmd_data[7] &= (new_rx_mode & AcceptRunt) ? ~0x01 : ~0; + if (sp->drv_flags & HasChksum) + config_cmd_data[9] |= 1; + config_cmd_data[15] |= (new_rx_mode & AcceptAllPhys) ? 1 : 0; + config_cmd_data[19] = sp->flow_ctrl ? 0xBD : 0x80; + config_cmd_data[19] |= sp->full_duplex ? 0x40 : 0; + config_cmd_data[21] = (new_rx_mode & AcceptAllMulticast) ? 0x0D : 0x05; if (sp->phy[0] & 0x8000) { /* Use the AUI port instead. */ - sp->config_cmd_data[15] |= 0x80; - sp->config_cmd_data[8] = 0; - } - save_flags(flags); - cli(); - /* Fill the "real" tx_ring frame with a no-op and point it to us. */ - entry = sp->cur_tx++ % TX_RING_SIZE; - sp->tx_skbuff[entry] = 0; /* Nothing to free. */ - sp->tx_ring[entry].status = CmdNOp << 16; - sp->tx_ring[entry].link = virt_to_bus(&sp->config_cmd); - sp->config_cmd.status = 0; - sp->config_cmd.command = CmdSuspend | CmdConfigure; - sp->config_cmd.link = - virt_to_bus(&(sp->tx_ring[sp->cur_tx % TX_RING_SIZE])); - sp->last_cmd->command &= ~CmdSuspend; - /* Immediately trigger the command unit resume. */ - wait_for_cmd_done(ioaddr + SCBCmd); - outw(CU_RESUME, ioaddr + SCBCmd); - sp->last_cmd = &sp->config_cmd; - restore_flags(flags); - if (speedo_debug > 5) { - int i; - printk(KERN_DEBUG " CmdConfig frame in entry %d.\n", entry); - for(i = 0; i < 32; i++) - printk(" %2.2x", ((unsigned char *)&sp->config_cmd)[i]); - printk(".\n"); + config_cmd_data[15] |= 0x80; + config_cmd_data[8] = 0; } + /* Trigger the command unit resume. */ + wait_for_cmd_done(dev); + clear_suspend(last_cmd); + outb(CUResume, ioaddr + SCBCmd); + spin_unlock_irqrestore(&sp->lock, flags); + sp->last_cmd_time = jiffies; } - if (new_rx_mode == 0 && dev->mc_count < 3) { - /* The simple case of 0-2 multicast list entries occurs often, and + if (new_rx_mode == 0 && dev->mc_count < 4) { + /* The simple case of 0-3 multicast list entries occurs often, and fits within one tx_ring[] entry. */ - u16 *setup_params, *eaddrs; struct dev_mc_list *mclist; + u16 *setup_params, *eaddrs; + + spin_lock_irqsave(&sp->lock, flags); + entry = sp->cur_tx % TX_RING_SIZE; + last_cmd = sp->last_cmd; + sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry]; - save_flags(flags); - cli(); - entry = sp->cur_tx++ % TX_RING_SIZE; sp->tx_skbuff[entry] = 0; - sp->tx_ring[entry].status = (CmdSuspend | CmdMulticastList) << 16; + sp->tx_ring[entry].status = cpu_to_le32(CmdSuspend | CmdMulticastList); + sp->cur_tx++; sp->tx_ring[entry].link = - virt_to_bus(&sp->tx_ring[sp->cur_tx % TX_RING_SIZE]); + virt_to_le32desc(&sp->tx_ring[(entry + 1) % TX_RING_SIZE]); + /* We may nominally release the lock here. */ sp->tx_ring[entry].tx_desc_addr = 0; /* Really MC list count. */ setup_params = (u16 *)&sp->tx_ring[entry].tx_desc_addr; - *setup_params++ = dev->mc_count*6; + *setup_params++ = cpu_to_le16(dev->mc_count*6); /* Fill in the multicast addresses. */ for (i = 0, mclist = dev->mc_list; i < dev->mc_count; i++, mclist = mclist->next) { @@ -1446,45 +1942,50 @@ set_rx_mode(struct device *dev) *setup_params++ = *eaddrs++; } - sp->last_cmd->command &= ~CmdSuspend; + wait_for_cmd_done(dev); + clear_suspend(last_cmd); /* Immediately trigger the command unit resume. */ - wait_for_cmd_done(ioaddr + SCBCmd); - outw(CU_RESUME, ioaddr + SCBCmd); - sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry]; - restore_flags(flags); + outb(CUResume, ioaddr + SCBCmd); + spin_unlock_irqrestore(&sp->lock, flags); + sp->last_cmd_time = jiffies; } else if (new_rx_mode == 0) { - /* This does not work correctly, but why not? */ struct dev_mc_list *mclist; - u16 *eaddrs; + u16 *setup_params, *eaddrs; struct descriptor *mc_setup_frm = sp->mc_setup_frm; - u16 *setup_params; int i; if (sp->mc_setup_frm_len < 10 + dev->mc_count*6 || sp->mc_setup_frm == NULL) { - /* Allocate a new frame, 10bytes + addrs, with a few - extra entries for growth. */ + /* Allocate a full setup frame, 10bytes + . */ if (sp->mc_setup_frm) kfree(sp->mc_setup_frm); - sp->mc_setup_frm_len = 10 + dev->mc_count*6 + 24; + sp->mc_setup_busy = 0; + sp->mc_setup_frm_len = 10 + sp->multicast_filter_limit*6; sp->mc_setup_frm = kmalloc(sp->mc_setup_frm_len, GFP_ATOMIC); if (sp->mc_setup_frm == NULL) { - printk(KERN_ERR "%s: Failed to allocate a setup frame.\n", dev->name); - sp->rx_mode = -1; /* We failed, try again. */ + printk(KERN_ERR "%s: Failed to allocate a setup frame.\n", + dev->name); + sp->rx_mode = RxInvalidMode; /* We failed, try again. */ return; } } + /* If we are busy, someone might be quickly adding to the MC list. + Try again later when the list updates stop. */ + if (sp->mc_setup_busy) { + sp->rx_mode = RxInvalidMode; + return; + } mc_setup_frm = sp->mc_setup_frm; - /* Construct the new setup frame. */ - if (speedo_debug > 1) + /* Fill the setup frame. */ + if (sp->msg_level & NETIF_MSG_RXFILTER) printk(KERN_DEBUG "%s: Constructing a setup frame at %p, " "%d bytes.\n", dev->name, sp->mc_setup_frm, sp->mc_setup_frm_len); - mc_setup_frm->status = 0; - mc_setup_frm->command = CmdSuspend | CmdIntr | CmdMulticastList; + mc_setup_frm->cmd_status = + cpu_to_le32(CmdSuspend | CmdIntr | CmdMulticastList); /* Link set below. */ - setup_params = (u16 *)mc_setup_frm->params; - *setup_params++ = dev->mc_count*6; + setup_params = (u16 *)&mc_setup_frm->params; + *setup_params++ = cpu_to_le16(dev->mc_count*6); /* Fill in the multicast addresses. */ for (i = 0, mclist = dev->mc_list; i < dev->mc_count; i++, mclist = mclist->next) { @@ -1495,86 +1996,158 @@ set_rx_mode(struct device *dev) } /* Disable interrupts while playing with the Tx Cmd list. */ - save_flags(flags); - cli(); - entry = sp->cur_tx++ % TX_RING_SIZE; - - if (speedo_debug > 5) - printk(" CmdMCSetup frame length %d in entry %d.\n", - dev->mc_count, entry); + spin_lock_irqsave(&sp->lock, flags); + entry = sp->cur_tx % TX_RING_SIZE; + last_cmd = sp->last_cmd; + sp->last_cmd = mc_setup_frm; + sp->mc_setup_busy++; /* Change the command to a NoOp, pointing to the CmdMulti command. */ sp->tx_skbuff[entry] = 0; - sp->tx_ring[entry].status = CmdNOp << 16; - sp->tx_ring[entry].link = virt_to_bus(mc_setup_frm); + sp->tx_ring[entry].status = cpu_to_le32(CmdNOp); + sp->cur_tx++; + sp->tx_ring[entry].link = virt_to_le32desc(mc_setup_frm); + /* We may nominally release the lock here. */ /* Set the link in the setup frame. */ mc_setup_frm->link = - virt_to_bus(&(sp->tx_ring[sp->cur_tx % TX_RING_SIZE])); + virt_to_le32desc(&(sp->tx_ring[(entry+1) % TX_RING_SIZE])); - sp->last_cmd->command &= ~CmdSuspend; + wait_for_cmd_done(dev); + clear_suspend(last_cmd); /* Immediately trigger the command unit resume. */ - wait_for_cmd_done(ioaddr + SCBCmd); - outw(CU_RESUME, ioaddr + SCBCmd); - sp->last_cmd = mc_setup_frm; - restore_flags(flags); - if (speedo_debug > 1) - printk(KERN_DEBUG "%s: Last command at %p is %4.4x.\n", - dev->name, sp->last_cmd, sp->last_cmd->command); + outb(CUResume, ioaddr + SCBCmd); + spin_unlock_irqrestore(&sp->lock, flags); + sp->last_cmd_time = jiffies; + if (sp->msg_level & NETIF_MSG_RXFILTER) + printk(KERN_DEBUG " CmdMCSetup frame length %d in entry %d.\n", + dev->mc_count, entry); } sp->rx_mode = new_rx_mode; } + +static int speedo_pwr_event(void *dev_instance, int event) +{ + struct net_device *dev = dev_instance; + struct speedo_private *np = (struct speedo_private *)dev->priv; + long ioaddr = dev->base_addr; + + if (np->msg_level & NETIF_MSG_LINK) + printk(KERN_DEBUG "%s: Handling power event %d.\n", dev->name, event); + switch(event) { + case DRV_ATTACH: + MOD_INC_USE_COUNT; + break; + case DRV_SUSPEND: + outl(PortPartialReset, ioaddr + SCBPort); + break; + case DRV_RESUME: + speedo_resume(dev); + np->rx_mode = RxInvalidMode; + np->flow_ctrl = np->partner = 0; + set_rx_mode(dev); + break; + case DRV_DETACH: { + struct net_device **devp, **next; + if (dev->flags & IFF_UP) { + dev_close(dev); + dev->flags &= ~(IFF_UP|IFF_RUNNING); + } + unregister_netdev(dev); + release_region(dev->base_addr, pci_id_tbl[np->chip_id].io_size); +#ifndef USE_IO_OPS + iounmap((char *)dev->base_addr); +#endif + for (devp = &root_speedo_dev; *devp; devp = next) { + next = &((struct speedo_private *)(*devp)->priv)->next_module; + if (*devp == dev) { + *devp = *next; + break; + } + } + if (np->priv_addr) + kfree(np->priv_addr); + kfree(dev); + MOD_DEC_USE_COUNT; + break; + } + case DRV_PWR_DOWN: + case DRV_PWR_UP: + acpi_set_pwr_state(np->pci_dev, event==DRV_PWR_DOWN ? ACPI_D3:ACPI_D0); + break; + case DRV_PWR_WakeOn: + default: + return -1; + } + + return 0; +} -#ifdef MODULE -int -init_module(void) +#if defined(MODULE) || (LINUX_VERSION_CODE >= 0x020400) + +int init_module(void) { int cards_found; - if (debug >= 0) - speedo_debug = debug; - if (speedo_debug) - printk(KERN_INFO "%s", version); - - root_speedo_dev = NULL; - cards_found = eepro100_init(NULL); - return cards_found ? 0 : -ENODEV; + /* Emit version even if no cards detected. */ + printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2); + cards_found = pci_drv_register(&eepro100_drv_id, NULL); + if (cards_found < 0) + printk(KERN_INFO "eepro100: No cards found, driver not installed.\n"); + return cards_found; } -void -cleanup_module(void) +void cleanup_module(void) { - struct device *next_dev; + struct net_device *next_dev; + + pci_drv_unregister(&eepro100_drv_id); /* No need to check MOD_IN_USE, as sys_delete_module() checks. */ while (root_speedo_dev) { - next_dev = ((struct speedo_private *)root_speedo_dev->priv)->next_module; + struct speedo_private *sp = (void *)root_speedo_dev->priv; unregister_netdev(root_speedo_dev); - release_region(root_speedo_dev->base_addr, SPEEDO3_TOTAL_SIZE); +#ifdef USE_IO_OPS + release_region(root_speedo_dev->base_addr, + pci_id_tbl[sp->chip_id].io_size); +#else + iounmap((char *)root_speedo_dev->base_addr); +#endif + acpi_set_pwr_state(sp->pci_dev, sp->acpi_pwr); + next_dev = sp->next_module; + if (sp->priv_addr) + kfree(sp->priv_addr); kfree(root_speedo_dev); root_speedo_dev = next_dev; } } + +#if (LINUX_VERSION_CODE >= 0x020400) && 0 +module_init(init_module); +module_exit(cleanup_module); +#endif + #else /* not MODULE */ -int eepro100_probe(struct device *dev) -{ - int cards_found = 0; - cards_found = eepro100_init(dev); +int eepro100_probe(struct net_device *dev) +{ + int cards_found = pci_drv_register(&eepro100_drv_id, dev); - if (speedo_debug > 0 && cards_found) - printk(version); + /* Only emit the version if the driver is being used. */ + if (cards_found >= 0) + printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2); - return cards_found ? 0 : -ENODEV; + return cards_found; } #endif /* MODULE */ /* * Local variables: - * compile-command: "gcc -DMODULE -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -c eepro100.c `[ -f /usr/include/linux/modversions.h ] && echo -DMODVERSIONS`" - * SMP-compile-command: "gcc -D__SMP__ -DMODULE -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -c eepro100.c `[ -f /usr/include/linux/modversions.h ] && echo -DMODVERSIONS`" + * compile-command: "make KERNVER=`uname -r` eepro100.o" + * compile-cmd: "gcc -DMODULE -Wall -Wstrict-prototypes -O6 -c eepro100.c" + * simple-compile-command: "gcc -DMODULE -O6 -c eepro100.c" * c-indent-level: 4 * c-basic-offset: 4 * tab-width: 4