[I4L] Fix IRQ-sharing lockup in nj_s

[I4L] Fix IRQ-sharing lockup in nj_s

[Herbert Xu]

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

Hi:

This is a backport of a fix that's already in 2.6.  The problem is that
nj_s is enabling interrupts before the handler is even installed.  This
patch delays the call until after the handler has been registered.

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[-- Attachment #2: p --]
[-- Type: text/plain, Size: 583 bytes --]

===== drivers/isdn/hisax/nj_s.c 1.7 vs edited =====
--- 1.7/drivers/isdn/hisax/nj_s.c	2002-04-01 11:02:11 +10:00
+++ edited/drivers/isdn/hisax/nj_s.c	2004-07-27 18:19:41 +10:00
@@ -130,6 +130,7 @@
 			release_io_netjet(cs);
 			return(0);
 		case CARD_INIT:
+			reset_netjet_s(cs);
 			inittiger(cs);
 			clear_pending_isac_ints(cs);
 			initisac(cs);
@@ -262,7 +263,6 @@
 	} else {
 		request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn");
 	}
-	reset_netjet_s(cs);
 	cs->readisac  = &NETjet_ReadIC;
 	cs->writeisac = &NETjet_WriteIC;
 	cs->readisacfifo  = &NETjet_ReadICfifo;

Re: [I4L] Fix IRQ-sharing lockup in nj_s

[Karsten Keil]

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

Yes, correct.

On Tue, Jul 27, 2004 at 06:22:41PM +1000, Herbert Xu wrote:
> Hi:
> 
> This is a backport of a fix that's already in 2.6.  The problem is that
> nj_s is enabling interrupts before the handler is even installed.  This
> patch delays the call until after the handler has been registered.
> 
> Cheers,
> -- 
> Visit Openswan at http://www.openswan.org/
> Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt


Signed-off-by: Karsten Keil <kkeil@suse.de>

===== drivers/isdn/hisax/nj_s.c 1.7 vs edited =====
--- 1.7/drivers/isdn/hisax/nj_s.c	2002-04-01 11:02:11 +10:00
+++ edited/drivers/isdn/hisax/nj_s.c	2004-07-27 18:19:41 +10:00
@@ -130,6 +130,7 @@
 			release_io_netjet(cs);
 			return(0);
 		case CARD_INIT:
+			reset_netjet_s(cs);
 			inittiger(cs);
 			clear_pending_isac_ints(cs);
 			initisac(cs);
@@ -262,7 +263,6 @@
 	} else {
 		request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn");
 	}
-	reset_netjet_s(cs);
 	cs->readisac  = &NETjet_ReadIC;
 	cs->writeisac = &NETjet_WriteIC;
 	cs->readisacfifo  = &NETjet_ReadICfifo;

-- 
Karsten Keil
SuSE Labs
ISDN development

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [I4L] Fix IRQ-sharing lockup in nj_s

[Marcelo Tosatti]

Applied, thanks Herbert and Karsten.

Just please stop using my old email address :) 

On Tue, Jul 27, 2004 at 12:19:27PM +0200, Karsten Keil wrote:
> Yes, correct.
> 
> On Tue, Jul 27, 2004 at 06:22:41PM +1000, Herbert Xu wrote:
> > Hi:
> > 
> > This is a backport of a fix that's already in 2.6.  The problem is that
> > nj_s is enabling interrupts before the handler is even installed.  This
> > patch delays the call until after the handler has been registered.