Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b071886 authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds
Browse files

[PATCH] s390: pending interrupt after ipl from reader 



Wait for interrupt and clear status pending after resetting the reader.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e9b9a047

arch/s390/kernel/head.S

+17 −2
Original line number Diff line number Diff line
@@ -345,8 +345,23 @@ iplstart: 
	bno   .Lnoreset

        la    %r2,.Lreset              

        lhi   %r3,26

        .long 0x83230008

	diag  %r2,%r3,8

	mvc   0x78(8),.Lrdrnewpsw              # set up IO interrupt psw

.Lwaitrdrirq:

	lpsw  .Lrdrwaitpsw

.Lrdrint:

	c     %r1,0xb8                         # compare subchannel number

	bne   .Lwaitrdrirq

	la    %r5,.Lirb

	tsch  0(%r5)

.Lnoreset:

        b     .Lnoload



	.align 8

.Lrdrnewpsw:

	.long  0x00080000,0x80000000+.Lrdrint

.Lrdrwaitpsw:

	.long  0x020a0000,0x80000000+.Lrdrint

#endif



#

arch/s390/kernel/head64.S

+17 −2
Original line number Diff line number Diff line
@@ -344,8 +344,23 @@ iplstart: 
	bno   .Lnoreset

        la    %r2,.Lreset              

        lhi   %r3,26

        .long 0x83230008

	diag  %r2,%r3,8

	mvc   0x78(8),.Lrdrnewpsw	       # set up IO interrupt psw

.Lwaitrdrirq:

	lpsw  .Lrdrwaitpsw

.Lrdrint:

	c     %r1,0xb8			       # compare subchannel number

	bne   .Lwaitrdrirq

	la    %r5,.Lirb

	tsch  0(%r5)

.Lnoreset:

	b     .Lnoload



	.align 8

.Lrdrnewpsw:

	.long  0x00080000,0x80000000+.Lrdrint

.Lrdrwaitpsw:

	.long  0x020a0000,0x80000000+.Lrdrint

#endif



#