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

Commit 48f6b00c authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

s390/irq: store interrupt information in pt_regs 



Copy the interrupt parameters from the lowcore to the pt_regs structure
in entry[64].S and reduce the arguments of the low level interrupt handler
to the pt_regs pointer only. In addition move the test-pending-interrupt
loop from do_IRQ to entry[64].S to make sure that interrupt information
is always delivered via pt_regs.

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

arch/s390/include/asm/ptrace.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct pt_regs 
	unsigned long gprs[NUM_GPRS];

	unsigned long orig_gpr2;

	unsigned int int_code;

	unsigned int int_parm;

	unsigned long int_parm_long;

};

arch/s390/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ int main(void) 
	DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));

	DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));

	DEFINE(__PT_INT_CODE, offsetof(struct pt_regs, int_code));

	DEFINE(__PT_INT_PARM, offsetof(struct pt_regs, int_parm));

	DEFINE(__PT_INT_PARM_LONG, offsetof(struct pt_regs, int_parm_long));

	DEFINE(__PT_SIZE, sizeof(struct pt_regs));

	BLANK();

arch/s390/kernel/entry.S

+10 −2
Original line number Diff line number Diff line
@@ -429,11 +429,19 @@ io_skip: 
	stm	%r0,%r7,__PT_R0(%r11)

	mvc	__PT_R8(32,%r11),__LC_SAVE_AREA_ASYNC

	stm	%r8,%r9,__PT_PSW(%r11)

	mvc	__PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID

	TRACE_IRQS_OFF

	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)

io_loop:

	l	%r1,BASED(.Ldo_IRQ)

	lr	%r2,%r11		# pass pointer to pt_regs

	basr	%r14,%r1		# call do_IRQ

	tm	__LC_MACHINE_FLAGS+2,0x10	# MACHINE_FLAG_LPAR

	jz	io_return

	tpi	0

	jz	io_return

	mvc	__PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID

	j	io_loop

io_return:

	LOCKDEP_SYS_EXIT

	TRACE_IRQS_ON
@@ -573,10 +581,10 @@ ext_skip: 
	stm	%r0,%r7,__PT_R0(%r11)

	mvc	__PT_R8(32,%r11),__LC_SAVE_AREA_ASYNC

	stm	%r8,%r9,__PT_PSW(%r11)

	mvc	__PT_INT_CODE(4,%r11),__LC_EXT_CPU_ADDR

	mvc	__PT_INT_PARM(4,%r11),__LC_EXT_PARAMS

	TRACE_IRQS_OFF

	lr	%r2,%r11		# pass pointer to pt_regs

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

	l	%r4,__LC_EXT_PARAMS	# get external parameters

	l	%r1,BASED(.Ldo_extint)

	basr	%r14,%r1		# call do_extint

	j	io_return

arch/s390/kernel/entry.h

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



struct ext_code;

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

void do_extint(struct pt_regs *regs);

void do_restart(void);

void __init startup_init(void);

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

arch/s390/kernel/entry64.S

+12 −4
Original line number Diff line number Diff line
@@ -460,10 +460,18 @@ io_skip: 
	stmg	%r0,%r7,__PT_R0(%r11)

	mvc	__PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC

	stmg	%r8,%r9,__PT_PSW(%r11)

	mvc	__PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID

	TRACE_IRQS_OFF

	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)

io_loop:

	lgr	%r2,%r11		# pass pointer to pt_regs

	brasl	%r14,do_IRQ

	tm	__LC_MACHINE_FLAGS+6,0x10	# MACHINE_FLAG_LPAR

	jz	io_return

	tpi	0

	jz	io_return

	mvc	__PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID

	j	io_loop

io_return:

	LOCKDEP_SYS_EXIT

	TRACE_IRQS_ON
@@ -605,13 +613,13 @@ ext_skip: 
	stmg	%r0,%r7,__PT_R0(%r11)

	mvc	__PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC

	stmg	%r8,%r9,__PT_PSW(%r11)

	lghi	%r1,__LC_EXT_PARAMS2

	mvc	__PT_INT_CODE(4,%r11),__LC_EXT_CPU_ADDR

	mvc	__PT_INT_PARM(4,%r11),__LC_EXT_PARAMS

	mvc	__PT_INT_PARM_LONG(8,%r11),0(%r1)

	TRACE_IRQS_OFF

	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)

	lghi	%r1,4096

	lgr	%r2,%r11		# pass pointer to pt_regs

	llgf	%r3,__LC_EXT_CPU_ADDR	# 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