Commit 7153d4bf authored by Xiongwei Song's avatar Xiongwei Song Committed by Michael Ellerman
Browse files

powerpc/traps: Enhance readability for trap types 



Define macros to list ppc interrupt types in interttupt.h, replace the
reference of the trap hex values with these macros.

Referred the hex numbers in arch/powerpc/kernel/exceptions-64e.S,
arch/powerpc/kernel/exceptions-64s.S, arch/powerpc/kernel/head_*.S,
arch/powerpc/kernel/head_booke.h and arch/powerpc/include/asm/kvm_asm.h.

Signed-off-by: default avatarXiongwei Song <sxwjean@gmail.com>
[mpe: Resolve conflicts in nmi_disables_ftrace(), fix 40x build]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/1618398033-13025-1-git-send-email-sxwjean@me.com
parent 7de21e67

arch/powerpc/include/asm/interrupt.h

+48 −4
Original line number Diff line number Diff line
@@ -9,6 +9,50 @@ 
#include <asm/kprobes.h>

#include <asm/runlatch.h>



/* BookE/4xx */

#define INTERRUPT_CRITICAL_INPUT  0x100



/* BookE */

#define INTERRUPT_DEBUG           0xd00

#ifdef CONFIG_BOOKE

#define INTERRUPT_PERFMON         0x260

#define INTERRUPT_DOORBELL        0x280

#endif



/* BookS/4xx/8xx */

#define INTERRUPT_MACHINE_CHECK   0x200



/* BookS/8xx */

#define INTERRUPT_SYSTEM_RESET    0x100



/* BookS */

#define INTERRUPT_DATA_SEGMENT    0x380

#define INTERRUPT_INST_SEGMENT    0x480

#define INTERRUPT_TRACE           0xd00

#define INTERRUPT_H_DATA_STORAGE  0xe00

#define INTERRUPT_H_FAC_UNAVAIL   0xf80

#ifdef CONFIG_PPC_BOOK3S

#define INTERRUPT_DOORBELL        0xa00

#define INTERRUPT_PERFMON         0xf00

#endif



/* BookE/BookS/4xx/8xx */

#define INTERRUPT_DATA_STORAGE    0x300

#define INTERRUPT_INST_STORAGE    0x400

#define INTERRUPT_ALIGNMENT       0x600

#define INTERRUPT_PROGRAM         0x700

#define INTERRUPT_SYSCALL         0xc00



/* BookE/BookS/44x */

#define INTERRUPT_FP_UNAVAIL      0x800



/* BookE/BookS/44x/8xx */

#define INTERRUPT_DECREMENTER     0x900



#ifndef INTERRUPT_PERFMON

#define INTERRUPT_PERFMON         0x0

#endif



static inline void nap_adjust_return(struct pt_regs *regs)

{

#ifdef CONFIG_PPC_970_NAP
@@ -65,7 +109,7 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup 
		 * CT_WARN_ON comes here via program_check_exception,

		 * so avoid recursion.

		 */

		if (TRAP(regs) != 0x700)

		if (TRAP(regs) != INTERRUPT_PROGRAM)

			CT_WARN_ON(ct_state() != CONTEXT_KERNEL);

	}

#endif
@@ -131,13 +175,13 @@ static inline bool nmi_disables_ftrace(struct pt_regs *regs) 
{

	/* Allow DEC and PMI to be traced when they are soft-NMI */

	if (IS_ENABLED(CONFIG_PPC_BOOK3S_64)) {

		if (TRAP(regs) == 0x900)

		if (TRAP(regs) == INTERRUPT_DECREMENTER)

		       return false;

		if (TRAP(regs) == 0xf00)

		if (TRAP(regs) == INTERRUPT_PERFMON)

		       return false;

	}

	if (IS_ENABLED(CONFIG_PPC_BOOK3E)) {

		if (TRAP(regs) == 0x260)

		if (TRAP(regs) == INTERRUPT_PERFMON)

			return false;

	}

arch/powerpc/kernel/fadump.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ void crash_fadump(struct pt_regs *regs, const char *str) 
	 * If we came in via system reset, wait a while for the secondary

	 * CPUs to enter.

	 */

	if (TRAP(&(fdh->regs)) == 0x100) {

	if (TRAP(&(fdh->regs)) == INTERRUPT_SYSTEM_RESET) {

		msecs = CRASH_TIMEOUT;

		while ((atomic_read(&cpus_in_fadump) < ncpus) && (--msecs > 0))

			mdelay(1);

arch/powerpc/kernel/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsign 
	 * CT_WARN_ON comes here via program_check_exception,

	 * so avoid recursion.

	 */

	if (TRAP(regs) != 0x700)

	if (TRAP(regs) != INTERRUPT_PROGRAM)

		CT_WARN_ON(ct_state() == CONTEXT_USER);



	kuap = kuap_get_and_assert_locked();

arch/powerpc/kernel/process.c

+3 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,9 @@ static void __show_regs(struct pt_regs *regs) 
	trap = TRAP(regs);

	if (!trap_is_syscall(regs) && cpu_has_feature(CPU_FTR_CFAR))

		pr_cont("CFAR: "REG" ", regs->orig_gpr3);

	if (trap == 0x200 || trap == 0x300 || trap == 0x600) {

	if (trap == INTERRUPT_MACHINE_CHECK ||

	    trap == INTERRUPT_DATA_STORAGE ||

	    trap == INTERRUPT_ALIGNMENT) {

		if (IS_ENABLED(CONFIG_4xx) || IS_ENABLED(CONFIG_BOOKE))

			pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);

		else

arch/powerpc/kernel/traps.c

+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, 
	/*

	 * system_reset_excption handles debugger, crash dump, panic, for 0x100

	 */

	if (TRAP(regs) == 0x100)

	if (TRAP(regs) == INTERRUPT_SYSTEM_RESET)

		return;



	crash_fadump(regs, "die oops");
@@ -289,7 +289,7 @@ void die(const char *str, struct pt_regs *regs, long err) 
	/*

	 * system_reset_excption handles debugger, crash dump, panic, for 0x100

	 */

	if (TRAP(regs) != 0x100) {

	if (TRAP(regs) != INTERRUPT_SYSTEM_RESET) {

		if (debugger(regs))

			return;

	}
@@ -1691,7 +1691,7 @@ DEFINE_INTERRUPT_HANDLER(facility_unavailable_exception) 
	u8 status;

	bool hv;



	hv = (TRAP(regs) == 0xf80);

	hv = (TRAP(regs) == INTERRUPT_H_FAC_UNAVAIL);

	if (hv)

		value = mfspr(SPRN_HFSCR);

	else