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

Commit f6649a7e authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Martin Schwidefsky
Browse files

[S390] cleanup lowcore access from external interrupts 



Read external interrupts parameters from the lowcore in the first
level interrupt handler in entry[64].S.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1e54622e

arch/s390/include/asm/s390_ext.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include <linux/types.h>



typedef void (*ext_int_handler_t)(__u16 code);

typedef void (*ext_int_handler_t)(unsigned int, unsigned int, unsigned long);



typedef struct ext_int_info_t {

	struct ext_int_info_t *next;

arch/s390/kernel/asm-offsets.c

+0 −2
Original line number Diff line number Diff line
@@ -143,10 +143,8 @@ int main(void) 
	DEFINE(__LC_GPREGS_SAVE_AREA, offsetof(struct _lowcore, gpregs_save_area));

	DEFINE(__LC_CREGS_SAVE_AREA, offsetof(struct _lowcore, cregs_save_area));

#ifdef CONFIG_32BIT

	DEFINE(__LC_PFAULT_INTPARM, offsetof(struct _lowcore, ext_params));

	DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, extended_save_area_addr));

#else /* CONFIG_32BIT */

	DEFINE(__LC_PFAULT_INTPARM, offsetof(struct _lowcore, ext_params2));

	DEFINE(__LC_EXT_PARAMS2, offsetof(struct _lowcore, ext_params2));

	DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, floating_pt_save_area));

	DEFINE(__LC_PASTE, offsetof(struct _lowcore, paste));

arch/s390/kernel/entry.S

+2 −1
Original line number Diff line number Diff line
@@ -722,7 +722,8 @@ ext_no_vtime: 
	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct

	TRACE_IRQS_OFF

	la	%r2,SP_PTREGS(%r15)	# address of register-save area

	lh	%r3,__LC_EXT_INT_CODE	# get interruption code

	l	%r3,__LC_CPU_ADDRESS	# get cpu address + interruption code

	l	%r4,__LC_EXT_PARAMS	# get external parameters

	l	%r1,BASED(.Ldo_extint)

	basr	%r14,%r1

	b	BASED(io_return)

arch/s390/kernel/entry.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void do_signal(struct pt_regs *regs); 
int handle_signal32(unsigned long sig, struct k_sigaction *ka,

		    siginfo_t *info, sigset_t *oldset, struct pt_regs *regs);



void do_extint(struct pt_regs *regs, unsigned short code);

void do_extint(struct pt_regs *regs, unsigned int, unsigned int, unsigned long);

int __cpuinit start_secondary(void *cpuvoid);

void __init startup_init(void);

void die(const char * str, struct pt_regs * regs, long err);

arch/s390/kernel/entry64.S

+4 −1
Original line number Diff line number Diff line
@@ -727,8 +727,11 @@ ext_int_handler: 
ext_no_vtime:

	HANDLE_SIE_INTERCEPT

	TRACE_IRQS_OFF

	lghi	%r1,4096

	la	%r2,SP_PTREGS(%r15)	# address of register-save area

	llgh	%r3,__LC_EXT_INT_CODE	# get interruption code

	llgf	%r3,__LC_CPU_ADDRESS	# get cpu address + interruption code

	llgf	%r4,__LC_EXT_PARAMS	# get external parameter

	lg	%r5,__LC_EXT_PARAMS2-4096(%r1)	# get 64 bit external parameter

	brasl	%r14,do_extint

	j	io_return