Commit f99ec064 authored by Philippe De Muyter's avatar Philippe De Muyter Committed by David S. Miller

tulip: fix 21142 with 10Mbps without negotiation

with current kernels, tulip 21142 ethernet controllers fail to connect
to a 10Mbps only (i.e. without negotiation-partner) network.  It used
to work in 2.4 kernels.  Fix that.  Tested on a 21142 Rev 0x11.
Signed-off-by: default avatarPhilippe De Muyter <phdm@macqel.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c25b9abb
...@@ -9,6 +9,11 @@ ...@@ -9,6 +9,11 @@
Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html} Please refer to Documentation/DocBook/tulip-user.{pdf,ps,html}
for more information on this driver. for more information on this driver.
DC21143 manual "21143 PCI/CardBus 10/100Mb/s Ethernet LAN Controller
Hardware Reference Manual" is currently available at :
http://developer.intel.com/design/network/manuals/278074.htm
Please submit bugs to http://bugzilla.kernel.org/ . Please submit bugs to http://bugzilla.kernel.org/ .
*/ */
...@@ -32,7 +37,11 @@ void t21142_media_task(struct work_struct *work) ...@@ -32,7 +37,11 @@ void t21142_media_task(struct work_struct *work)
int csr12 = ioread32(ioaddr + CSR12); int csr12 = ioread32(ioaddr + CSR12);
int next_tick = 60*HZ; int next_tick = 60*HZ;
int new_csr6 = 0; int new_csr6 = 0;
int csr14 = ioread32(ioaddr + CSR14);
/* CSR12[LS10,LS100] are not reliable during autonegotiation */
if ((csr14 & 0x80) && (csr12 & 0x7000) != 0x5000)
csr12 |= 6;
if (tulip_debug > 2) if (tulip_debug > 2)
printk(KERN_INFO"%s: 21143 negotiation status %8.8x, %s.\n", printk(KERN_INFO"%s: 21143 negotiation status %8.8x, %s.\n",
dev->name, csr12, medianame[dev->if_port]); dev->name, csr12, medianame[dev->if_port]);
...@@ -76,7 +85,7 @@ void t21142_media_task(struct work_struct *work) ...@@ -76,7 +85,7 @@ void t21142_media_task(struct work_struct *work)
new_csr6 = 0x83860000; new_csr6 = 0x83860000;
dev->if_port = 3; dev->if_port = 3;
iowrite32(0, ioaddr + CSR13); iowrite32(0, ioaddr + CSR13);
iowrite32(0x0003FF7F, ioaddr + CSR14); iowrite32(0x0003FFFF, ioaddr + CSR14);
iowrite16(8, ioaddr + CSR15); iowrite16(8, ioaddr + CSR15);
iowrite32(1, ioaddr + CSR13); iowrite32(1, ioaddr + CSR13);
} }
...@@ -132,10 +141,14 @@ void t21142_lnk_change(struct net_device *dev, int csr5) ...@@ -132,10 +141,14 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
struct tulip_private *tp = netdev_priv(dev); struct tulip_private *tp = netdev_priv(dev);
void __iomem *ioaddr = tp->base_addr; void __iomem *ioaddr = tp->base_addr;
int csr12 = ioread32(ioaddr + CSR12); int csr12 = ioread32(ioaddr + CSR12);
int csr14 = ioread32(ioaddr + CSR14);
/* CSR12[LS10,LS100] are not reliable during autonegotiation */
if ((csr14 & 0x80) && (csr12 & 0x7000) != 0x5000)
csr12 |= 6;
if (tulip_debug > 1) if (tulip_debug > 1)
printk(KERN_INFO"%s: 21143 link status interrupt %8.8x, CSR5 %x, " printk(KERN_INFO"%s: 21143 link status interrupt %8.8x, CSR5 %x, "
"%8.8x.\n", dev->name, csr12, csr5, ioread32(ioaddr + CSR14)); "%8.8x.\n", dev->name, csr12, csr5, csr14);
/* If NWay finished and we have a negotiated partner capability. */ /* If NWay finished and we have a negotiated partner capability. */
if (tp->nway && !tp->nwayset && (csr12 & 0x7000) == 0x5000) { if (tp->nway && !tp->nwayset && (csr12 & 0x7000) == 0x5000) {
...@@ -143,7 +156,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5) ...@@ -143,7 +156,9 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
int negotiated = tp->sym_advertise & (csr12 >> 16); int negotiated = tp->sym_advertise & (csr12 >> 16);
tp->lpar = csr12 >> 16; tp->lpar = csr12 >> 16;
tp->nwayset = 1; tp->nwayset = 1;
if (negotiated & 0x0100) dev->if_port = 5; /* If partner cannot negotiate, it is 10Mbps Half Duplex */
if (!(csr12 & 0x8000)) dev->if_port = 0;
else if (negotiated & 0x0100) dev->if_port = 5;
else if (negotiated & 0x0080) dev->if_port = 3; else if (negotiated & 0x0080) dev->if_port = 3;
else if (negotiated & 0x0040) dev->if_port = 4; else if (negotiated & 0x0040) dev->if_port = 4;
else if (negotiated & 0x0020) dev->if_port = 0; else if (negotiated & 0x0020) dev->if_port = 0;
...@@ -214,7 +229,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5) ...@@ -214,7 +229,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
tp->timer.expires = RUN_AT(3*HZ); tp->timer.expires = RUN_AT(3*HZ);
add_timer(&tp->timer); add_timer(&tp->timer);
} else if (dev->if_port == 5) } else if (dev->if_port == 5)
iowrite32(ioread32(ioaddr + CSR14) & ~0x080, ioaddr + CSR14); iowrite32(csr14 & ~0x080, ioaddr + CSR14);
} else if (dev->if_port == 0 || dev->if_port == 4) { } else if (dev->if_port == 0 || dev->if_port == 4) {
if ((csr12 & 4) == 0) if ((csr12 & 4) == 0)
printk(KERN_INFO"%s: 21143 10baseT link beat good.\n", printk(KERN_INFO"%s: 21143 10baseT link beat good.\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment