Re: eepro100 problems in 2.4.0

[Torben Mathiasen <torben@kernel.dk>]

[-- Attachment #1: Type: text/plain, Size: 747 bytes --]

On Friday, 26 January 2001, saw@saw.sw.com.sg wrote:
> Hi,
> 
> On Thu, Jan 25, 2001 at 04:19:27PM -0500, Jeff Garzik wrote:
> > Oops, sorry guys.  Thanks to DaveM for correcting me -- my patch has
> > nothing to do with the "card reports no resources" problem.  My
> > apologies.
> 
> No problems.
> 
> However, there is a real problem with eepro100 when the system resumes
> operations after a sleep.
> May be, you could guess what's wrong in this case?
> 

I had to add this small patch to make it work properly with my Armada
M700. It basiclly just does something similar to what happens when we
get TX timeouts. Its just a quick hack, as I got tired of the eepro100
driver dumping the tx/rx queues when resuming.

Regards,

Torben Mathiasen


[-- Attachment #2: ee100apm.diff --]
[-- Type: application/octet-stream, Size: 976 bytes --]

--- /opt/kernel/kernels/linux/drivers/net/eepro100.c	Tue Nov 28 02:58:32 2000
+++ linux/drivers/net/eepro100.c	Wed Jan 24 16:26:14 2001
@@ -2145,7 +2145,7 @@
 {
 	struct net_device *dev = pdev->driver_data;
 	struct speedo_private *sp = (struct speedo_private *)dev->priv;
-	long ioaddr = dev->base_addr;
+	long ioaddr = dev->base_addr, flags;
 
 	/* I'm absolutely uncertain if this part of code may work.
 	   The problems are:
@@ -2154,12 +2154,19 @@
 		  reinitialization;
 		- serialization with other driver calls.
 	   2000/03/08  SAW */
+	outl(PortReset, ioaddr + SCBPort);
+	udelay(10);
 	outw(SCBMaskAll, ioaddr + SCBCmd);
+	synchronize_irq();
+	spin_lock_irqsave(&sp->lock, flags);
 	speedo_resume(dev);
-	netif_device_attach(dev);
+	dev->trans_start = jiffies;
 	sp->rx_mode = -1;
+	spin_unlock_irqrestore(&sp->lock, flags);
+	netif_device_attach(dev);
 	sp->flow_ctrl = sp->partner = 0;
 	set_rx_mode(dev);
+	reset_mii(dev);
 }
 #endif /* CONFIG_EEPRO100_PM */