Hi,
it looks like linuxtr.net seems to be down, so i'm sending this here
instead...
This one fixes the following problems:
o add spinlock to fix race condition in tms380tr.
o fix startup of tmsisa to not register and unregister devices multiple
times, so hotplug doesn't run wild.
o add support for statically compiling tmsisa into kernel (untested).
--jochen
diff -u -r linux-2.5.44.orig/drivers/net/Space.c linux-2.5.44/drivers/net/Space.c
--- linux-2.5.44.orig/drivers/net/Space.c 2002-10-19 06:01:12.000000000 +0200
+++ linux-2.5.44/drivers/net/Space.c 2002-10-28 22:54:13.000000000 +0100
@@ -567,6 +567,7 @@
#ifdef CONFIG_TR
/* Token-ring device probe */
extern int ibmtr_probe(struct net_device *);
+extern int tms_isa_probe(struct net_device *dev);
extern int smctr_probe(struct net_device *);
static int
@@ -576,6 +577,9 @@
#ifdef CONFIG_IBMTR
&& ibmtr_probe(dev)
#endif
+#ifdef CONFIG_TMSISA
+ && tms_isa_probe(dev)
+#endif
#ifdef CONFIG_SMCTR
&& smctr_probe(dev)
#endif
diff -u -r linux-2.5.44.orig/drivers/net/tokenring/tms380tr.c linux-2.5.44/drivers/net/tokenring/tms380tr.c
--- linux-2.5.44.orig/drivers/net/tokenring/tms380tr.c 2002-10-19 06:01:57.000000000 +0200
+++ linux-2.5.44/drivers/net/tokenring/tms380tr.c 2002-10-28 22:32:05.000000000 +0100
@@ -57,6 +57,7 @@
* as well.
* 14-Jan-01 JF Fix DMA on ifdown/ifup sequences. Some
* cleanup.
+ * 13-Jan-02 JF Add spinlock to fix race condition.
*
* To do:
* 1. Multi/Broadcast packet handling (this may have fixed itself)
@@ -253,6 +254,9 @@
struct net_local *tp = (struct net_local *)dev->priv;
int err;
+ /* init the spinlock */
+ tp->lock = (spinlock_t) SPIN_LOCK_UNLOCKED;
+
/* Reset the hardware here. Don't forget to set the station address. */
if(dev->dma > 0)
@@ -630,6 +634,7 @@
TPL *tpl;
short length;
unsigned char *buf;
+ unsigned long flags;
struct sk_buff *skb;
int i;
dma_addr_t dmabuf, newbuf;
@@ -641,18 +646,22 @@
* NOTE: We *must* always leave one unused TPL in the chain,
* because otherwise the adapter might send frames twice.
*/
+ spin_lock_irqsave(&(tp->lock), flags);
if(tp->TplFree->NextTPLPtr->BusyFlag) /* No free TPL */
{
if (tms380tr_debug > 0)
printk(KERN_INFO "%s: No free TPL\n", dev->name);
+ spin_unlock_irqrestore(&(tp->lock), flags);
return;
}
/* Send first buffer from queue */
skb = skb_dequeue(&tp->SendSkbQueue);
if(skb == NULL)
+ {
+ spin_unlock_irqrestore(&(tp->lock), flags);
return;
-
+ }
tp->QueueSkb++;
dmabuf = 0;
@@ -700,6 +709,7 @@
/* Let adapter send the frame. */
tms380tr_exec_sifcmd(dev, CMD_TX_VALID);
+ spin_unlock_irqrestore(&(tp->lock), flags);
}
return;
diff -u -r linux-2.5.44.orig/drivers/net/tokenring/tms380tr.h linux-2.5.44/drivers/net/tokenring/tms380tr.h
--- linux-2.5.44.orig/drivers/net/tokenring/tms380tr.h 2002-10-19 06:01:19.000000000 +0200
+++ linux-2.5.44/drivers/net/tokenring/tms380tr.h 2002-10-26 10:29:46.000000000 +0200
@@ -1135,6 +1135,7 @@
unsigned short (*sifreadw)(struct net_device *, unsigned short);
void (*sifwritew)(struct net_device *, unsigned short, unsigned short);
+ spinlock_t lock; /* SMP protection */
void *tmspriv;
} NET_LOCAL;
diff -u -r linux-2.5.44.orig/drivers/net/tokenring/tmsisa.c linux-2.5.44/drivers/net/tokenring/tmsisa.c
--- linux-2.5.44.orig/drivers/net/tokenring/tmsisa.c 2002-10-19 06:01:11.000000000 +0200
+++ linux-2.5.44/drivers/net/tokenring/tmsisa.c 2002-10-28 22:52:53.000000000 +0100
@@ -16,10 +16,15 @@
* AF Adam Fritzler [email protected]
* JF Jochen Friedrich [email protected]
*
+ * Modification History:
+ * 14-Jan-01 JF Created
+ * 28-Oct-02 JF Fixed probe of card for static compilation.
+ * Fixed module init to not make hotplug go wild.
+ *
* TODO:
* 1. Add support for Proteon TR ISA adapters (1392, 1392+)
*/
-static const char version[] = "tmsisa.c: v1.00 14/01/2001 by Jochen Friedrich\n";
+static const char version[] = "tmsisa.c: v1.01 28/10/2002 by Jochen Friedrich\n";
#include <linux/module.h>
#include <linux/kernel.h>
@@ -131,9 +136,25 @@
{
static int versionprinted;
struct net_local *tp;
- int j;
+ int i,j;
struct tms_isa_card *card;
+ if (!dev->base_addr)
+ for(i = 0; portlist[i]; i++)
+ {
+ if(check_region(portlist[i], TMS_ISA_IO_EXTENT))
+ continue;
+
+ if(tms_isa_probe1(portlist[i]))
+ continue;
+
+ dev->base_addr = portlist[i];
+ break;
+ }
+
+ if(!dev->base_addr)
+ return -1;
+
if(check_region(dev->base_addr, TMS_ISA_IO_EXTENT))
return -1;
@@ -386,51 +407,54 @@
num = 0;
if (io[0])
{ /* Only probe addresses from command line */
+ dev = init_trdev(NULL, 0);
+ if (!dev)
+ return (-ENOMEM);
for (i = 0; i < ISATR_MAX_ADAPTERS; i++)
{
if (io[i] == 0)
continue;
-
- dev = init_trdev(NULL, 0);
- if (!dev)
- return (-ENOMEM);
dev->base_addr = io[i];
dev->irq = irq[i];
dev->dma = dma[i];
- if (tms_isa_probe(dev))
+ if (!tms_isa_probe(dev))
{
- unregister_netdev(dev);
- kfree(dev);
- }
- else
num++;
+ dev = init_trdev(NULL, 0);
+ if (!dev)
+ return (-ENOMEM);
+ }
}
+ unregister_netdev(dev);
+ kfree(dev);
}
else
{
+ dev = init_trdev(NULL, 0);
+ if (!dev)
+ return (-ENOMEM);
+
for(i = 0; portlist[i]; i++)
{
if (num >= ISATR_MAX_ADAPTERS)
continue;
-
- dev = init_trdev(NULL, 0);
- if (!dev)
- return (-ENOMEM);
dev->base_addr = portlist[i];
dev->irq = irq[num];
dev->dma = dma[num];
- if (tms_isa_probe(dev))
+ if (!tms_isa_probe(dev))
{
- unregister_netdev(dev);
- kfree(dev);
- }
- else
num++;
+ dev = init_trdev(NULL, 0);
+ if (!dev)
+ return (-ENOMEM);
+ }
}
+ unregister_netdev(dev);
+ kfree(dev);
}
printk(KERN_NOTICE "tmsisa.c: %d cards found.\n", num);
/* Probe for cards. */
Jochen Friedrich wrote:
>Hi,
>
>it looks like linuxtr.net seems to be down, so i'm sending this here
>instead...
>
>This one fixes the following problems:
>
>o add spinlock to fix race condition in tms380tr.
>o fix startup of tmsisa to not register and unregister devices multiple
> times, so hotplug doesn't run wild.
>o add support for statically compiling tmsisa into kernel (untested).
>
>--jochen
>
>
>diff -u -r linux-2.5.44.orig/drivers/net/Space.c linux-2.5.44/drivers/net/Space.c
>--- linux-2.5.44.orig/drivers/net/Space.c 2002-10-19 06:01:12.000000000 +0200
>+++ linux-2.5.44/drivers/net/Space.c 2002-10-28 22:54:13.000000000 +0100
>@@ -567,6 +567,7 @@
> #ifdef CONFIG_TR
> /* Token-ring device probe */
> extern int ibmtr_probe(struct net_device *);
>+extern int tms_isa_probe(struct net_device *dev);
> extern int smctr_probe(struct net_device *);
>
> static int
>@@ -576,6 +577,9 @@
> #ifdef CONFIG_IBMTR
> && ibmtr_probe(dev)
> #endif
>+#ifdef CONFIG_TMSISA
>+ && tms_isa_probe(dev)
>+#endif
> #ifdef CONFIG_SMCTR
> && smctr_probe(dev)
> #endif
>diff -u -r linux-2.5.44.orig/drivers/net/tokenring/tms380tr.c linux-2.5.44/drivers/net/tokenring/tms380tr.c
>--- linux-2.5.44.orig/drivers/net/tokenring/tms380tr.c 2002-10-19 06:01:57.000000000 +0200
>+++ linux-2.5.44/drivers/net/tokenring/tms380tr.c 2002-10-28 22:32:05.000000000 +0100
>@@ -57,6 +57,7 @@
> * as well.
> * 14-Jan-01 JF Fix DMA on ifdown/ifup sequences. Some
> * cleanup.
>+ * 13-Jan-02 JF Add spinlock to fix race condition.
> *
> * To do:
> * 1. Multi/Broadcast packet handling (this may have fixed itself)
>@@ -253,6 +254,9 @@
> struct net_local *tp = (struct net_local *)dev->priv;
> int err;
>
>+ /* init the spinlock */
>+ tp->lock = (spinlock_t) SPIN_LOCK_UNLOCKED;
>+
>
>
use spin_lock_init()...
>@@ -641,18 +646,22 @@
> * NOTE: We *must* always leave one unused TPL in the chain,
> * because otherwise the adapter might send frames twice.
> */
>+ spin_lock_irqsave(&(tp->lock), flags);
> if(tp->TplFree->NextTPLPtr->BusyFlag) /* No free TPL */
> {
> if (tms380tr_debug > 0)
> printk(KERN_INFO "%s: No free TPL\n", dev->name);
>+ spin_unlock_irqrestore(&(tp->lock), flags);
> return;
> }
>
> /* Send first buffer from queue */
> skb = skb_dequeue(&tp->SendSkbQueue);
> if(skb == NULL)
>+ {
>+ spin_unlock_irqrestore(&(tp->lock), flags);
> return;
>-
>+ }
> tp->QueueSkb++;
> dmabuf = 0;
>
>@@ -700,6 +709,7 @@
>
> /* Let adapter send the frame. */
> tms380tr_exec_sifcmd(dev, CMD_TX_VALID);
>+ spin_unlock_irqrestore(&(tp->lock), flags);
>
>
please remove the non-standard parens from the &tp->lock reference...
>@@ -131,9 +136,25 @@
> {
> static int versionprinted;
> struct net_local *tp;
>- int j;
>+ int i,j;
> struct tms_isa_card *card;
>
>+ if (!dev->base_addr)
>+ for(i = 0; portlist[i]; i++)
>+ {
>+ if(check_region(portlist[i], TMS_ISA_IO_EXTENT))
>+ continue;
>+
>+ if(tms_isa_probe1(portlist[i]))
>+ continue;
>+
>+ dev->base_addr = portlist[i];
>+ break;
>+ }
>+
>+ if(!dev->base_addr)
>+ return -1;
>+
> if(check_region(dev->base_addr, TMS_ISA_IO_EXTENT))
> return -1;
>
>
>
_all_ uses of check_region are racy and wrong. use request_region only,
and check its return value.
>@@ -386,51 +407,54 @@
> num = 0;
> if (io[0])
> { /* Only probe addresses from command line */
>+ dev = init_trdev(NULL, 0);
>+ if (!dev)
>+ return (-ENOMEM);
> for (i = 0; i < ISATR_MAX_ADAPTERS; i++)
> {
> if (io[i] == 0)
> continue;
>-
>- dev = init_trdev(NULL, 0);
>- if (!dev)
>- return (-ENOMEM);
>
> dev->base_addr = io[i];
> dev->irq = irq[i];
> dev->dma = dma[i];
>
>- if (tms_isa_probe(dev))
>+ if (!tms_isa_probe(dev))
> {
>- unregister_netdev(dev);
>- kfree(dev);
>- }
>- else
> num++;
>+ dev = init_trdev(NULL, 0);
>+ if (!dev)
>+ return (-ENOMEM);
>
>
by this point you have successfully registered at least one card.
either unregister them all before returning ENOMEM, or return success
and simply warn that not all adapters initialized successfully.
>+ }
> }
>+ unregister_netdev(dev);
>+ kfree(dev);
> }
> else
> {
>+ dev = init_trdev(NULL, 0);
>+ if (!dev)
>+ return (-ENOMEM);
>+
> for(i = 0; portlist[i]; i++)
> {
> if (num >= ISATR_MAX_ADAPTERS)
> continue;
>-
>- dev = init_trdev(NULL, 0);
>- if (!dev)
>- return (-ENOMEM);
>
> dev->base_addr = portlist[i];
> dev->irq = irq[num];
> dev->dma = dma[num];
>
>- if (tms_isa_probe(dev))
>+ if (!tms_isa_probe(dev))
> {
>- unregister_netdev(dev);
>- kfree(dev);
>- }
>- else
> num++;
>+ dev = init_trdev(NULL, 0);
>+ if (!dev)
>+ return (-ENOMEM);
>
>
likewise