tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

MIPS: rename rollback_handler with skipover_handler

Recently the rollback region has been changed into an
idle interrupt region [1]. This patch make the appropriate
changes renaming functions and macro, to reflect the change.

[1] https://lore.kernel.org/linux-mips/20250403161143.361461-2-marco.crivellari@suse.com/

Signed-off-by: Marco Crivellari <marco.crivellari@suse.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by Marco Crivellari and committed by Thomas Bogendoerfer cc3e3d3a b713f27e

+11 -11
unified split
+1 -1
arch/mips/include/asm/idle.h
··· 9 9 extern asmlinkage void r4k_wait(void); 10 10 extern void r4k_wait_irqoff(void); 11 11 12 - static inline int using_rollback_handler(void) 12 + static inline int using_skipover_handler(void) 13 13 { 14 14 return cpu_wait == r4k_wait; 15 15 }
+5 -5
arch/mips/kernel/genex.S
··· 116 116 * If an interrupt lands here, before going idle on the next 117 117 * instruction, we must *NOT* go idle since the interrupt could 118 118 * have set TIF_NEED_RESCHED or caused a timer to need resched. 119 - * Fall through -- see rollback_handler below -- and have the 119 + * Fall through -- see skipover_handler below -- and have the 120 120 * idle loop take care of things. 121 121 */ 122 122 1: .fill 0 ··· 139 139 END(r4k_wait) 140 140 .previous 141 141 142 - .macro BUILD_ROLLBACK_PROLOGUE handler 143 - FEXPORT(rollback_\handler) 142 + .macro BUILD_SKIPOVER_PROLOGUE handler 143 + FEXPORT(skipover_\handler) 144 144 .set push 145 145 .set noat 146 146 MFC0 k0, CP0_EPC ··· 156 156 .endm 157 157 158 158 .align 5 159 - BUILD_ROLLBACK_PROLOGUE handle_int 159 + BUILD_SKIPOVER_PROLOGUE handle_int 160 160 NESTED(handle_int, PT_SIZE, sp) 161 161 .cfi_signal_frame 162 162 #ifdef CONFIG_TRACE_IRQFLAGS ··· 276 276 * This prototype is copied to ebase + n*IntCtl.VS and patched 277 277 * to invoke the handler 278 278 */ 279 - BUILD_ROLLBACK_PROLOGUE except_vec_vi 279 + BUILD_SKIPOVER_PROLOGUE except_vec_vi 280 280 NESTED(except_vec_vi, 0, sp) 281 281 SAVE_SOME docfi=1 282 282 SAVE_AT docfi=1
+5 -5
arch/mips/kernel/traps.c
··· 77 77 #include "access-helper.h" 78 78 79 79 extern void check_wait(void); 80 - extern asmlinkage void rollback_handle_int(void); 80 + extern asmlinkage void skipover_handle_int(void); 81 81 extern asmlinkage void handle_int(void); 82 82 extern asmlinkage void handle_adel(void); 83 83 extern asmlinkage void handle_ades(void); ··· 2066 2066 { 2067 2067 extern const u8 except_vec_vi[]; 2068 2068 extern const u8 except_vec_vi_ori[], except_vec_vi_end[]; 2069 - extern const u8 rollback_except_vec_vi[]; 2069 + extern const u8 skipover_except_vec_vi[]; 2070 2070 unsigned long handler; 2071 2071 unsigned long old_handler = vi_handlers[n]; 2072 2072 int srssets = current_cpu_data.srsets; ··· 2095 2095 change_c0_srsmap(0xf << n*4, 0 << n*4); 2096 2096 } 2097 2097 2098 - vec_start = using_rollback_handler() ? rollback_except_vec_vi : 2098 + vec_start = using_skipover_handler() ? skipover_except_vec_vi : 2099 2099 except_vec_vi; 2100 2100 #if defined(CONFIG_CPU_MICROMIPS) || defined(CONFIG_CPU_BIG_ENDIAN) 2101 2101 ori_offset = except_vec_vi_ori - vec_start + 2; ··· 2426 2426 if (board_be_init) 2427 2427 board_be_init(); 2428 2428 2429 - set_except_vector(EXCCODE_INT, using_rollback_handler() ? 2430 - rollback_handle_int : handle_int); 2429 + set_except_vector(EXCCODE_INT, using_skipover_handler() ? 2430 + skipover_handle_int : handle_int); 2431 2431 set_except_vector(EXCCODE_MOD, handle_tlbm); 2432 2432 set_except_vector(EXCCODE_TLBL, handle_tlbl); 2433 2433 set_except_vector(EXCCODE_TLBS, handle_tlbs);