riscv: andes: fix make failure with riscv generic defconfig (torvalds#206)

Signed-off-by: charles <[email protected]>
Reviewed-on: https://gitea.andestech.com/RD-SW/linux/pulls/206
Reviewed-by: randolph <[email protected]>
Reviewed-by: Leo Yu-Chi Liang <[email protected]>
Co-authored-by: charles <[email protected]>
Co-committed-by: charles <[email protected]>

Author: CharlesWu465

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

@@ -10,6 +10,7 @@
 void handle_page_fault(struct pt_regs *regs);
 void handle_break(struct pt_regs *regs);
 
+#ifdef CONFIG_ARCH_ANDES
 static __always_inline void arch_exit_to_user_mode_work(struct pt_regs *regs,
 							unsigned long ti_work)
 {
@@ -23,4 +24,5 @@ static __always_inline void arch_exit_to_user_mode_work(struct pt_regs *regs,
 	}
 }
 #define arch_exit_to_user_mode_work arch_exit_to_user_mode_work
+#endif
 #endif /* _ASM_RISCV_ENTRY_COMMON_H */

arch/riscv/include/asm/ptrace.h

@@ -50,8 +50,10 @@ struct pt_regs {
 	unsigned long badaddr;
 	unsigned long cause;
 
+#ifdef CONFIG_ARCH_ANDES
 	/* Andes supervisor detailed trap cause */
 	unsigned long sdcause;
+#endif
 	/* a0 value before the syscall */
 	unsigned long orig_a0;
 };
@@ -65,8 +67,10 @@ struct pt_regs {
 #define REG_FMT "%08lx"
 #endif
 
+#ifdef CONFIG_ARCH_ANDES
 /* Andes use trigger module to implement the ptrace single step. */
 #define arch_has_single_step() (1)
+#endif
 
 #define user_mode(regs) (((regs)->status & SR_PP) == 0)
 

arch/riscv/kernel/asm-offsets.c

@@ -115,7 +115,9 @@ void asm_offsets(void)
 	OFFSET(PT_STATUS, pt_regs, status);
 	OFFSET(PT_BADADDR, pt_regs, badaddr);
 	OFFSET(PT_CAUSE, pt_regs, cause);
+#ifdef CONFIG_ARCH_ANDES
 	OFFSET(PT_SDCAUSE, pt_regs, sdcause);
+#endif
 
 	OFFSET(SUSPEND_CONTEXT_REGS, suspend_context, regs);
 

arch/riscv/kernel/entry.S

@@ -64,14 +64,18 @@ _save_context:
 	csrr s3, CSR_TVAL
 	csrr s4, CSR_CAUSE
 	csrr s5, CSR_SCRATCH
+#ifdef CONFIG_ARCH_ANDES
 	csrr s6, CSR_SDCAUSE
+#endif
 	REG_S s0, PT_SP(sp)
 	REG_S s1, PT_STATUS(sp)
 	REG_S s2, PT_EPC(sp)
 	REG_S s3, PT_BADADDR(sp)
 	REG_S s4, PT_CAUSE(sp)
 	REG_S s5, PT_TP(sp)
+#ifdef CONFIG_ARCH_ANDES
 	REG_S s6, PT_SDCAUSE(sp)
+#endif
 
 	/*
 	 * Set the scratch register to 0, so that if a recursive exception