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

Commit 21a63b56 authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: Change calling convention of do_page_fault() 



switch the args (address, pt_regs) to match with all the other "C"
exception handlers.

This removes the awkwardness in EV_ProtV for page fault vs. unaligned
access.

Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent d4599baf

arch/arc/kernel/entry.S

+4 −5
Original line number Diff line number Diff line
@@ -337,9 +337,9 @@ ARC_ENTRY EV_TLBProtV 
	;  vineetg: Mar 6th: Random Seg Fault issue #1

	;  ecr and efa were not saved in case an Intr sneaks in

	;  after fake rtie

	;



	lr  r2, [ecr]

	lr  r1, [efa]	; Faulting Data address

	lr  r0, [efa]	; Faulting Data address



	; --------(4) Return from CPU Exception Mode ---------

	;  Fake a rtie, but rtie to next label
@@ -348,6 +348,8 @@ ARC_ENTRY EV_TLBProtV 


	FAKE_RET_FROM_EXCPN r9



	mov   r1, sp



	;------ (5) Type of Protection Violation? ----------

	;

	; ProtV Hardware Exception is triggered for Access Faults of 2 types
@@ -358,14 +360,11 @@ ARC_ENTRY EV_TLBProtV 
	bbit1 r2, ECR_C_BIT_PROTV_MISALIG_DATA, 4f



	;========= (6a) Access Violation Processing ========

	mov r0, sp              ; pt_regs

	bl  do_page_fault

	b   ret_from_exception



	;========== (6b) Non aligned access ============

4:

	mov r0, r1

	mov r1, sp              ; pt_regs



#ifdef  CONFIG_ARC_MISALIGN_ACCESS

	SAVE_CALLEE_SAVED_USER

arch/arc/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int handle_vmalloc_fault(unsigned long address) 
	return 1;

}



void do_page_fault(struct pt_regs *regs, unsigned long address)

void do_page_fault(unsigned long address, struct pt_regs *regs)

{

	struct vm_area_struct *vma = NULL;

	struct task_struct *tsk = current;

arch/arc/mm/tlbex.S

+2 −2
Original line number Diff line number Diff line
@@ -369,8 +369,8 @@ do_slow_path_pf: 
	EXCEPTION_PROLOGUE



	; ------- setup args for Linux Page fault Hanlder ---------

	mov_s r0, sp

	lr  r1, [efa]

	mov_s r1, sp

	lr    r0, [efa]



	; We don't want exceptions to be disabled while the fault is handled.

	; Now that we have saved the context we return from exception hence