Skip to contentSkip to conversation

bugfixes and new hardware support for arcnet driver

PATCH New Jeff Morrow 1 participant 1 message Feb 9, 2007

Subsystems (3)
Networking Network drivers Arcnet network layer
lore
Share & tools
lore

Jeff Morrow

author
#0 lore raw

PATCH 1/1 bugfixes and new hardware support for arcnet driver

The modifications and bug fixes noted below were done by Realtime Control Works and Contemporary Control Systems, Inc, Jan 2005. They were incorporated into the 2.6 kernel by Jeff Morrow of Sierra Analytics, Feb 2007. <[email protected]>

The changes have been tested on a Contemporary Controls PCI20U-4000.

Summary of changes:

Arc-rawmode.c:
rx():
- Fixed error in received packet lengths; 256 byte packets were being received as 257 bytes packets.

prepare_tx():
- Fixed error in transmit length calcs; 257 byte packets were being transmitted as 260 byte packets.

com20020.c:
com20020_check():
- We now load the SETUP2 register if the 'clockm' parameter is non-zero, instead of checking for ARC_CAN_10MBIT. The user is now responsible for whether or not SETUP2 is loaded. If the clock multiplier is non-zero, this means that the user wants a baud rate greater than 2.5Mbps. This is not possible unless the SETUP2 register is present (COM20020D, or COM20022). So, we're relying on the user to be smart about what kind of chip he's dealing with...

com20020-pci.c
- Added several entries to com20020pci_id_table[].

Signed-off-by Jeff Morrow <[email protected]>

---

drivers/net/arcnet/arcnet.c 2007-02-08 16:40:50.000000000 -0800 renamed from drivers/net/arcnet/arcnet.c 2006-09-19 20:42:06.000000000 -0700 +1 -1
diff -uprN -X linux-source-2.6.18/Documentation/dontdiff linux-source-2.6.18/drivers/net/arcnet/arcnet.c linux-source-2.6.18.changed/drivers/net/arcnet/arcnet.c
@@ -41,7 +41,7 @@
  *     <[email protected]>
  */
 
-#define VERSION "arcnet: v3.93 BETA 2000/04/29 - by Avery Pennarun et al.\n"
+#define VERSION "arcnet: v3.94 BETA 2006/02/08 - by Avery Pennarun et al.\n"
 
 #include <linux/module.h>
 #include <linux/types.h>
drivers/net/arcnet/arc-rawmode.c 2007-02-08 16:28:29.000000000 -0800 renamed from drivers/net/arcnet/arc-rawmode.c 2006-09-19 20:42:06.000000000 -0700 +2 -2
diff -uprN -X linux-source-2.6.18/Documentation/dontdiff linux-source-2.6.18/drivers/net/arcnet/arc-rawmode.c linux-source-2.6.18.changed/drivers/net/arcnet/arc-rawmode.c
@@ -94,7 +94,7 @@ static void rx(struct net_device *dev, i
 
        BUGMSG(D_DURING, "it's a raw packet (length=%d)\n", length);
 
-       if (length >= MinTU)
+       if (length > MTU)
                ofs = 512 - length;
        else
                ofs = 256 - length;

@@ -183,7 +183,7 @@ static int prepare_tx(struct net_device
                       length, XMTU);
                length = XMTU;
        }
-       if (length > MinTU) {
+       if (length >= MinTU) {
                hard->offset[0] = 0;
                hard->offset[1] = ofs = 512 - length;
        } else if (length > MTU) {
drivers/net/arcnet/com20020.c 2007-02-08 16:39:40.000000000 -0800 renamed from drivers/net/arcnet/com20020.c 2006-09-19 20:42:06.000000000 -0700 +1 -1
diff -uprN -X linux-source-2.6.18/Documentation/dontdiff linux-source-2.6.18/drivers/net/arcnet/com20020.c linux-source-2.6.18.changed/drivers/net/arcnet/com20020.c
@@ -104,7 +104,7 @@ int com20020_check(struct net_device *de
        SET_SUBADR(SUB_SETUP1);
        outb(lp->setup, _XREG);
 
-       if (lp->card_flags & ARC_CAN_10MBIT)
+        if (lp->clockm != 0)
        {
                SET_SUBADR(SUB_SETUP2);
                outb(lp->setup2, _XREG);
drivers/net/arcnet/com20020-pci.c 2007-02-08 16:24:27.000000000 -0800 renamed from drivers/net/arcnet/com20020-pci.c 2006-09-19 20:42:06.000000000 -0700 +3 -0
diff -uprN -X linux-source-2.6.18/Documentation/dontdiff linux-source-2.6.18/drivers/net/arcnet/com20020-pci.c linux-source-2.6.18.changed/drivers/net/arcnet/com20020-pci.c
@@ -155,6 +155,7 @@ static struct pci_device_id com20020pci_
        { 0x1571, 0xa00b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
        { 0x1571, 0xa00c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
        { 0x1571, 0xa00d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_IS_5MBIT },
+        { 0x1571, 0xa00e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
        { 0x1571, 0xa201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
        { 0x1571, 0xa202, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
        { 0x1571, 0xa203, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },

@@ -162,6 +163,8 @@ static struct pci_device_id com20020pci_
        { 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
        { 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
        { 0x10B5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+       { 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+       { 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
        {0,}
 };