sparc64: Avoid code duplication in crypto assembler.

Put the opcode macros in a common header

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 55 deletions

diff --git a/arch/sparc/crypto/aes_asm.S b/arch/sparc/crypto/aes_asm.S
index 0fadad0c60ad..20860885f068 100644
--- a/arch/sparc/crypto/aes_asm.S
+++ b/arch/sparc/crypto/aes_asm.S
@@ -1,61 +1,7 @@
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 
-#define F3F(x,y,z)      (((x)<<30)|((y)<<19)|((z)<<5))
-
-#define FPD_ENCODE(x)   (((x) >> 5) | ((x) & ~(0x20)))
-
-#define RS1(x)          (FPD_ENCODE(x) << 14)
-#define RS2(x)          (FPD_ENCODE(x) <<  0)
-#define RS3(x)          (FPD_ENCODE(x) <<  9)
-#define RD(x)           (FPD_ENCODE(x) << 25)
-#define IMM5(x)         ((x)           <<  9)
-
-#define AES_EROUND01(a,b,c,d)   \
-        .word   (F3F(2, 0x19, 0)|RS1(a)|RS2(b)|RS3(c)|RD(d));
-#define AES_EROUND23(a,b,c,d)   \
-        .word   (F3F(2, 0x19, 1)|RS1(a)|RS2(b)|RS3(c)|RD(d));
-#define AES_DROUND01(a,b,c,d)   \
-        .word   (F3F(2, 0x19, 2)|RS1(a)|RS2(b)|RS3(c)|RD(d));
-#define AES_DROUND23(a,b,c,d)   \
-        .word   (F3F(2, 0x19, 3)|RS1(a)|RS2(b)|RS3(c)|RD(d));
-#define AES_EROUND01_L(a,b,c,d) \
-        .word   (F3F(2, 0x19, 4)|RS1(a)|RS2(b)|RS3(c)|RD(d));
-#define AES_EROUND23_L(a,b,c,d) \
-        .word   (F3F(2, 0x19, 5)|RS1(a)|RS2(b)|RS3(c)|RD(d));
-#define AES_DROUND01_L(a,b,c,d) \
-        .word   (F3F(2, 0x19, 6)|RS1(a)|RS2(b)|RS3(c)|RD(d));
-#define AES_DROUND23_L(a,b,c,d) \
-        .word   (F3F(2, 0x19, 7)|RS1(a)|RS2(b)|RS3(c)|RD(d));
-#define AES_KEXPAND1(a,b,c,d)   \
-        .word   (F3F(2, 0x19, 8)|RS1(a)|RS2(b)|IMM5(c)|RD(d));
-#define AES_KEXPAND0(a,b,c)     \
-        .word   (F3F(2, 0x36, 0x130)|RS1(a)|RS2(b)|RD(c));
-#define AES_KEXPAND2(a,b,c)     \
-        .word   (F3F(2, 0x36, 0x131)|RS1(a)|RS2(b)|RD(c));
-
-#define MOVXTOD_G3_F4           \
-        .word   0x89b02303;
-#define MOVXTOD_G7_F6           \
-        .word   0x8db02307;
-#define MOVXTOD_G3_F0           \
-        .word   0x81b02303;
-#define MOVXTOD_G7_F2           \
-        .word   0x85b02307;
-#define MOVXTOD_O0_F0           \
-        .word   0x81b02308;
-#define MOVXTOD_O5_F0           \
-        .word   0x81b0230d;
-#define MOVXTOD_O5_F2           \
-        .word   0x85b0230d;
-#define MOVXTOD_O5_F4           \
-        .word   0x89b0230d;
-#define MOVXTOD_O5_F6           \
-        .word   0x8db0230d;
-#define MOVXTOD_G3_F60          \
-        .word   0xbbb02303;
-#define MOVXTOD_G7_F62          \
-        .word   0xbfb02307;
+#include "opcodes.h"
 
 #define ENCRYPT_TWO_ROUNDS(KEY_BASE, I0, I1, T0, T1) \
         AES_EROUND01(KEY_BASE +  0, I0, I1, T0) \