Commit deefd0ae authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/traps: Start using PPC_RAW_xx() macros 



Start using PPC_RAW_xx() macros where relevant.

PPC_INST_SYNC is used to both represent the 'sync' instruction and
the family of synchronisation instructions. Keep it for the later,
maybe we'll change the name in the future to avoid confusion.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/0945c155d6cb113431185fc1296ac127359fe29b.1621506159.git.christophe.leroy@csgroup.eu
parent ef909ba9

arch/powerpc/include/asm/ppc-opcode.h

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ 
#define PPC_INST_LWSYNC			0x7c2004ac

#define PPC_INST_SYNC			0x7c0004ac

#define PPC_INST_SYNC_MASK		0xfc0007fe

#define PPC_INST_ISYNC			0x4c00012c

#define PPC_INST_MCRXR			0x7c000400

#define PPC_INST_MCRXR_MASK		0xfc0007fe

#define PPC_INST_MFSPR_PVR		0x7c1f42a6

arch/powerpc/kernel/traps.c

+4 −3
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <asm/kprobes.h>

#include <asm/stacktrace.h>

#include <asm/nmi.h>

#include <asm/disassemble.h>



#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)

int (*__debugger)(struct pt_regs *regs) __read_mostly;
@@ -537,11 +538,11 @@ static inline int check_io_access(struct pt_regs *regs) 
		 * For the debug message, we look at the preceding

		 * load or store.

		 */

		if (*nip == PPC_INST_NOP)

		if (*nip == PPC_RAW_NOP())

			nip -= 2;

		else if (*nip == PPC_INST_ISYNC)

		else if (*nip == PPC_RAW_ISYNC())

			--nip;

		if (*nip == PPC_INST_SYNC || (*nip >> 26) == OP_TRAP) {

		if (*nip == PPC_RAW_SYNC() || get_op(*nip) == OP_TRAP) {

			unsigned int rb;



			--nip;