2.5.60 3c509 & net/Space.c problem

2.5.60 3c509 & net/Space.c problem

Post by Mikael Pettersso » Wed, 12 Feb 2003 03:50:08



From Linus' 2.5.60 announcement:


>  o 3c509 fixes: correct MCA probing, add back ISA probe to Space.c

This is somewhat broken. patch-2.5.60 has

--- a/drivers/net/Space.c       Mon Feb 10 10:39:23 2003

 #ifdef CONFIG_EL2              /* 3c503 */
        {el2_probe, 0},
 #endif
+#ifdef CONFIG_EL3
+       {el3_probe, 0},
+#endif
 #ifdef CONFIG_HPLAN
        {hp_probe, 0},
 #endif

but (a) there's no declaration for el3_probe() in scope at this
point, leading to a compile error, and (b) el3_probe() is still
'static' in 3c509.c, leading to a linkage error (assuming a
declaration for el3_probe() was added to Space.c to fix (a) first)

Reverting the patch to Space.c solved the problem for me.

Why the probe list entry? Isn't the module_init() in 3c509.c enough?

/Mikael
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

2.5.60 3c509 & net/Space.c problem

Post by Andrew Morto » Wed, 12 Feb 2003 04:30:09


Mikael Pettersson <mi...@csd.uu.se> wrote:

> >From Linus' 2.5.60 announcement:

> >James Bottomley <james.bottom...@steeleye.com>:
> >  o 3c509 fixes: correct MCA probing, add back ISA probe to Space.c

> This is somewhat broken. patch-2.5.60 has

I'm looking for someone to pump some bytes through this fix.

Patch from Marc Zyngier <mzyng...@freesurf.fr>

 drivers/net/3c509.c |   66 +++++++++++++++++++++++++++++-----------------------
 drivers/net/Space.c |    3 --
 2 files changed, 37 insertions(+), 32 deletions(-)

diff -puN drivers/net/3c509.c~3c509 drivers/net/3c509.c
--- 25/drivers/net/3c509.c~3c509        Mon Feb 10 17:34:37 2003
+++ 25-akpm/drivers/net/3c509.c Mon Feb 10 17:34:37 2003
@@ -338,16 +338,6 @@ static int __init el3_common_init (struc
        dev->watchdog_timeo = TX_TIMEOUT;
        dev->do_ioctl = netdev_ioctl;

-#ifdef CONFIG_PM
-       /* register power management */
-       lp->pmdev = pm_register(PM_ISA_DEV, card_idx, el3_pm_callback);
-       if (lp->pmdev) {
-               struct pm_dev *p;
-               p = lp->pmdev;
-               p->data = (struct net_device *)dev;
-       }
-#endif
-
        return 0;
 }

@@ -417,6 +407,13 @@ static int __init el3_probe(int card_idx
                                        phys_addr[j] =
                                                htons(read_eeprom(ioaddr, j));
                        if_port = read_eeprom(ioaddr, 8) >> 14;
+                       if (!(dev = init_etherdev(NULL, sizeof(struct el3_private)))) {
+                                       release_region(ioaddr, EL3_IO_EXTENT);
+                                       pnp_device_detach(idev);
+                                       return -ENOMEM;
+                       }
+
+                       SET_MODULE_OWNER(dev);
                        pnp_cards++;
                        goto found;
                }
@@ -497,24 +494,29 @@ no_pnp:
        }
        irq = id_read_eeprom(9) >> 12;

-#if 0                                                  /* Huh ?
-                                                                  Can someone explain what is this for ? */
-       if (dev) {                                      /* Set passed-in IRQ or I/O Addr. */
-               if (dev->irq > 1  &&  dev->irq < 16)
+       if (!(dev = init_etherdev(NULL, sizeof(struct el3_private))))
+                       return -ENOMEM;
+
+       SET_MODULE_OWNER(dev);
+      
+       /* Set passed-in IRQ or I/O Addr. */
+       if (dev->irq > 1  &&  dev->irq < 16)
                        irq = dev->irq;

-               if (dev->base_addr) {
+       if (dev->base_addr) {
                        if (dev->mem_end == 0x3c509                  /* Magic key */
                                && dev->base_addr >= 0x200  &&  dev->base_addr <= 0x3e0)
-                               ioaddr = dev->base_addr & 0x3f0;
-                       else if (dev->base_addr != ioaddr)
-                               return -ENODEV;
-               }
+                                       ioaddr = dev->base_addr & 0x3f0;
+                       else if (dev->base_addr != ioaddr) {
+                                       unregister_netdev (dev);
+                                       return -ENODEV;
+                       }
        }
-#endif

-       if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509"))
-               return -EBUSY;
+       if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509")) {
+                       unregister_netdev (dev);
+                       return -EBUSY;
+       }

        /* Set the adaptor tag so that the next card can be found. */
        outb(0xd0 + ++current_tag, id_port);
@@ -524,19 +526,15 @@ no_pnp:

        EL3WINDOW(0);
        if (inw(ioaddr) != 0x6d50) {
+               unregister_netdev (dev);
                release_region(ioaddr, EL3_IO_EXTENT);
                return -ENODEV;
        }

        /* Free the interrupt so that some other card can use it. */
        outw(0x0f00, ioaddr + WN0_IRQ);
-
-       dev = init_etherdev(NULL, sizeof(struct el3_private));
-       if (dev == NULL) {
-           release_region(ioaddr, EL3_IO_EXTENT);
-               return -ENOMEM;
-       }
-       SET_MODULE_OWNER(dev);
+      
+ found:                                                        /* PNP jumps here... */

        memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
        dev->base_addr = ioaddr;
@@ -547,6 +545,16 @@ no_pnp:
        lp->dev = &idev->dev;
 #endif

+#ifdef CONFIG_PM
+       /* register power management */
+       lp->pmdev = pm_register(PM_ISA_DEV, card_idx, el3_pm_callback);
+       if (lp->pmdev) {
+               struct pm_dev *p;
+               p = lp->pmdev;
+               p->data = (struct net_device *)dev;
+       }
+#endif
+
        return el3_common_init (dev);
 }

diff -puN drivers/net/Space.c~3c509 drivers/net/Space.c
--- 25/drivers/net/Space.c~3c509        Mon Feb 10 17:34:37 2003
+++ 25-akpm/drivers/net/Space.c Mon Feb 10 17:34:37 2003
@@ -224,9 +224,6 @@ static struct devprobe isa_probes[] __in
 #ifdef CONFIG_EL2              /* 3c503 */
        {el2_probe, 0},
 #endif
-#ifdef CONFIG_EL3
-       {el3_probe, 0},
-#endif
 #ifdef CONFIG_HPLAN
        {hp_probe, 0},
 #endif

_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

2.5.60 3c509 & net/Space.c problem

Post by Paul » Thu, 13 Feb 2003 06:00:46



[...]

> I'm looking for someone to pump some bytes through this fix.


>  drivers/net/3c509.c |   66 +++++++++++++++++++++++++++++-----------------------
>  drivers/net/Space.c |    3 --
>  2 files changed, 37 insertions(+), 32 deletions(-)

        Hi;

        Tested this under 2.5.60, and Marc's other patch against
2.5.59 -- compiles and works.

eth0      Link encap:Ethernet  HWaddr 00:60:8C:CB:99:78  
          inet addr:192.168.2.21  Bcast:192.168.2.255 Mask:255.255.255.0
          UP BROADCAST NOTRAILERS RUNNING  MTU:1500  Metric:1
          RX packets:946103 errors:62 dropped:0 overruns:56 frame:62
          TX packets:360895 errors:0 dropped:0 overruns:0 carrier:0
          collisions:45706 txqueuelen:100
          RX bytes:1190605511 (1135.4 Mb)  TX bytes:357493752 (340.9 Mb)
          Interrupt:10 Base address:0x300

        RX errors increase under just about any load, similar to
2.4 kernel-- this traffic is over effectively a 2 computer
network. The machine is a k6-II 333. I dont think Ive ever
noticed errors with a wd8013 in this box....

Paul

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

1. 2.5.60 fails compile -- net/Space.c -- 3c509

FYI:

make -f scripts/Makefile.build obj=drivers/net
  gcc -Wp,-MD,drivers/net/.Space.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iinclude/asm-i386/mach-default -fomit-frame-pointer -nostdinc -iwithprefix include    -DKBUILD_BASENAME=Space -DKBUILD_MODNAME=Space -c -o drivers/net/Space.o drivers/net/Space.c
drivers/net/Space.c:228: `el3_probe' undeclared here (not in a function)
drivers/net/Space.c:228: initializer element is not constant
drivers/net/Space.c:228: (near initialization for `isa_probes[0].probe')
make[2]: *** [drivers/net/Space.o] Error 1

--
Pete Clements

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

2. Linux scheduling algorithm

3. 2.5.60 problems with dbench and unkillable processes.

4. ufsrestore question

5. [2.5.60/61] - Making modules problem

6. Creative Graphics Blaster- help

7. 2.5.60 - drivers/char/esp.c vs include/linux/serialP.h

8. xgraph bug fixed

9. Strange TCP with 2.5.60

10. Linux 2.5.60 cciss_scsi.c

11. 2.5.60 cheerleading...

12. 2.5.60: .o or .ko for CONFIG_MODVERSIONS?

13. NO BOOT since 2.5.60-bk1