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

Commit 107937ba authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

parisc: Fix itlb miss handler for 64-bit programs 

commit 9542130937e9dc707dd7c6b7af73326437da2d50 upstream.

For an itlb miss when executing code above 4 Gb on ILP64 adjust the
iasq/iaoq in the same way isr/ior was adjusted.  This fixes signal
delivery for the 64-bit static test program from
http://ftp.parisc-linux.org/src/64bit.tar.gz

.  Note that signals are
handled by the signal trampoline code in the 64-bit VDSO which is mapped
into high userspace memory region above 4GB for 64-bit processes.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org	# v4.19+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3465999

arch/parisc/kernel/entry.S

+2 −4
Original line number Diff line number Diff line
@@ -1078,8 +1078,7 @@ ENTRY_CFI(intr_save) /* for os_hpmc */ 
	STREG           %r16, PT_ISR(%r29)

	STREG           %r17, PT_IOR(%r29)



#if 0 && defined(CONFIG_64BIT)

	/* Revisit when we have 64-bit code above 4Gb */

#if defined(CONFIG_64BIT)

	b,n		intr_save2



skip_save_ior:
@@ -1087,8 +1086,7 @@ skip_save_ior: 
	 * need to adjust iasq/iaoq here in the same way we adjusted isr/ior

	 * above.

	 */

	extrd,u,*	%r8,PSW_W_BIT,1,%r1

	cmpib,COND(=),n	1,%r1,intr_save2

	bb,COND(>=),n	%r8,PSW_W_BIT,intr_save2

	LDREG		PT_IASQ0(%r29), %r16

	LDREG		PT_IAOQ0(%r29), %r17

	/* adjust iasq/iaoq */