Commit ddc6cd0d authored by Christophe Leroy's avatar Christophe Leroy Committed by Scott Wood
Browse files

powerpc32: Use instruction symbolic names in check_io_access() 



Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent 5066943a

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

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

#define PPC_INST_SYNC			0x7c0004ac

#define PPC_INST_SYNC_MASK		0xfc0007fe

#define PPC_INST_ISYNC			0x4c00012c

#define PPC_INST_LXVD2X			0x7c000698

#define PPC_INST_MCRXR			0x7c000400

#define PPC_INST_MCRXR_MASK		0xfc0007fe

arch/powerpc/kernel/traps.c

+3 −4
Original line number Diff line number Diff line
@@ -352,12 +352,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 == 0x60000000)		/* nop */

		if (*nip == PPC_INST_NOP)

			nip -= 2;

		else if (*nip == 0x4c00012c)	/* isync */

		else if (*nip == PPC_INST_ISYNC)

			--nip;

		if (*nip == 0x7c0004ac || (*nip >> 26) == 3) {

			/* sync or twi */

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

			unsigned int rb;



			--nip;

CRA Git | Maintained and supported by SUSTech CRA and CCSE