Unverified Commit f0bddf50 authored by Guo Ren's avatar Guo Ren Committed by Palmer Dabbelt
Browse files

riscv: entry: Convert to generic entry 



This patch converts riscv to use the generic entry infrastructure from
kernel/entry/*. The generic entry makes maintainers' work easier and
codes more elegant. Here are the changes:

 - More clear entry.S with handle_exception and ret_from_exception
 - Get rid of complex custom signal implementation
 - Move syscall procedure from assembly to C, which is much more
   readable.
 - Connect ret_from_fork & ret_from_kernel_thread to generic entry.
 - Wrap with irqentry_enter/exit and syscall_enter/exit_from_user_mode
 - Use the standard preemption code instead of custom

Suggested-by: default avatarHuacai Chen <chenhuacai@kernel.org>
Reviewed-by: default avatarBjörn Töpel <bjorn@rivosinc.com>
Tested-by: default avatarYipeng Zou <zouyipeng@huawei.com>
Tested-by: default avatarJisheng Zhang <jszhang@kernel.org>
Signed-off-by: default avatarGuo Ren <guoren@linux.alibaba.com>
Signed-off-by: default avatarGuo Ren <guoren@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Link: https://lore.kernel.org/r/20230222033021.983168-5-guoren@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent d0db02c6

arch/riscv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ config RISCV 
	select GENERIC_ATOMIC64 if !64BIT

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP

	select GENERIC_EARLY_IOREMAP

	select GENERIC_ENTRY

	select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IOREMAP if MMU

arch/riscv/include/asm/asm-prototypes.h

+2 −0
Original line number Diff line number Diff line
@@ -27,5 +27,7 @@ DECLARE_DO_ERROR_INFO(do_trap_break); 


asmlinkage unsigned long get_overflow_stack(void);

asmlinkage void handle_bad_stack(struct pt_regs *regs);

asmlinkage void do_page_fault(struct pt_regs *regs);

asmlinkage void do_irq(struct pt_regs *regs);



#endif /* _ASM_RISCV_PROTOTYPES_H */

arch/riscv/include/asm/csr.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#define SR_UXL		_AC(0x300000000, UL) /* XLEN mask for U-mode */

#define SR_UXL_32	_AC(0x100000000, UL) /* XLEN = 32 for U-mode */

#define SR_UXL_64	_AC(0x200000000, UL) /* XLEN = 64 for U-mode */

#define SR_UXL_SHIFT	32

#endif



/* SATP flags */

arch/riscv/include/asm/entry-common.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef _ASM_RISCV_ENTRY_COMMON_H

#define _ASM_RISCV_ENTRY_COMMON_H



#include <asm/stacktrace.h>



void handle_page_fault(struct pt_regs *regs);

void handle_break(struct pt_regs *regs);



#endif /* _ASM_RISCV_ENTRY_COMMON_H */

arch/riscv/include/asm/ptrace.h

+8 −2
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ struct pt_regs { 
	unsigned long orig_a0;

};



#define PTRACE_SYSEMU			0x1f

#define PTRACE_SYSEMU_SINGLESTEP	0x20



#ifdef CONFIG_64BIT

#define REG_FMT "%016lx"

#else
@@ -121,8 +124,6 @@ extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, 


void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,

			   unsigned long frame_pointer);

int do_syscall_trace_enter(struct pt_regs *regs);

void do_syscall_trace_exit(struct pt_regs *regs);



/**

 * regs_get_register() - get register value from its offset
@@ -172,6 +173,11 @@ static inline unsigned long regs_get_kernel_argument(struct pt_regs *regs, 
	return 0;

}



static inline int regs_irqs_disabled(struct pt_regs *regs)

{

	return !(regs->status & SR_PIE);

}



#endif /* __ASSEMBLY__ */



#endif /* _ASM_RISCV_PTRACE_H */