Unverified Commit e45d6a52 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Merge patch series "riscv: Add GENERIC_ENTRY support" 

guoren@kernel.org <guoren@kernel.org> says:

From: Guo Ren <guoren@linux.alibaba.com>

The patches convert riscv to use the generic entry infrastructure from
kernel/entry/*. Some optimization for entry.S with new .macro and merge
ret_from_kernel_thread into ret_from_fork.

* b4-shazam-merge:
  riscv: entry: Consolidate general regs saving/restoring
  riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork
  riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off}
  riscv: entry: Convert to generic entry
  riscv: entry: Add noinstr to prevent instrumentation inserted
  riscv: ptrace: Remove duplicate operation

Link: https://lore.kernel.org/r/20230222033021.983168-1-guoren@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parents 4b740779 45b32b94

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/asm.h

+61 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#endif



#ifdef __ASSEMBLY__

#include <asm/asm-offsets.h>



/* Common assembly source macros */
@@ -81,6 +82,66 @@ 
	.endr

.endm



	/* save all GPs except x1 ~ x5 */

	.macro save_from_x6_to_x31

	REG_S x6,  PT_T1(sp)

	REG_S x7,  PT_T2(sp)

	REG_S x8,  PT_S0(sp)

	REG_S x9,  PT_S1(sp)

	REG_S x10, PT_A0(sp)

	REG_S x11, PT_A1(sp)

	REG_S x12, PT_A2(sp)

	REG_S x13, PT_A3(sp)

	REG_S x14, PT_A4(sp)

	REG_S x15, PT_A5(sp)

	REG_S x16, PT_A6(sp)

	REG_S x17, PT_A7(sp)

	REG_S x18, PT_S2(sp)

	REG_S x19, PT_S3(sp)

	REG_S x20, PT_S4(sp)

	REG_S x21, PT_S5(sp)

	REG_S x22, PT_S6(sp)

	REG_S x23, PT_S7(sp)

	REG_S x24, PT_S8(sp)

	REG_S x25, PT_S9(sp)

	REG_S x26, PT_S10(sp)

	REG_S x27, PT_S11(sp)

	REG_S x28, PT_T3(sp)

	REG_S x29, PT_T4(sp)

	REG_S x30, PT_T5(sp)

	REG_S x31, PT_T6(sp)

	.endm



	/* restore all GPs except x1 ~ x5 */

	.macro restore_from_x6_to_x31

	REG_L x6,  PT_T1(sp)

	REG_L x7,  PT_T2(sp)

	REG_L x8,  PT_S0(sp)

	REG_L x9,  PT_S1(sp)

	REG_L x10, PT_A0(sp)

	REG_L x11, PT_A1(sp)

	REG_L x12, PT_A2(sp)

	REG_L x13, PT_A3(sp)

	REG_L x14, PT_A4(sp)

	REG_L x15, PT_A5(sp)

	REG_L x16, PT_A6(sp)

	REG_L x17, PT_A7(sp)

	REG_L x18, PT_S2(sp)

	REG_L x19, PT_S3(sp)

	REG_L x20, PT_S4(sp)

	REG_L x21, PT_S5(sp)

	REG_L x22, PT_S6(sp)

	REG_L x23, PT_S7(sp)

	REG_L x24, PT_S8(sp)

	REG_L x25, PT_S9(sp)

	REG_L x26, PT_S10(sp)

	REG_L x27, PT_S11(sp)

	REG_L x28, PT_T3(sp)

	REG_L x29, PT_T4(sp)

	REG_L x30, PT_T5(sp)

	REG_L x31, PT_T6(sp)

	.endm



#endif /* __ASSEMBLY__ */



#endif /* _ASM_RISCV_ASM_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 */