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

Commit 3d295076 authored by Heiko Carstens's avatar Heiko Carstens Committed by Greg Kroah-Hartman
Browse files

s390/pci: add missing EX_TABLE entries to __pcistg_mio_inuser()/__pcilg_mio_inuser() 



commit 6ec803025cf3173a57222e4411097166bd06fa98 upstream.

For some exception types the instruction address points behind the
instruction that caused the exception. Take that into account and add
the missing exception table entry.

Cc: <stable@vger.kernel.org>
Fixes: f058599e22d5 ("s390/pci: Fix s390_mmio_read/write with MIO")
Reviewed-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 344e1cb0

arch/s390/pci/pci_mmio.c

+4 −4
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static inline int __pcistg_mio_inuser( 
	asm volatile (

		"       sacf    256\n"

		"0:     llgc    %[tmp],0(%[src])\n"

		"       sllg    %[val],%[val],8\n"

		"4:	sllg	%[val],%[val],8\n"

		"       aghi    %[src],1\n"

		"       ogr     %[val],%[tmp]\n"

		"       brctg   %[cnt],0b\n"
@@ -72,7 +72,7 @@ static inline int __pcistg_mio_inuser( 
		"2:     ipm     %[cc]\n"

		"       srl     %[cc],28\n"

		"3:     sacf    768\n"

		EX_TABLE(0b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b)

		EX_TABLE(0b, 3b) EX_TABLE(4b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b)

		:

		[src] "+a" (src), [cnt] "+d" (cnt),

		[val] "+d" (val), [tmp] "=d" (tmp),
@@ -220,10 +220,10 @@ static inline int __pcilg_mio_inuser( 
		"2:     ahi     %[shift],-8\n"

		"       srlg    %[tmp],%[val],0(%[shift])\n"

		"3:     stc     %[tmp],0(%[dst])\n"

		"       aghi    %[dst],1\n"

		"5:	aghi	%[dst],1\n"

		"       brctg   %[cnt],2b\n"

		"4:     sacf    768\n"

		EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b)

		EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b) EX_TABLE(5b, 4b)

		:

		[cc] "+d" (cc), [val] "=d" (val), [len] "+d" (len),

		[dst] "+a" (dst), [cnt] "+d" (cnt), [tmp] "=d" (tmp),