powerpc: Unify opcode definitions and support

Create a new header that becomes a single location for defining PowerPC
opcodes used by code that is either generationg instructions
at runtime (fixups, debug, etc.), emulating instructions, or just
compiling instructions old assemblers don't know about.

We currently don't handle the floating point emulation or alignment decode
as both are better handled by the specific decode support they already
have.

Added support for the new dcbzl, dcbal, msgsnd, tlbilx, & wait instructions
since older assemblers don't know about them.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

3 files changed, 75 insertions, 8 deletions

diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h
index 107d9b915e33..37c32aba79b7 100644
--- a/arch/powerpc/include/asm/code-patching.h
+++ b/arch/powerpc/include/asm/code-patching.h
@@ -11,9 +11,7 @@
  */
 
 #include <asm/types.h>
-
-#define PPC_NOP_INSTR           0x60000000
-#define PPC_LWSYNC_INSTR        0x7c2004ac
+#include <asm/ppc-opcode.h>
 
 /* Flags for create_branch:
  * "b"   == create_branch(addr, target, 0);
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
new file mode 100644
index 000000000000..f4a4db8d5555
--- /dev/null
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2009 Freescale Semicondutor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * provides masks and opcode images for use by code generation, emulation
+ * and for instructions that older assemblers might not know about
+ */
+#ifndef _ASM_POWERPC_PPC_OPCODE_H
+#define _ASM_POWERPC_PPC_OPCODE_H
+
+#include <linux/stringify.h>
+#include <asm/asm-compat.h>
+
+/* sorted alphabetically */
+#define PPC_INST_DCBA                   0x7c0005ec
+#define PPC_INST_DCBA_MASK              0xfc0007fe
+#define PPC_INST_DCBAL                  0x7c2005ec
+#define PPC_INST_DCBZL                  0x7c2007ec
+#define PPC_INST_ISEL                   0x7c00001e
+#define PPC_INST_ISEL_MASK              0xfc00003e
+#define PPC_INST_LSWI                   0x7c0004aa
+#define PPC_INST_LSWX                   0x7c00042a
+#define PPC_INST_LWSYNC                 0x7c2004ac
+#define PPC_INST_MCRXR                  0x7c000400
+#define PPC_INST_MCRXR_MASK             0xfc0007fe
+#define PPC_INST_MFSPR_PVR              0x7c1f42a6
+#define PPC_INST_MFSPR_PVR_MASK         0xfc1fffff
+#define PPC_INST_MSGSND                 0x7c00019c
+#define PPC_INST_NOP                    0x60000000
+#define PPC_INST_POPCNTB                0x7c0000f4
+#define PPC_INST_POPCNTB_MASK           0xfc0007fe
+#define PPC_INST_RFCI                   0x4c000066
+#define PPC_INST_RFDI                   0x4c00004e
+#define PPC_INST_RFMCI                  0x4c00004c
+
+#define PPC_INST_STRING                 0x7c00042a
+#define PPC_INST_STRING_MASK            0xfc0007fe
+#define PPC_INST_STRING_GEN_MASK        0xfc00067e
+
+#define PPC_INST_STSWI                  0x7c0005aa
+#define PPC_INST_STSWX                  0x7c00052a
+#define PPC_INST_TLBILX                 0x7c000626
+#define PPC_INST_WAIT                   0x7c00007c
+
+/* macros to insert fields into opcodes */
+#define __PPC_RA(a)     ((a & 0x1f) << 16)
+#define __PPC_RB(b)     ((b & 0x1f) << 11)
+#define __PPC_T_TLB(t)  ((t & 0x3) << 21)
+#define __PPC_WC(w)     ((w & 0x3) << 21)
+
+/* Deal with instructions that older assemblers aren't aware of */
+#define PPC_DCBAL(a, b)         stringify_in_c(.long PPC_INST_DCBAL | \
+                                        __PPC_RA(a) | __PPC_RB(b))
+#define PPC_DCBZL(a, b)         stringify_in_c(.long PPC_INST_DCBZL | \
+                                        __PPC_RA(a) | __PPC_RB(b))
+#define PPC_MSGSND(b)           stringify_in_c(.long PPC_INST_MSGSND | \
+                                        __PPC_RB(b))
+#define PPC_RFCI                stringify_in_c(.long PPC_INST_RFCI)
+#define PPC_RFDI                stringify_in_c(.long PPC_INST_RFDI)
+#define PPC_RFMCI               stringify_in_c(.long PPC_INST_RFMCI)
+#define PPC_TLBILX(t, a, b)     stringify_in_c(.long PPC_INST_TLBILX | \
+                                        __PPC_T_TLB(t) | __PPC_RA(a) | __PPC_RB(b))
+#define PPC_TLBILX_ALL(a, b)    PPC_TLBILX(0, a, b)
+#define PPC_TLBILX_PID(a, b)    PPC_TLBILX(1, a, b)
+#define PPC_TLBILX_VA(a, b)     PPC_TLBILX(3, a, b)
+#define PPC_WAIT(w)             stringify_in_c(.long PPC_INST_WAIT | \
+                                        __PPC_WC(w))
+
+#endif /* _ASM_POWERPC_PPC_OPCODE_H */
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 1a0d628eb114..f59a66684aed 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -7,6 +7,7 @@
 #include <linux/stringify.h>
 #include <asm/asm-compat.h>
 #include <asm/processor.h>
+#include <asm/ppc-opcode.h>
 
 #ifndef __ASSEMBLY__
 #error __FILE__ should only be used in assembler files
@@ -167,11 +168,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_PURR);					\
 #define HMT_MEDIUM_HIGH or      5,5,5           # medium high priority
 #define HMT_HIGH        or      3,3,3
 
-/* handle instructions that older assemblers may not know */
-#define RFCI            .long 0x4c000066        /* rfci instruction */
-#define RFDI            .long 0x4c00004e        /* rfdi instruction */
-#define RFMCI           .long 0x4c00004c        /* rfmci instruction */
-
 #ifdef __KERNEL__
 #ifdef CONFIG_PPC64