Skip to content

Commit acc142b

Browse files
chleroympe
chleroy
authored and
mpe
committed
powerpc/32: Remove the xfer parameter in EXCEPTION() macro
The xfer parameter is not used anymore, remove it. Signed-off-by: Christophe Leroy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/17c7d68bd18f7d2f1ab24a1a20d9ed33bbcda741.1615552867.git.christophe.leroy@csgroup.eu
1 parent 4c0104a commit acc142b

File tree

7 files changed

+81
-89
lines changed

7 files changed

+81
-89
lines changed

‎arch/powerpc/kernel/head_32.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt)
186186

187187
#endif
188188

189-
#define EXCEPTION(n, label, hdlr, xfer) \
189+
#define EXCEPTION(n, label, hdlr) \
190190
START_EXCEPTION(n, label) \
191191
EXCEPTION_PROLOG n label; \
192192
prepare_transfer_to_handler; \

‎arch/powerpc/kernel/head_40x.S‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt)
228228
b interrupt_return
229229

230230
/* 0x0500 - External Interrupt Exception */
231-
EXCEPTION(0x0500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE)
231+
EXCEPTION(0x0500, HardwareInterrupt, do_IRQ)
232232

233233
/* 0x0600 - Alignment Exception */
234234
START_EXCEPTION(0x0600, Alignment)
@@ -246,19 +246,19 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt)
246246
REST_NVGPRS(r1)
247247
b interrupt_return
248248

249-
EXCEPTION(0x0800, Trap_08, unknown_exception, EXC_XFER_STD)
250-
EXCEPTION(0x0900, Trap_09, unknown_exception, EXC_XFER_STD)
251-
EXCEPTION(0x0A00, Trap_0A, unknown_exception, EXC_XFER_STD)
252-
EXCEPTION(0x0B00, Trap_0B, unknown_exception, EXC_XFER_STD)
249+
EXCEPTION(0x0800, Trap_08, unknown_exception)
250+
EXCEPTION(0x0900, Trap_09, unknown_exception)
251+
EXCEPTION(0x0A00, Trap_0A, unknown_exception)
252+
EXCEPTION(0x0B00, Trap_0B, unknown_exception)
253253

254254
/* 0x0C00 - System Call Exception */
255255
START_EXCEPTION(0x0C00, SystemCall)
256256
SYSCALL_ENTRY 0xc00
257257
/* Trap_0D is commented out to get more space for system call exception */
258258

259-
/* EXCEPTION(0x0D00, Trap_0D, unknown_exception, EXC_XFER_STD) */
260-
EXCEPTION(0x0E00, Trap_0E, unknown_exception, EXC_XFER_STD)
261-
EXCEPTION(0x0F00, Trap_0F, unknown_exception, EXC_XFER_STD)
259+
/* EXCEPTION(0x0D00, Trap_0D, unknown_exception) */
260+
EXCEPTION(0x0E00, Trap_0E, unknown_exception)
261+
EXCEPTION(0x0F00, Trap_0F, unknown_exception)
262262

263263
/* 0x1000 - Programmable Interval Timer (PIT) Exception */
264264
START_EXCEPTION(0x1000, DecrementerTrap)
@@ -433,19 +433,19 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt)
433433
mfspr r10, SPRN_SPRG_SCRATCH5
434434
b InstructionAccess
435435

436-
EXCEPTION(0x1300, Trap_13, unknown_exception, EXC_XFER_STD)
437-
EXCEPTION(0x1400, Trap_14, unknown_exception, EXC_XFER_STD)
438-
EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_STD)
439-
EXCEPTION(0x1600, Trap_16, unknown_exception, EXC_XFER_STD)
440-
EXCEPTION(0x1700, Trap_17, unknown_exception, EXC_XFER_STD)
441-
EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_STD)
442-
EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_STD)
443-
EXCEPTION(0x1A00, Trap_1A, unknown_exception, EXC_XFER_STD)
444-
EXCEPTION(0x1B00, Trap_1B, unknown_exception, EXC_XFER_STD)
445-
EXCEPTION(0x1C00, Trap_1C, unknown_exception, EXC_XFER_STD)
446-
EXCEPTION(0x1D00, Trap_1D, unknown_exception, EXC_XFER_STD)
447-
EXCEPTION(0x1E00, Trap_1E, unknown_exception, EXC_XFER_STD)
448-
EXCEPTION(0x1F00, Trap_1F, unknown_exception, EXC_XFER_STD)
436+
EXCEPTION(0x1300, Trap_13, unknown_exception)
437+
EXCEPTION(0x1400, Trap_14, unknown_exception)
438+
EXCEPTION(0x1500, Trap_15, unknown_exception)
439+
EXCEPTION(0x1600, Trap_16, unknown_exception)
440+
EXCEPTION(0x1700, Trap_17, unknown_exception)
441+
EXCEPTION(0x1800, Trap_18, unknown_exception)
442+
EXCEPTION(0x1900, Trap_19, unknown_exception)
443+
EXCEPTION(0x1A00, Trap_1A, unknown_exception)
444+
EXCEPTION(0x1B00, Trap_1B, unknown_exception)
445+
EXCEPTION(0x1C00, Trap_1C, unknown_exception)
446+
EXCEPTION(0x1D00, Trap_1D, unknown_exception)
447+
EXCEPTION(0x1E00, Trap_1E, unknown_exception)
448+
EXCEPTION(0x1F00, Trap_1F, unknown_exception)
449449

450450
/* Check for a single step debug exception while in an exception
451451
* handler before state has been saved. This is to catch the case

‎arch/powerpc/kernel/head_44x.S‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,7 @@ interrupt_base:
263263
INSTRUCTION_STORAGE_EXCEPTION
264264

265265
/* External Input Interrupt */
266-
EXCEPTION(0x0500, BOOKE_INTERRUPT_EXTERNAL, ExternalInput, \
267-
do_IRQ, EXC_XFER_LITE)
266+
EXCEPTION(0x0500, BOOKE_INTERRUPT_EXTERNAL, ExternalInput, do_IRQ)
268267

269268
/* Alignment Interrupt */
270269
ALIGNMENT_EXCEPTION
@@ -277,23 +276,22 @@ interrupt_base:
277276
FP_UNAVAILABLE_EXCEPTION
278277
#else
279278
EXCEPTION(0x2010, BOOKE_INTERRUPT_FP_UNAVAIL, \
280-
FloatingPointUnavailable, unknown_exception, EXC_XFER_STD)
279+
FloatingPointUnavailable, unknown_exception)
281280
#endif
282281
/* System Call Interrupt */
283282
START_EXCEPTION(SystemCall)
284283
SYSCALL_ENTRY 0xc00 BOOKE_INTERRUPT_SYSCALL
285284

286285
/* Auxiliary Processor Unavailable Interrupt */
287286
EXCEPTION(0x2020, BOOKE_INTERRUPT_AP_UNAVAIL, \
288-
AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_STD)
287+
AuxillaryProcessorUnavailable, unknown_exception)
289288

290289
/* Decrementer Interrupt */
291290
DECREMENTER_EXCEPTION
292291

293292
/* Fixed Internal Timer Interrupt */
294293
/* TODO: Add FIT support */
295-
EXCEPTION(0x1010, BOOKE_INTERRUPT_FIT, FixedIntervalTimer, \
296-
unknown_exception, EXC_XFER_STD)
294+
EXCEPTION(0x1010, BOOKE_INTERRUPT_FIT, FixedIntervalTimer, unknown_exception)
297295

298296
/* Watchdog Timer Interrupt */
299297
/* TODO: Add watchdog support */

‎arch/powerpc/kernel/head_8xx.S‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ instruction_counter:
118118
#endif
119119

120120
/* System reset */
121-
EXCEPTION(0x100, Reset, system_reset_exception, EXC_XFER_STD)
121+
EXCEPTION(0x100, Reset, system_reset_exception)
122122

123123
/* Machine check */
124124
START_EXCEPTION(0x200, MachineCheck)
@@ -128,7 +128,7 @@ instruction_counter:
128128
b interrupt_return
129129

130130
/* External interrupt */
131-
EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE)
131+
EXCEPTION(0x500, HardwareInterrupt, do_IRQ)
132132

133133
/* Alignment exception */
134134
START_EXCEPTION(0x600, Alignment)
@@ -147,14 +147,14 @@ instruction_counter:
147147
b interrupt_return
148148

149149
/* Decrementer */
150-
EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE)
150+
EXCEPTION(0x900, Decrementer, timer_interrupt)
151151

152152
/* System call */
153153
START_EXCEPTION(0xc00, SystemCall)
154154
SYSCALL_ENTRY 0xc00
155155

156156
/* Single step - not used on 601 */
157-
EXCEPTION(0xd00, SingleStep, single_step_exception, EXC_XFER_STD)
157+
EXCEPTION(0xd00, SingleStep, single_step_exception)
158158

159159
/* On the MPC8xx, this is a software emulation interrupt. It occurs
160160
* for all unimplemented and illegal instructions.
@@ -384,10 +384,10 @@ DARFixed:/* Return from dcbx instruction bug workaround */
384384
mfspr r10, SPRN_SPRG_SCRATCH0
385385
rfi
386386
#else
387-
EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_STD)
387+
EXCEPTION(0x1d00, Trap_1d, unknown_exception)
388388
#endif
389-
EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_STD)
390-
EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_STD)
389+
EXCEPTION(0x1e00, Trap_1e, unknown_exception)
390+
EXCEPTION(0x1f00, Trap_1f, unknown_exception)
391391

392392
__HEAD
393393
. = 0x2000

‎arch/powerpc/kernel/head_book3s_32.S‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ __secondary_hold_acknowledge:
239239
/* System reset */
240240
/* core99 pmac starts the seconary here by changing the vector, and
241241
putting it back to what it was (unknown_async_exception) when done. */
242-
EXCEPTION(0x100, Reset, unknown_async_exception, EXC_XFER_STD)
242+
EXCEPTION(0x100, Reset, unknown_async_exception)
243243

244244
/* Machine check */
245245
/*
@@ -339,7 +339,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
339339
b interrupt_return
340340

341341
/* External interrupt */
342-
EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE)
342+
EXCEPTION(0x500, HardwareInterrupt, do_IRQ)
343343

344344
/* Alignment exception */
345345
START_EXCEPTION(0x600, Alignment)
@@ -379,17 +379,17 @@ END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE)
379379
#endif
380380

381381
/* Decrementer */
382-
EXCEPTION(0x900, Decrementer, timer_interrupt, EXC_XFER_LITE)
382+
EXCEPTION(0x900, Decrementer, timer_interrupt)
383383

384-
EXCEPTION(0xa00, Trap_0a, unknown_exception, EXC_XFER_STD)
385-
EXCEPTION(0xb00, Trap_0b, unknown_exception, EXC_XFER_STD)
384+
EXCEPTION(0xa00, Trap_0a, unknown_exception)
385+
EXCEPTION(0xb00, Trap_0b, unknown_exception)
386386

387387
/* System call */
388388
START_EXCEPTION(0xc00, SystemCall)
389389
SYSCALL_ENTRY 0xc00
390390

391-
EXCEPTION(0xd00, SingleStep, single_step_exception, EXC_XFER_STD)
392-
EXCEPTION(0xe00, Trap_0e, unknown_exception, EXC_XFER_STD)
391+
EXCEPTION(0xd00, SingleStep, single_step_exception)
392+
EXCEPTION(0xe00, Trap_0e, unknown_exception)
393393

394394
/*
395395
* The Altivec unavailable trap is at 0x0f20. Foo.
@@ -618,35 +618,35 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)
618618
#define TAUException unknown_async_exception
619619
#endif
620620

621-
EXCEPTION(0x1300, Trap_13, instruction_breakpoint_exception, EXC_XFER_STD)
622-
EXCEPTION(0x1400, SMI, SMIException, EXC_XFER_STD)
623-
EXCEPTION(0x1500, Trap_15, unknown_exception, EXC_XFER_STD)
624-
EXCEPTION(0x1600, Trap_16, altivec_assist_exception, EXC_XFER_STD)
625-
EXCEPTION(0x1700, Trap_17, TAUException, EXC_XFER_STD)
626-
EXCEPTION(0x1800, Trap_18, unknown_exception, EXC_XFER_STD)
627-
EXCEPTION(0x1900, Trap_19, unknown_exception, EXC_XFER_STD)
628-
EXCEPTION(0x1a00, Trap_1a, unknown_exception, EXC_XFER_STD)
629-
EXCEPTION(0x1b00, Trap_1b, unknown_exception, EXC_XFER_STD)
630-
EXCEPTION(0x1c00, Trap_1c, unknown_exception, EXC_XFER_STD)
631-
EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_STD)
632-
EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_STD)
633-
EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_STD)
634-
EXCEPTION(0x2000, RunMode, RunModeException, EXC_XFER_STD)
635-
EXCEPTION(0x2100, Trap_21, unknown_exception, EXC_XFER_STD)
636-
EXCEPTION(0x2200, Trap_22, unknown_exception, EXC_XFER_STD)
637-
EXCEPTION(0x2300, Trap_23, unknown_exception, EXC_XFER_STD)
638-
EXCEPTION(0x2400, Trap_24, unknown_exception, EXC_XFER_STD)
639-
EXCEPTION(0x2500, Trap_25, unknown_exception, EXC_XFER_STD)
640-
EXCEPTION(0x2600, Trap_26, unknown_exception, EXC_XFER_STD)
641-
EXCEPTION(0x2700, Trap_27, unknown_exception, EXC_XFER_STD)
642-
EXCEPTION(0x2800, Trap_28, unknown_exception, EXC_XFER_STD)
643-
EXCEPTION(0x2900, Trap_29, unknown_exception, EXC_XFER_STD)
644-
EXCEPTION(0x2a00, Trap_2a, unknown_exception, EXC_XFER_STD)
645-
EXCEPTION(0x2b00, Trap_2b, unknown_exception, EXC_XFER_STD)
646-
EXCEPTION(0x2c00, Trap_2c, unknown_exception, EXC_XFER_STD)
647-
EXCEPTION(0x2d00, Trap_2d, unknown_exception, EXC_XFER_STD)
648-
EXCEPTION(0x2e00, Trap_2e, unknown_exception, EXC_XFER_STD)
649-
EXCEPTION(0x2f00, Trap_2f, unknown_exception, EXC_XFER_STD)
621+
EXCEPTION(0x1300, Trap_13, instruction_breakpoint_exception)
622+
EXCEPTION(0x1400, SMI, SMIException)
623+
EXCEPTION(0x1500, Trap_15, unknown_exception)
624+
EXCEPTION(0x1600, Trap_16, altivec_assist_exception)
625+
EXCEPTION(0x1700, Trap_17, TAUException)
626+
EXCEPTION(0x1800, Trap_18, unknown_exception)
627+
EXCEPTION(0x1900, Trap_19, unknown_exception)
628+
EXCEPTION(0x1a00, Trap_1a, unknown_exception)
629+
EXCEPTION(0x1b00, Trap_1b, unknown_exception)
630+
EXCEPTION(0x1c00, Trap_1c, unknown_exception)
631+
EXCEPTION(0x1d00, Trap_1d, unknown_exception)
632+
EXCEPTION(0x1e00, Trap_1e, unknown_exception)
633+
EXCEPTION(0x1f00, Trap_1f, unknown_exception)
634+
EXCEPTION(0x2000, RunMode, RunModeException)
635+
EXCEPTION(0x2100, Trap_21, unknown_exception)
636+
EXCEPTION(0x2200, Trap_22, unknown_exception)
637+
EXCEPTION(0x2300, Trap_23, unknown_exception)
638+
EXCEPTION(0x2400, Trap_24, unknown_exception)
639+
EXCEPTION(0x2500, Trap_25, unknown_exception)
640+
EXCEPTION(0x2600, Trap_26, unknown_exception)
641+
EXCEPTION(0x2700, Trap_27, unknown_exception)
642+
EXCEPTION(0x2800, Trap_28, unknown_exception)
643+
EXCEPTION(0x2900, Trap_29, unknown_exception)
644+
EXCEPTION(0x2a00, Trap_2a, unknown_exception)
645+
EXCEPTION(0x2b00, Trap_2b, unknown_exception)
646+
EXCEPTION(0x2c00, Trap_2c, unknown_exception)
647+
EXCEPTION(0x2d00, Trap_2d, unknown_exception)
648+
EXCEPTION(0x2e00, Trap_2e, unknown_exception)
649+
EXCEPTION(0x2f00, Trap_2f, unknown_exception)
650650

651651
__HEAD
652652
. = 0x3000

‎arch/powerpc/kernel/head_booke.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV)
299299
.align 5; \
300300
label:
301301

302-
#define EXCEPTION(n, intno, label, hdlr, xfer) \
302+
#define EXCEPTION(n, intno, label, hdlr) \
303303
START_EXCEPTION(label); \
304304
NORMAL_EXCEPTION_PROLOG(n, intno); \
305305
prepare_transfer_to_handler; \

‎arch/powerpc/kernel/head_fsl_booke.S‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ interrupt_base:
382382
INSTRUCTION_STORAGE_EXCEPTION
383383

384384
/* External Input Interrupt */
385-
EXCEPTION(0x0500, EXTERNAL, ExternalInput, do_IRQ, EXC_XFER_LITE)
385+
EXCEPTION(0x0500, EXTERNAL, ExternalInput, do_IRQ)
386386

387387
/* Alignment Interrupt */
388388
ALIGNMENT_EXCEPTION
@@ -394,25 +394,22 @@ interrupt_base:
394394
#ifdef CONFIG_PPC_FPU
395395
FP_UNAVAILABLE_EXCEPTION
396396
#else
397-
EXCEPTION(0x0800, FP_UNAVAIL, FloatingPointUnavailable, \
398-
unknown_exception, EXC_XFER_STD)
397+
EXCEPTION(0x0800, FP_UNAVAIL, FloatingPointUnavailable, unknown_exception)
399398
#endif
400399

401400
/* System Call Interrupt */
402401
START_EXCEPTION(SystemCall)
403402
SYSCALL_ENTRY 0xc00 BOOKE_INTERRUPT_SYSCALL SPRN_SRR1
404403

405404
/* Auxiliary Processor Unavailable Interrupt */
406-
EXCEPTION(0x2900, AP_UNAVAIL, AuxillaryProcessorUnavailable, \
407-
unknown_exception, EXC_XFER_STD)
405+
EXCEPTION(0x2900, AP_UNAVAIL, AuxillaryProcessorUnavailable, unknown_exception)
408406

409407
/* Decrementer Interrupt */
410408
DECREMENTER_EXCEPTION
411409

412410
/* Fixed Internal Timer Interrupt */
413411
/* TODO: Add FIT support */
414-
EXCEPTION(0x3100, FIT, FixedIntervalTimer, \
415-
unknown_exception, EXC_XFER_STD)
412+
EXCEPTION(0x3100, FIT, FixedIntervalTimer, unknown_exception)
416413

417414
/* Watchdog Timer Interrupt */
418415
#ifdef CONFIG_BOOKE_WDT
@@ -625,8 +622,7 @@ END_BTB_FLUSH_SECTION
625622
bl KernelSPE
626623
b interrupt_return
627624
#elif defined(CONFIG_SPE_POSSIBLE)
628-
EXCEPTION(0x2020, SPE_UNAVAIL, SPEUnavailable, \
629-
unknown_exception, EXC_XFER_STD)
625+
EXCEPTION(0x2020, SPE_UNAVAIL, SPEUnavailable, unknown_exception)
630626
#endif /* CONFIG_SPE_POSSIBLE */
631627

632628
/* SPE Floating Point Data */
@@ -646,18 +642,16 @@ END_BTB_FLUSH_SECTION
646642
REST_NVGPRS(r1)
647643
b interrupt_return
648644
#elif defined(CONFIG_SPE_POSSIBLE)
649-
EXCEPTION(0x2040, SPE_FP_DATA, SPEFloatingPointData,
650-
unknown_exception, EXC_XFER_STD)
651-
EXCEPTION(0x2050, SPE_FP_ROUND, SPEFloatingPointRound, \
652-
unknown_exception, EXC_XFER_STD)
645+
EXCEPTION(0x2040, SPE_FP_DATA, SPEFloatingPointData, unknown_exception)
646+
EXCEPTION(0x2050, SPE_FP_ROUND, SPEFloatingPointRound, unknown_exception)
653647
#endif /* CONFIG_SPE_POSSIBLE */
654648

655649

656650
/* Performance Monitor */
657651
EXCEPTION(0x2060, PERFORMANCE_MONITOR, PerformanceMonitor, \
658-
performance_monitor_exception, EXC_XFER_STD)
652+
performance_monitor_exception)
659653

660-
EXCEPTION(0x2070, DOORBELL, Doorbell, doorbell_exception, EXC_XFER_STD)
654+
EXCEPTION(0x2070, DOORBELL, Doorbell, doorbell_exception)
661655

662656
CRITICAL_EXCEPTION(0x2080, DOORBELL_CRITICAL, \
663657
CriticalDoorbell, unknown_exception)
@@ -672,10 +666,10 @@ END_BTB_FLUSH_SECTION
672666
unknown_exception)
673667

674668
/* Hypercall */
675-
EXCEPTION(0, HV_SYSCALL, Hypercall, unknown_exception, EXC_XFER_STD)
669+
EXCEPTION(0, HV_SYSCALL, Hypercall, unknown_exception)
676670

677671
/* Embedded Hypervisor Privilege */
678-
EXCEPTION(0, HV_PRIV, Ehvpriv, unknown_exception, EXC_XFER_STD)
672+
EXCEPTION(0, HV_PRIV, Ehvpriv, unknown_exception)
679673

680674
interrupt_end:
681675

0 commit comments

Comments
 (0)