diff -urN linux-2.6.13.4-virgin/Documentation/kernel-parameters.txt linux-2.6.13.4-arcnet/Documentation/kernel-parameters.txt --- linux-2.6.13.4-virgin/Documentation/kernel-parameters.txt 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/Documentation/kernel-parameters.txt 2005-10-22 22:36:29.000000000 -0400 @@ -227,9 +227,6 @@ applicom= [HW] Format: , - arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards - Format: ,, - ataflop= [HW,M68k] atarimouse= [HW,MOUSE] Atari Mouse diff -urN linux-2.6.13.4-virgin/Documentation/networking/arcnet.txt linux-2.6.13.4-arcnet/Documentation/networking/arcnet.txt --- linux-2.6.13.4-virgin/Documentation/networking/arcnet.txt 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/Documentation/networking/arcnet.txt 2005-10-23 06:14:22.000000000 -0400 @@ -1,4 +1,10 @@ ---------------------------------------------------------------------------- +NOTE: the kernel insmod options have changed, and new ones have been added +in order to tweek performance. if you have any questions or concerns, good +fortune, with the new additions, Please email me (Andrew J. Kroll) . +However if the new additions kill your pet worm because of a data increase, +I'm not responsible! :-) (...oh and yes Avery, I still use arcnet!) +---------------------------------------------------------------------------- NOTE: See also arcnet-hardware.txt in this directory for jumper-setting and cabling information if you're like many of us and didn't happen to get a manual with your ARCnet card. @@ -118,20 +124,64 @@ You will know the driver is installed properly if you get some ARCnet messages when you reboot into the new Linux kernel. +NOTE: The old parameters have changed! + +module insmod parameter kernel parameter +------------- ---------------------- --------------------- +arcnet debug= arcnet.debug= + +com90xx io= com90xx.io= + irq= com90xx.irq= + shmem= com90xx.shmem= + device= com90xx.device= + queue= com90xx.queue= + timeo= com90xx.timeo= + +com20020-isa io= com20020-isa.io= + irq= com20020-isa.irq= + node= com20020-isa.node= + backplane= com20020-isa.backplane= + clock= com20020-isa.clock= + timeout= com20020-isa.timeout= + device= com20020-isa.device= + queue= com20020-isa.queue= + timeo= com20020-isa.timeo= + +com20020-pci io= com20020-pci.io= + irq= com20020-pci.irq= + node= com20020-pci.node= + backplane= com20020-pci.backplane= + clock= com20020-pci.clock= + timeout= com20020-pci.timeout= + device= com20020-pci.device= + queue= com20020-pci.queue= + timeo= com20020-pci.timeo= + +com90io io= com90io.io= + irq= com90io.irq= + device= com90io.device= + queue= com90io.queue= + timeo= com90io.timeo= + +arc-rimi irq= arc-rimi.irq= + node= arc-rimi.node= + shmem= arc-rimi.shmem= + device= arc-rimidevice= + queue= arc-rimi.queue= + timeo= arc-rimi.timeo= + + +NEW OPTIONS EXPLANATION: +queue sets the queue depth for outbound packets. 250 is the default value. +timeo sets the network watch dog timer. 200 is the default value (.2 seconds). + + There are four chipset options: 1. Standard ARCnet COM90xx chipset. This is the normal ARCnet card, which you've probably got. This is the only chipset driver which will autoprobe if not told where the card is. -It following options on the command line: - com90xx=[[,[,]]][,] | - -If you load the chipset support as a module, the options are: - io= irq= shmem= device= - -To disable the autoprobe, just specify "com90xx=" on the kernel command line. -To specify the name alone, but allow autoprobe, just put "com90xx=" 2. ARCnet COM20020 chipset. @@ -139,12 +189,6 @@ sniffing), extra diagnostic information, etc. Unfortunately, there is no sensible method of autoprobing for these cards. You must specify the I/O address on the kernel command line. -The command line options are: - com20020=[,[,[,backplane[,CKP[,timeout]]]]][,name] - -If you load the chipset support as a module, the options are: - io= irq= node= backplane= clock= - timeout= device= The COM20020 chipset allows you to set the node ID in software, overriding the default which is still set in DIP switches on the card. If you don't have the @@ -159,23 +203,12 @@ you have so many ARCnet cards in your machine that you run out of shmem slots. If you don't give the IO address on the kernel command line, then the driver will not find the card. -The command line options are: - com90io=[,][,] - -If you load the chipset support as a module, the options are: - io= irq= device= 4. ARCnet RIM I cards. These are COM90xx chips which are _completely_ memory mapped. The support for these is not tested. If you have one, please mail the author with a success report. All options must be specified, except the device name. -Command line options: - arcrimi=,,[,] - -If you load the chipset support as a module, the options are: - shmem= irq= node= device= - Loadable Module Support ----------------------- @@ -228,7 +261,7 @@ If you have other cards, with support compiled into the kernel, then you can just repeat the options on the kernel command line, e.g.: -LILO: linux com20020=0x2e0 com20020=0x380 com90io=0x260 +LILO: linux com20020.io=0x2e0 com20020.io=0x380 com90io.io=0x260 If you have the chipset support built as a loadable module, then you need to do something like this: diff -urN linux-2.6.13.4-virgin/drivers/net/arcnet/arc-rimi.c linux-2.6.13.4-arcnet/drivers/net/arcnet/arc-rimi.c --- linux-2.6.13.4-virgin/drivers/net/arcnet/arc-rimi.c 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/drivers/net/arcnet/arc-rimi.c 2005-10-23 06:22:47.000000000 -0400 @@ -78,6 +78,22 @@ #define AINTMASK(msk) writeb((msk),_INTMASK) #define SETCONF() writeb(lp->config,_CONFIG) +static int node; +static int io; /* use the insmod io= irq= node= options */ +static int irq; +static char device[9]; /* use eg. device=arc1 to change name */ +static int queue = DEFAULT_QUEUE_SIZE; /* --AJK */ +static int timeo = TX_TIMEOUT; /* --AJK See Documentation/networking/arcnet.txt */ + +module_param(node, int, 0); +module_param(io, int, 0); +module_param(irq, int, 0); +module_param_string(device, device, sizeof(device), 0); +module_param(queue, int, 0); +module_param(timeo, int, 0); +MODULE_LICENSE("GPL"); + +static struct net_device *my_dev; /* * We cannot probe for a RIM I card; one reason is I don't know how to reset @@ -97,25 +113,44 @@ "must specify the shmem and irq!\n"); return -ENODEV; } + if (dev->dev_addr[0] == 0) { + BUGMSG(D_NORMAL, "You need to specify your card's station " + "ID!\n"); + return -ENODEV; + } /* - * Grab the memory region at mem_start for BUFFER_SIZE bytes. + * Grab the memory region at mem_start for MIRROR_SIZE bytes. * Later in arcrimi_found() the real size will be determined * and this reserve will be released and the correct size * will be taken. */ - if (!request_mem_region(dev->mem_start, BUFFER_SIZE, "arcnet (90xx)")) { + if (!request_mem_region(dev->mem_start, MIRROR_SIZE, "arcnet (90xx)")) { BUGMSG(D_NORMAL, "Card memory already allocated\n"); return -ENODEV; } - if (dev->dev_addr[0] == 0) { - release_mem_region(dev->mem_start, BUFFER_SIZE); - BUGMSG(D_NORMAL, "You need to specify your card's station " - "ID!\n"); - return -ENODEV; - } return arcrimi_found(dev); } +static int check_mirror(unsigned long addr, size_t size) +{ + void __iomem *p; + int res = -1; + + if (!request_mem_region(addr, size, "arcnet (90xx)")) + return -1; + + p = ioremap(addr, size); + if (p) { + if (readb(p) == TESTvalue) + res = 1; + else + res = 0; + iounmap(p); + } + + release_mem_region(addr, size); + return res; +} /* * Set up the struct net_device associated with this card. Called after @@ -125,19 +160,28 @@ { struct arcnet_local *lp; unsigned long first_mirror, last_mirror, shmem; + void __iomem *p; int mirror_size; int err; + p = ioremap(dev->mem_start, MIRROR_SIZE); + if (!p) { + release_mem_region(dev->mem_start, MIRROR_SIZE); + BUGMSG(D_NORMAL, "Can't ioremap\n"); + return -ENODEV; + } + /* reserve the irq */ if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (RIM I)", dev)) { - release_mem_region(dev->mem_start, BUFFER_SIZE); + iounmap(p); + release_mem_region(dev->mem_start, MIRROR_SIZE); BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); return -ENODEV; } shmem = dev->mem_start; - isa_writeb(TESTvalue, shmem); - isa_writeb(dev->dev_addr[0], shmem + 1); /* actually the node ID */ + writeb(TESTvalue, p); + writeb(dev->dev_addr[0], p + 1); /* actually the node ID */ /* find the real shared memory start/end points, including mirrors */ @@ -146,17 +190,18 @@ * 2k (or there are no mirrors at all) but on some, it's 4k. */ mirror_size = MIRROR_SIZE; - if (isa_readb(shmem) == TESTvalue - && isa_readb(shmem - mirror_size) != TESTvalue - && isa_readb(shmem - 2 * mirror_size) == TESTvalue) - mirror_size *= 2; + if (readb(p) == TESTvalue + && check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0 + && check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1) + mirror_size = 2 * MIRROR_SIZE; - first_mirror = last_mirror = shmem; - while (isa_readb(first_mirror) == TESTvalue) + first_mirror = shmem - mirror_size; + while (check_mirror(first_mirror, mirror_size) == 1) first_mirror -= mirror_size; first_mirror += mirror_size; - while (isa_readb(last_mirror) == TESTvalue) + last_mirror = shmem + mirror_size; + while (check_mirror(last_mirror, mirror_size) == 1) last_mirror += mirror_size; last_mirror -= mirror_size; @@ -181,7 +226,8 @@ * with the correct size. There is a VERY slim chance this could * fail. */ - release_mem_region(shmem, BUFFER_SIZE); + iounmap(p); + release_mem_region(shmem, MIRROR_SIZE); if (!request_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1, "arcnet (90xx)")) { @@ -208,6 +254,8 @@ if (err) goto err_unmap; + BUGMSG(D_NORMAL, "ARC-RIMI station %02Xh has queue %lu, and a timeout of %i jiffies\n", + dev->dev_addr[0], dev->tx_queue_len, dev->watchdog_timeo * 1000 / HZ); return 0; err_unmap: @@ -290,18 +338,6 @@ TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count)); } -static int node; -static int io; /* use the insmod io= irq= node= options */ -static int irq; -static char device[9]; /* use eg. device=arc1 to change name */ - -module_param(node, int, 0); -module_param(io, int, 0); -module_param(irq, int, 0); -module_param_string(device, device, sizeof(device), 0); -MODULE_LICENSE("GPL"); - -static struct net_device *my_dev; static int __init arc_rimi_init(void) { @@ -319,6 +355,10 @@ if (dev->irq == 2) dev->irq = 9; + if(queue < 30) queue = 30; + if(timeo < 10) timeo = 10; + dev->tx_queue_len = queue; + dev->watchdog_timeo = HZ * timeo / 1000; if (arcrimi_probe(dev)) { free_netdev(dev); return -EIO; diff -urN linux-2.6.13.4-virgin/drivers/net/arcnet/arcnet.c linux-2.6.13.4-arcnet/drivers/net/arcnet/arcnet.c --- linux-2.6.13.4-virgin/drivers/net/arcnet/arcnet.c 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/drivers/net/arcnet/arcnet.c 2005-10-23 06:02:34.000000000 -0400 @@ -323,9 +323,25 @@ dev->mtu = choose_mtu(); dev->addr_len = ARCNET_ALEN; - dev->tx_queue_len = 100; + dev->tx_queue_len = DEFAULT_QUEUE_SIZE; /* See below */ dev->broadcast[0] = 0x00; /* for us, broadcasts are address 0 */ - dev->watchdog_timeo = TX_TIMEOUT; + dev->watchdog_timeo = HZ * TX_TIMEOUT / 1000; /* See below */ + /* + Originally tx_queue_len was 30, which caused to many kickme's, + while 100 is an improvement, it's still not enough. + + 250 works as a good starting point for 2.5Mb devices, with a + 1500 MTU. It should be able to keep accepting, unless + something goes horribly wrong. If your card is faster, I highly + reccomend increasing this value via insmod. + + On a personal note, I have used a value of 1000 for years. + + You may set it to any reasonable value when you insmod + the chipset driver now, same for the watchdog_timeo. + "Bad" values will be considered a reset to defaults. + --AJK + */ /* New-style flags. */ dev->flags = IFF_BROADCAST; diff -urN linux-2.6.13.4-virgin/drivers/net/arcnet/com20020-isa.c linux-2.6.13.4-arcnet/drivers/net/arcnet/com20020-isa.c --- linux-2.6.13.4-virgin/drivers/net/arcnet/com20020-isa.c 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/drivers/net/arcnet/com20020-isa.c 2005-10-23 06:22:51.000000000 -0400 @@ -43,6 +43,34 @@ #define VERSION "arcnet: COM20020 ISA support (by David Woodhouse et al.)\n" +/* Module parameters */ + +static int node = 0; +static int io = 0x0; /* <--- EDIT THESE LINES FOR YOUR CONFIGURATION */ +static int irq = 0; /* or use the insmod io= irq= shmem= options */ +static char device[9]; /* use eg. device="arc1" to change name */ +static int timeout = 3; +static int backplane = 0; +static int clockp = 0; +static int clockm = 0; +static int queue = DEFAULT_QUEUE_SIZE; /* --AJK */ +static int timeo = TX_TIMEOUT; /* --AJK See Documentation/networking/arcnet.txt */ + +module_param(node, int, 0); +module_param(io, int, 0); +module_param(irq, int, 0); +module_param_string(device, device, sizeof(device), 0); +module_param(timeout, int, 0); +module_param(backplane, int, 0); +module_param(clockp, int, 0); +module_param(clockm, int, 0); +module_param(queue, int, 0); +module_param(timeo, int, 0); + +MODULE_LICENSE("GPL"); + +static struct net_device *my_dev; + /* * We cannot (yet) probe for an IO mapped card, although we can check that @@ -117,28 +145,6 @@ return err; } -static int node = 0; -static int io = 0x0; /* <--- EDIT THESE LINES FOR YOUR CONFIGURATION */ -static int irq = 0; /* or use the insmod io= irq= shmem= options */ -static char device[9]; /* use eg. device="arc1" to change name */ -static int timeout = 3; -static int backplane = 0; -static int clockp = 0; -static int clockm = 0; - -module_param(node, int, 0); -module_param(io, int, 0); -module_param(irq, int, 0); -module_param_string(device, device, sizeof(device), 0); -module_param(timeout, int, 0); -module_param(backplane, int, 0); -module_param(clockp, int, 0); -module_param(clockm, int, 0); - -MODULE_LICENSE("GPL"); - -static struct net_device *my_dev; - static int __init com20020_init(void) { struct net_device *dev; @@ -148,6 +154,10 @@ if (!dev) return -ENOMEM; + if(queue < 30) queue = 30; + if(timeo < 10) timeo = 10; + dev->tx_queue_len = queue; + dev->watchdog_timeo = HZ * timeo / 1000; if (node && node != 0xff) dev->dev_addr[0] = node; diff -urN linux-2.6.13.4-virgin/drivers/net/arcnet/com20020-pci.c linux-2.6.13.4-arcnet/drivers/net/arcnet/com20020-pci.c --- linux-2.6.13.4-virgin/drivers/net/arcnet/com20020-pci.c 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/drivers/net/arcnet/com20020-pci.c 2005-10-23 06:23:06.000000000 -0400 @@ -52,6 +52,8 @@ static int backplane; static int clockp; static int clockm; +static int queue = DEFAULT_QUEUE_SIZE; /* --AJK */ +static int timeo = TX_TIMEOUT; /* --AJK See Documentation/networking/arcnet.txt */ module_param(node, int, 0); module_param_string(device, device, sizeof(device), 0); @@ -59,6 +61,8 @@ module_param(backplane, int, 0); module_param(clockp, int, 0); module_param(clockm, int, 0); +module_param(queue, int, 0); +module_param(timeo, int, 0); MODULE_LICENSE("GPL"); static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) @@ -72,6 +76,11 @@ dev = alloc_arcdev(device); if (!dev) return -ENOMEM; + + if(queue < 30) queue = 30; + if(timeo < 10) timeo = 10; + dev->tx_queue_len = queue; + dev->watchdog_timeo = HZ * timeo / 1000; lp = dev->priv; pci_set_drvdata(pdev, dev); diff -urN linux-2.6.13.4-virgin/drivers/net/arcnet/com20020.c linux-2.6.13.4-arcnet/drivers/net/arcnet/com20020.c --- linux-2.6.13.4-virgin/drivers/net/arcnet/com20020.c 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/drivers/net/arcnet/com20020.c 2005-10-23 06:02:34.000000000 -0400 @@ -219,6 +219,8 @@ free_irq(dev->irq, dev); return -EIO; } + BUGMSG(D_NORMAL, "COM20020 station %02Xh has queue %lu, and a timeout of %i jiffies\n", + dev->dev_addr[0], dev->tx_queue_len, dev->watchdog_timeo * 1000 / HZ); return 0; } diff -urN linux-2.6.13.4-virgin/drivers/net/arcnet/com90io.c linux-2.6.13.4-arcnet/drivers/net/arcnet/com90io.c --- linux-2.6.13.4-virgin/drivers/net/arcnet/com90io.c 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/drivers/net/arcnet/com90io.c 2005-10-23 06:23:05.000000000 -0400 @@ -78,6 +78,23 @@ #define AINTMASK(msk) outb((msk),_INTMASK) #define SETCONF() outb((lp->config),_CONFIG) +/* Module parameters */ + +static int io; /* use the insmod io= irq= shmem= options */ +static int irq; +static char device[9]; /* use eg. device=arc1 to change name */ +static int queue = DEFAULT_QUEUE_SIZE; +static int timeo = TX_TIMEOUT; + +module_param(io, int, 0); +module_param(irq, int, 0); +module_param_string(device, device, sizeof(device), 0); +module_param(queue, int, 0); /* --AJK */ +module_param(timeo, int, 0); /* --AJK See Documentation/networking/arcnet.txt */ +MODULE_LICENSE("GPL"); + +static struct net_device *my_dev; + /**************************************************************************** * * @@ -275,6 +292,8 @@ BUGMSG(D_NORMAL, "COM90IO: station %02Xh found at %03lXh, IRQ %d.\n", dev->dev_addr[0], dev->base_addr, dev->irq); + BUGMSG(D_NORMAL, "COM90io station %02Xh has queue %lu, and a timeout of %i jiffies\n", + dev->dev_addr[0], dev->tx_queue_len, dev->watchdog_timeo * 1000 / HZ); return 0; } @@ -356,39 +375,6 @@ TIME("get_whole_buffer", count, get_whole_buffer(dev, bufnum * 512 + offset, count, buf)); } -static int io; /* use the insmod io= irq= shmem= options */ -static int irq; -static char device[9]; /* use eg. device=arc1 to change name */ - -module_param(io, int, 0); -module_param(irq, int, 0); -module_param_string(device, device, sizeof(device), 0); -MODULE_LICENSE("GPL"); - -#ifndef MODULE -static int __init com90io_setup(char *s) -{ - int ints[4]; - s = get_options(s, 4, ints); - if (!ints[0]) - return 0; - switch (ints[0]) { - default: /* ERROR */ - printk("com90io: Too many arguments.\n"); - case 2: /* IRQ */ - irq = ints[2]; - case 1: /* IO address */ - io = ints[1]; - } - if (*s) - snprintf(device, sizeof(device), "%s", s); - return 1; -} -__setup("com90io=", com90io_setup); -#endif - -static struct net_device *my_dev; - static int __init com90io_init(void) { struct net_device *dev; @@ -405,6 +391,10 @@ if (dev->irq == 2) dev->irq = 9; + if(queue < 30) queue = 30; + if(timeo < 10) timeo = 10; + dev->tx_queue_len = queue; + dev->watchdog_timeo = HZ * timeo / 1000; err = com90io_probe(dev); if (err) { @@ -433,3 +423,27 @@ module_init(com90io_init) module_exit(com90io_exit) + +#if 0 +#ifndef MODULE +static int __init com90io_setup(char *s) +{ + int ints[4]; + s = get_options(s, 4, ints); + if (!ints[0]) + return 0; + switch (ints[0]) { + default: /* ERROR */ + printk("com90io: Too many arguments.\n"); + case 2: /* IRQ */ + irq = ints[2]; + case 1: /* IO address */ + io = ints[1]; + } + if (*s) + snprintf(device, sizeof(device), "%s", s); + return 1; +} +__setup("com90io=", com90io_setup); +#endif +#endif diff -urN linux-2.6.13.4-virgin/drivers/net/arcnet/com90xx.c linux-2.6.13.4-arcnet/drivers/net/arcnet/com90xx.c --- linux-2.6.13.4-virgin/drivers/net/arcnet/com90xx.c 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/drivers/net/arcnet/com90xx.c 2005-10-23 06:22:37.000000000 -0400 @@ -53,7 +53,7 @@ /* Internal function declarations */ -static int com90xx_found(int ioaddr, int airq, u_long shmem); +static int com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem *); static void com90xx_command(struct net_device *dev, int command); static int com90xx_status(struct net_device *dev); static void com90xx_setmask(struct net_device *dev, int mask); @@ -104,11 +104,16 @@ static int irq; static int shmem; static char device[9]; /* use eg. device=arc1 to change name */ +static int queue = DEFAULT_QUEUE_SIZE; +static int timeo = TX_TIMEOUT; module_param(io, int, 0); module_param(irq, int, 0); module_param(shmem, int, 0); module_param_string(device, device, sizeof(device), 0); +module_param(queue, int, 0); /* --AJK */ +module_param(timeo, int, 0); /* --AJK See Documentation/networking/arcnet.txt */ +MODULE_LICENSE("GPL"); static void __init com90xx_probe(void) { @@ -116,14 +121,26 @@ unsigned long airqmask; int ports[(0x3f0 - 0x200) / 16 + 1] = {0}; - u_long shmems[(0xFF800 - 0xA0000) / 2048 + 1] = - {0}; + unsigned long *shmems; + void __iomem **iomem; int numports, numshmems, *port; u_long *p; + int index; if (!io && !irq && !shmem && !*device && com90xx_skip_probe) return; + shmems = kmalloc(((0x10000-0xa0000) / 0x800) * sizeof(unsigned long), + GFP_KERNEL); + if (!shmems) + return; + iomem = kmalloc(((0x10000-0xa0000) / 0x800) * sizeof(void __iomem *), + GFP_KERNEL); + if (!iomem) { + kfree(shmems); + return; + } + BUGLVL(D_NORMAL) printk(VERSION); /* set up the arrays where we'll store the possible probe addresses */ @@ -179,6 +196,8 @@ if (!numports) { BUGMSG2(D_NORMAL, "S1: No ARCnet cards found.\n"); + kfree(shmems); + kfree(iomem); return; } /* Stage 2: we have now reset any possible ARCnet cards, so we can't @@ -202,8 +221,8 @@ * 0xD1 byte in the right place, or are read-only. */ numprint = -1; - for (p = &shmems[0]; p < shmems + numshmems; p++) { - u_long ptr = *p; + for (index = 0, p = &shmems[0]; index < numshmems; p++, index++) { + void __iomem *base; numprint++; numprint %= 8; @@ -213,38 +232,49 @@ } BUGMSG2(D_INIT, "%lXh ", *p); - if (!request_mem_region(*p, BUFFER_SIZE, "arcnet (90xx)")) { + if (!request_mem_region(*p, MIRROR_SIZE, "arcnet (90xx)")) { BUGMSG2(D_INIT_REASONS, "(request_mem_region)\n"); BUGMSG2(D_INIT_REASONS, "Stage 3: "); BUGLVL(D_INIT_REASONS) numprint = 0; - *p-- = shmems[--numshmems]; - continue; + goto out; + } + base = ioremap(*p, MIRROR_SIZE); + if (!base) { + BUGMSG2(D_INIT_REASONS, "(ioremap)\n"); + BUGMSG2(D_INIT_REASONS, "Stage 3: "); + BUGLVL(D_INIT_REASONS) numprint = 0; + goto out1; } - if (isa_readb(ptr) != TESTvalue) { + if (readb(base) != TESTvalue) { BUGMSG2(D_INIT_REASONS, "(%02Xh != %02Xh)\n", - isa_readb(ptr), TESTvalue); + readb(base), TESTvalue); BUGMSG2(D_INIT_REASONS, "S3: "); BUGLVL(D_INIT_REASONS) numprint = 0; - release_mem_region(*p, BUFFER_SIZE); - *p-- = shmems[--numshmems]; - continue; + goto out2; } /* By writing 0x42 to the TESTvalue location, we also make * sure no "mirror" shmem areas show up - if they occur * in another pass through this loop, they will be discarded * because *cptr != TESTvalue. */ - isa_writeb(0x42, ptr); - if (isa_readb(ptr) != 0x42) { + writeb(0x42, base); + if (readb(base) != 0x42) { BUGMSG2(D_INIT_REASONS, "(read only)\n"); BUGMSG2(D_INIT_REASONS, "S3: "); - release_mem_region(*p, BUFFER_SIZE); - *p-- = shmems[--numshmems]; - continue; + goto out2; } BUGMSG2(D_INIT_REASONS, "\n"); BUGMSG2(D_INIT_REASONS, "S3: "); BUGLVL(D_INIT_REASONS) numprint = 0; + iomem[index] = base; + continue; + out2: + iounmap(base); + out1: + release_mem_region(*p, MIRROR_SIZE); + out: + *p-- = shmems[--numshmems]; + index--; } BUGMSG2(D_INIT, "\n"); @@ -252,6 +282,8 @@ BUGMSG2(D_NORMAL, "S3: No ARCnet cards found.\n"); for (port = &ports[0]; port < ports + numports; port++) release_region(*port, ARCNET_TOTAL_SIZE); + kfree(shmems); + kfree(iomem); return; } /* Stage 4: something of a dummy, to report the shmems that are @@ -351,30 +383,32 @@ mdelay(RESETtime); } else { /* just one shmem and port, assume they match */ - isa_writeb(TESTvalue, shmems[0]); + writeb(TESTvalue, iomem[0]); } #else inb(_RESET); mdelay(RESETtime); #endif - for (p = &shmems[0]; p < shmems + numshmems; p++) { - u_long ptr = *p; + for (index = 0; index < numshmems; index++) { + u_long ptr = shmems[index]; + void __iomem *base = iomem[index]; - if (isa_readb(ptr) == TESTvalue) { /* found one */ + if (readb(base) == TESTvalue) { /* found one */ BUGMSG2(D_INIT, "%lXh)\n", *p); openparen = 0; /* register the card */ - if (com90xx_found(*port, airq, *p) == 0) + if (com90xx_found(*port, airq, ptr, base) == 0) found = 1; numprint = -1; /* remove shmem from the list */ - *p = shmems[--numshmems]; + shmems[index] = shmems[--numshmems]; + iomem[index] = iomem[numshmems]; break; /* go to the next I/O port */ } else { - BUGMSG2(D_INIT_REASONS, "%Xh-", isa_readb(ptr)); + BUGMSG2(D_INIT_REASONS, "%Xh-", readb(base)); } } @@ -391,17 +425,40 @@ BUGLVL(D_INIT_REASONS) printk("\n"); /* Now put back TESTvalue on all leftover shmems. */ - for (p = &shmems[0]; p < shmems + numshmems; p++) { - isa_writeb(TESTvalue, *p); - release_mem_region(*p, BUFFER_SIZE); + for (index = 0; index < numshmems; index++) { + writeb(TESTvalue, iomem[index]); + iounmap(iomem[index]); + release_mem_region(shmems[index], MIRROR_SIZE); } + kfree(shmems); + kfree(iomem); } +static int check_mirror(unsigned long addr, size_t size) +{ + void __iomem *p; + int res = -1; + + if (!request_mem_region(addr, size, "arcnet (90xx)")) + return -1; + + p = ioremap(addr, size); + if (p) { + if (readb(p) == TESTvalue) + res = 1; + else + res = 0; + iounmap(p); + } + + release_mem_region(addr, size); + return res; +} /* Set up the struct net_device associated with this card. Called after * probing succeeds. */ -static int __init com90xx_found(int ioaddr, int airq, u_long shmem) +static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem *p) { struct net_device *dev = NULL; struct arcnet_local *lp; @@ -412,9 +469,14 @@ dev = alloc_arcdev(device); if (!dev) { BUGMSG2(D_NORMAL, "com90xx: Can't allocate device!\n"); - release_mem_region(shmem, BUFFER_SIZE); + iounmap(p); + release_mem_region(shmem, MIRROR_SIZE); return -ENOMEM; } + if(queue < 30) queue = 30; + if(timeo < 10) timeo = 10; + dev->tx_queue_len = queue; + dev->watchdog_timeo = HZ * timeo / 1000; lp = dev->priv; /* find the real shared memory start/end points, including mirrors */ @@ -423,24 +485,27 @@ * 2k (or there are no mirrors at all) but on some, it's 4k. */ mirror_size = MIRROR_SIZE; - if (isa_readb(shmem) == TESTvalue - && isa_readb(shmem - mirror_size) != TESTvalue - && isa_readb(shmem - 2 * mirror_size) == TESTvalue) - mirror_size *= 2; + if (readb(p) == TESTvalue && + check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0 && + check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1) + mirror_size = 2 * MIRROR_SIZE; - first_mirror = last_mirror = shmem; - while (isa_readb(first_mirror) == TESTvalue) + first_mirror = shmem - mirror_size; + while (check_mirror(first_mirror, mirror_size) == 1) first_mirror -= mirror_size; first_mirror += mirror_size; - while (isa_readb(last_mirror) == TESTvalue) + last_mirror = shmem + mirror_size; + while (check_mirror(last_mirror, mirror_size) == 1) last_mirror += mirror_size; last_mirror -= mirror_size; dev->mem_start = first_mirror; dev->mem_end = last_mirror + MIRROR_SIZE - 1; - release_mem_region(shmem, BUFFER_SIZE); + iounmap(p); + release_mem_region(shmem, MIRROR_SIZE); + if (!request_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1, "arcnet (90xx)")) goto err_free_dev; @@ -479,6 +544,8 @@ if (register_netdev(dev)) goto err_unmap; + BUGMSG(D_NORMAL, "COM90xx station %02Xh has queue %lu, and a timeout of %i jiffies\n", + dev->dev_addr[0], dev->tx_queue_len, dev->watchdog_timeo * 1000 / HZ); cards[numcards++] = dev; return 0; @@ -580,7 +647,6 @@ } -MODULE_LICENSE("GPL"); static int __init com90xx_init(void) { @@ -614,6 +680,7 @@ module_init(com90xx_init); module_exit(com90xx_exit); +#if 0 #ifndef MODULE static int __init com90xx_setup(char *s) { @@ -644,3 +711,4 @@ __setup("com90xx=", com90xx_setup); #endif +#endif diff -urN linux-2.6.13.4-virgin/include/linux/arcdevice.h linux-2.6.13.4-arcnet/include/linux/arcdevice.h --- linux-2.6.13.4-virgin/include/linux/arcdevice.h 2005-10-10 14:54:29.000000000 -0400 +++ linux-2.6.13.4-arcnet/include/linux/arcdevice.h 2005-10-22 21:20:51.000000000 -0400 @@ -44,8 +44,25 @@ * network, or one with heavy network traffic, this timeout may need to be * increased. The larger it is, though, the longer it will be between * necessary transmits - don't set this too high. + * + * You may also set this value at insmod time with `insmod comXXXXX timeo=XXXX' --AJK */ -#define TX_TIMEOUT (HZ * 200 / 1000) +#define TX_TIMEOUT 200 /* .2 seconds */ + +/* + Originally tx_queue_len was 30, which caused to many kickme's, + while 100 is an improvement, it's still not enough. + + 250 works as a good starting point for 2.5Mb devices, with a + 1500 MTU. It should be able to keep accepting, unless + something goes horribly wrong. If your card is faster, I highly + reccomend increasing this value via `insmod comXXXXX queue=XXXX'. + + On a personal note, I have used a value of 1000 for years. + "Bad" values will be reset to defaults. + --AJK +*/ +#define DEFAULT_QUEUE_SIZE 250 /* Display warnings about the driver being an ALPHA version. */