Commit f733f119 authored by Xi Ruoyao's avatar Xi Ruoyao Committed by Huacai Chen

LoongArch: Use la.pcrel instead of la.abs when it's trivially possible

Let's start to kill la.abs in preparation for the subsequent support of
the PIE kernel.

BTW, Re-tab the indention in arch/loongarch/kernel/entry.S for alignment.
Signed-off-by: default avatarXi Ruoyao <xry111@xry111.site>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent 41596803
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
.endm .endm
.macro set_saved_sp stackp temp temp2 .macro set_saved_sp stackp temp temp2
la.abs \temp, kernelsp la.pcrel \temp, kernelsp
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
LONG_ADD \temp, \temp, u0 LONG_ADD \temp, \temp, u0
#endif #endif
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
extern u64 __ua_limit; extern u64 __ua_limit;
#define __UA_ADDR ".dword" #define __UA_ADDR ".dword"
#define __UA_LA "la.abs"
#define __UA_LIMIT __ua_limit #define __UA_LIMIT __ua_limit
/* /*
......
...@@ -19,70 +19,70 @@ ...@@ -19,70 +19,70 @@
.cfi_sections .debug_frame .cfi_sections .debug_frame
.align 5 .align 5
SYM_FUNC_START(handle_syscall) SYM_FUNC_START(handle_syscall)
csrrd t0, PERCPU_BASE_KS csrrd t0, PERCPU_BASE_KS
la.abs t1, kernelsp la.pcrel t1, kernelsp
add.d t1, t1, t0 add.d t1, t1, t0
move t2, sp move t2, sp
ld.d sp, t1, 0 ld.d sp, t1, 0
addi.d sp, sp, -PT_SIZE addi.d sp, sp, -PT_SIZE
cfi_st t2, PT_R3 cfi_st t2, PT_R3
cfi_rel_offset sp, PT_R3 cfi_rel_offset sp, PT_R3
st.d zero, sp, PT_R0 st.d zero, sp, PT_R0
csrrd t2, LOONGARCH_CSR_PRMD csrrd t2, LOONGARCH_CSR_PRMD
st.d t2, sp, PT_PRMD st.d t2, sp, PT_PRMD
csrrd t2, LOONGARCH_CSR_CRMD csrrd t2, LOONGARCH_CSR_CRMD
st.d t2, sp, PT_CRMD st.d t2, sp, PT_CRMD
csrrd t2, LOONGARCH_CSR_EUEN csrrd t2, LOONGARCH_CSR_EUEN
st.d t2, sp, PT_EUEN st.d t2, sp, PT_EUEN
csrrd t2, LOONGARCH_CSR_ECFG csrrd t2, LOONGARCH_CSR_ECFG
st.d t2, sp, PT_ECFG st.d t2, sp, PT_ECFG
csrrd t2, LOONGARCH_CSR_ESTAT csrrd t2, LOONGARCH_CSR_ESTAT
st.d t2, sp, PT_ESTAT st.d t2, sp, PT_ESTAT
cfi_st ra, PT_R1 cfi_st ra, PT_R1
cfi_st a0, PT_R4 cfi_st a0, PT_R4
cfi_st a1, PT_R5 cfi_st a1, PT_R5
cfi_st a2, PT_R6 cfi_st a2, PT_R6
cfi_st a3, PT_R7 cfi_st a3, PT_R7
cfi_st a4, PT_R8 cfi_st a4, PT_R8
cfi_st a5, PT_R9 cfi_st a5, PT_R9
cfi_st a6, PT_R10 cfi_st a6, PT_R10
cfi_st a7, PT_R11 cfi_st a7, PT_R11
csrrd ra, LOONGARCH_CSR_ERA csrrd ra, LOONGARCH_CSR_ERA
st.d ra, sp, PT_ERA st.d ra, sp, PT_ERA
cfi_rel_offset ra, PT_ERA cfi_rel_offset ra, PT_ERA
cfi_st tp, PT_R2 cfi_st tp, PT_R2
cfi_st u0, PT_R21 cfi_st u0, PT_R21
cfi_st fp, PT_R22 cfi_st fp, PT_R22
SAVE_STATIC SAVE_STATIC
move u0, t0 move u0, t0
li.d tp, ~_THREAD_MASK li.d tp, ~_THREAD_MASK
and tp, tp, sp and tp, tp, sp
move a0, sp move a0, sp
bl do_syscall bl do_syscall
RESTORE_ALL_AND_RET RESTORE_ALL_AND_RET
SYM_FUNC_END(handle_syscall) SYM_FUNC_END(handle_syscall)
SYM_CODE_START(ret_from_fork) SYM_CODE_START(ret_from_fork)
bl schedule_tail # a0 = struct task_struct *prev bl schedule_tail # a0 = struct task_struct *prev
move a0, sp move a0, sp
bl syscall_exit_to_user_mode bl syscall_exit_to_user_mode
RESTORE_STATIC RESTORE_STATIC
RESTORE_SOME RESTORE_SOME
RESTORE_SP_AND_RET RESTORE_SP_AND_RET
SYM_CODE_END(ret_from_fork) SYM_CODE_END(ret_from_fork)
SYM_CODE_START(ret_from_kernel_thread) SYM_CODE_START(ret_from_kernel_thread)
bl schedule_tail # a0 = struct task_struct *prev bl schedule_tail # a0 = struct task_struct *prev
move a0, s1 move a0, s1
jirl ra, s0, 0 jirl ra, s0, 0
move a0, sp move a0, sp
bl syscall_exit_to_user_mode bl syscall_exit_to_user_mode
RESTORE_STATIC RESTORE_STATIC
RESTORE_SOME RESTORE_SOME
RESTORE_SP_AND_RET RESTORE_SP_AND_RET
......
...@@ -117,7 +117,7 @@ SYM_CODE_START(smpboot_entry) ...@@ -117,7 +117,7 @@ SYM_CODE_START(smpboot_entry)
li.w t0, 0x00 # FPE=0, SXE=0, ASXE=0, BTE=0 li.w t0, 0x00 # FPE=0, SXE=0, ASXE=0, BTE=0
csrwr t0, LOONGARCH_CSR_EUEN csrwr t0, LOONGARCH_CSR_EUEN
la.abs t0, cpuboot_data la.pcrel t0, cpuboot_data
ld.d sp, t0, CPU_BOOT_STACK ld.d sp, t0, CPU_BOOT_STACK
ld.d tp, t0, CPU_BOOT_TINFO ld.d tp, t0, CPU_BOOT_TINFO
......
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
move a0, sp move a0, sp
REG_S a2, sp, PT_BVADDR REG_S a2, sp, PT_BVADDR
li.w a1, \write li.w a1, \write
la.abs t0, do_page_fault bl do_page_fault
jirl ra, t0, 0
RESTORE_ALL_AND_RET RESTORE_ALL_AND_RET
SYM_FUNC_END(tlb_do_page_fault_\write) SYM_FUNC_END(tlb_do_page_fault_\write)
.endm .endm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment