via velocity trivial patch

[Radek Podgorny <radek@podgorny.cz>]

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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello everyone!

I've sent the following mail to Francois Romieu <romieu@fr.zoreil.com>
but did not get any reply. So I'm sending directly here. It's a trivial
patch for via-velocity driver.

Sincerely
Radek Podgorny


Radek Podgorny wrote:
> Hello,
> 
> attached is my trivial patch for the via-velocity driver. The actual
> change has been suggested years ago by Jeff Garzik
> (http://lkml.indiana.edu/hypermail/linux/kernel/0406.0/0500.html).
> 
> The problem:
> 
> When multiple velocity cards share the same interrupt (I have a 4x combo
> card on a very old motherboard without APIC or anything) the interrupt
> routine gets called for all of them (which is correct) but the chip that
> is not in question tries to react (which is wrong). The patch should
> explain the case better.
> 
> It has been tested on my old (and until now broken) system and on a
> modern one (APIC, no shared interrupts) and works flawlessly.
> 
> Sincerely
> Radek Podgorny
> 
> diff -ru linux-2.6.29.1-orig/drivers/net/via-velocity.c
> linux-2.6.29.1/drivers/net/via-velocity.c
> --- linux-2.6.29.1-orig/drivers/net/via-velocity.c	2009-04-02
> 22:55:27.000000000 +0200
> +++ linux-2.6.29.1/drivers/net/via-velocity.c	2009-04-24
> 13:09:45.945318255 +0200
> @@ -2226,8 +2226,8 @@
>  	spin_lock(&vptr->lock);
>  	isr_status = mac_read_isr(vptr->mac_regs);
> 
> -	/* Not us ? */
> -	if (isr_status == 0) {
> +	/* Not us or garbage ? */
> +	if (isr_status == 0 || isr_status == 0xffffffff) {
>  		spin_unlock(&vptr->lock);
>  		return IRQ_NONE;
>  	}
> @@ -2236,10 +2236,11 @@
> 
>  	/*
>  	 *	Keep processing the ISR until we have completed
> -	 *	processing and the isr_status becomes zero
> +	 *	processing and the isr_status becomes zero or
> +	 *	we read out some garbage
>  	 */
> 
> -	while (isr_status != 0) {
> +	while (isr_status != 0 && isr_status != 0xffffffff) {
>  		mac_write_isr(vptr->mac_regs, isr_status);
>  		if (isr_status & (~(ISR_PRXI | ISR_PPRXI | ISR_PTXI | ISR_PPTXI)))
>  			velocity_error(vptr, isr_status);
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkoB+/UACgkQ7mej6pjlbYTriwCgvMZ7md0ilITiVqWQphzoyCHq
Ko4AoMqxNS2dSt6QyE29N6DK9eCInbMp
=/ZrZ
-----END PGP SIGNATURE-----

[-- Attachment #2: via-velocity.patch --]
[-- Type: text/plain, Size: 997 bytes --]

diff -ru linux-2.6.29.1-orig/drivers/net/via-velocity.c linux-2.6.29.1/drivers/net/via-velocity.c
--- linux-2.6.29.1-orig/drivers/net/via-velocity.c	2009-04-02 22:55:27.000000000 +0200
+++ linux-2.6.29.1/drivers/net/via-velocity.c	2009-04-24 13:09:45.945318255 +0200
@@ -2226,8 +2226,8 @@
 	spin_lock(&vptr->lock);
 	isr_status = mac_read_isr(vptr->mac_regs);
 
-	/* Not us ? */
-	if (isr_status == 0) {
+	/* Not us or garbage ? */
+	if (isr_status == 0 || isr_status == 0xffffffff) {
 		spin_unlock(&vptr->lock);
 		return IRQ_NONE;
 	}
@@ -2236,10 +2236,11 @@
 
 	/*
 	 *	Keep processing the ISR until we have completed
-	 *	processing and the isr_status becomes zero
+	 *	processing and the isr_status becomes zero or
+	 *	we read out some garbage
 	 */
 
-	while (isr_status != 0) {
+	while (isr_status != 0 && isr_status != 0xffffffff) {
 		mac_write_isr(vptr->mac_regs, isr_status);
 		if (isr_status & (~(ISR_PRXI | ISR_PPRXI | ISR_PTXI | ISR_PPTXI)))
 			velocity_error(vptr, isr_status);