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

Commit f5a3f3dc authored by Zou Nan hai's avatar Zou Nan hai Committed by Tony Luck
Browse files

[IA64] Make gp value point to Region 5 in mca handler 



MCA dispatch code take physical address of GP passed from SAL, then call
DATA_PA_TO_VA twice on GP before call into C code.  The first time is
in ia64_set_kernel_register, the second time is in VIRTUAL_MODE_ENTER.
The gp is changed to a virtual address in region 7 because DATA_PA_TO_VA
is implemented by dep instruction.

However when notify blocks were called from MCA handler code, because
notify blocks are supported by callback function pointers, gp value
value was switched to region 5 again.

The patch set gp register to kernel gp of region 5 at entry of MCA
dispatch.

Signed-off-by: default avatarZou Nan hai <nanhai.zou@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 5c55cd63

arch/ia64/kernel/mca_asm.S

+0 −5
Original line number Diff line number Diff line
@@ -1025,18 +1025,13 @@ ia64_old_stack: 


ia64_set_kernel_registers:

	add temp3=MCA_SP_OFFSET, r3

	add temp4=MCA_SOS_OFFSET+SOS(OS_GP), r3

	mov b0=r2		// save return address

	GET_IA64_MCA_DATA(temp1)

	;;

	add temp4=temp4, temp1	// &struct ia64_sal_os_state.os_gp

	add r12=temp1, temp3	// kernel stack pointer on MCA/INIT stack

	add r13=temp1, r3	// set current to start of MCA/INIT stack

	add r20=temp1, r3	// physical start of MCA/INIT stack

	;;

	ld8 r1=[temp4]		// OS GP from SAL OS state

	;;

	DATA_PA_TO_VA(r1,temp1)

	DATA_PA_TO_VA(r12,temp2)

	DATA_PA_TO_VA(r13,temp3)

	;;

include/asm-ia64/mca_asm.h

+1 −1
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ 
	movl	temp2 = start_addr;				\

	;;							\

	mov	cr.iip = temp2;					\

	movl	gp = __gp					\

	;;							\

	DATA_PA_TO_VA(sp, temp1);				\

	DATA_PA_TO_VA(gp, temp2);				\

	srlz.i;							\

	;;							\

	nop	1;						\