Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 327357
b: refs/heads/master
c: 7cff82f
h: refs/heads/master
i:
  327355: 5b445e0
v: v3
  • Loading branch information
David S. Miller committed Aug 31, 2012
1 parent 15bc2b6 commit 07b3143
Show file tree
Hide file tree
Showing 10 changed files with 118 additions and 126 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4e71bb49f256e4efc94a9fdaaa430d906cd88e6b
refs/heads/master: 7cff82f5f42a938a1b633e121a41d29c81de18bb
56 changes: 1 addition & 55 deletions trunk/arch/sparc/crypto/aes_asm.S
View file
Original file line number Diff line number Diff line change
@@ -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) \
Expand Down
22 changes: 1 addition & 21 deletions trunk/arch/sparc/crypto/camellia_asm.S
View file
Original file line number Diff line number Diff line change
@@ -1,27 +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) << 0)

#define CAMELLIA_F(a,b,c,d) \
.word (F3F(2, 0x19, 0x00c)|RS1(a)|RS2(b)|RS3(c)|RD(d));
#define CAMELLIA_FL(a,b,c) \
.word (F3F(2, 0x36, 0x13c)|RS1(a)|RS2(b)|RD(c));
#define CAMELLIA_FLI(a,b,c) \
.word (F3F(2, 0x36, 0x13d)|RS1(a)|RS2(b)|RD(c));

#define MOVDTOX_F0_O4 \
.word 0x99b02200
#define MOVDTOX_F2_O5 \
.word 0x9bb02202
#include "opcodes.h"

#define CAMELLIA_6ROUNDS(KEY_BASE, I0, I1) \
CAMELLIA_F(KEY_BASE + 0, I1, I0, I1) \
Expand Down
11 changes: 1 addition & 10 deletions trunk/arch/sparc/crypto/crc32c_asm.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,7 @@
#include <asm/visasm.h>
#include <asm/asi.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 RD(x) (FPD_ENCODE(x) << 25)

#define CRC32C(a,b,c) \
.word (F3F(2,0x36,0x147)|RS1(a)|RS2(b)|RD(c));
#include "opcodes.h"

ENTRY(crc32c_sparc64)
/* %o0=crc32p, %o1=data_ptr, %o2=len */
Expand Down
24 changes: 1 addition & 23 deletions trunk/arch/sparc/crypto/des_asm.S
View file
Original file line number Diff line number Diff line change
@@ -1,29 +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) << 0)

#define DES_IP(a,b) \
.word (F3F(2, 0x36, 0x134)|RS1(a)|RD(b));
#define DES_IIP(a,b) \
.word (F3F(2, 0x36, 0x135)|RS1(a)|RD(b));
#define DES_KEXPAND(a,b,c) \
.word (F3F(2, 0x36, 0x136)|RS1(a)|IMM5(b)|RD(c));
#define DES_ROUND(a,b,c,d) \
.word (F3F(2, 0x19, 0x009)|RS1(a)|RS2(b)|RS3(c)|RD(d));

#define MOVXTOD_G1_F60 \
.word 0xbbb02301
#define MOVXTOD_G1_F62 \
.word 0xbfb02301
#include "opcodes.h"

.align 32
ENTRY(des_sparc64_key_expand)
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/sparc/crypto/md5_asm.S
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include <linux/linkage.h>
#include <asm/visasm.h>

#include "opcodes.h"

ENTRY(md5_sparc64_transform)
/* %o0 = digest, %o1 = data, %o2 = rounds */
VISEntryHalf
Expand All @@ -21,8 +23,7 @@ ENTRY(md5_sparc64_transform)
ldd [%o1 + 0x30], %f20
ldd [%o1 + 0x38], %f22

/* md5 */
.word 0x81b02800
MD5

subcc %o2, 1, %o2
bne,pt %xcc, 1b
Expand Down Expand Up @@ -58,8 +59,7 @@ ENTRY(md5_sparc64_transform)
faligndata %f22, %f24, %f20
faligndata %f24, %f26, %f22

/* md5 */
.word 0x81b02800
MD5

subcc %o2, 1, %o2
fsrc2 %f26, %f10
Expand Down
97 changes: 97 additions & 0 deletions trunk/arch/sparc/crypto/opcodes.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
#ifndef _OPCODES_H
#define _OPCODES_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_0(x) ((x) << 0)
#define IMM5_9(x) ((x) << 9)

#define CRC32C(a,b,c) \
.word (F3F(2,0x36,0x147)|RS1(a)|RS2(b)|RD(c));

#define MD5 \
.word 0x81b02800;
#define SHA1 \
.word 0x81b02820;
#define SHA256 \
.word 0x81b02840;
#define SHA512 \
.word 0x81b02860;

#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_9(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 DES_IP(a,b) \
.word (F3F(2, 0x36, 0x134)|RS1(a)|RD(b));
#define DES_IIP(a,b) \
.word (F3F(2, 0x36, 0x135)|RS1(a)|RD(b));
#define DES_KEXPAND(a,b,c) \
.word (F3F(2, 0x36, 0x136)|RS1(a)|IMM5_0(b)|RD(c));
#define DES_ROUND(a,b,c,d) \
.word (F3F(2, 0x19, 0x009)|RS1(a)|RS2(b)|RS3(c)|RD(d));

#define CAMELLIA_F(a,b,c,d) \
.word (F3F(2, 0x19, 0x00c)|RS1(a)|RS2(b)|RS3(c)|RD(d));
#define CAMELLIA_FL(a,b,c) \
.word (F3F(2, 0x36, 0x13c)|RS1(a)|RS2(b)|RD(c));
#define CAMELLIA_FLI(a,b,c) \
.word (F3F(2, 0x36, 0x13d)|RS1(a)|RS2(b)|RD(c));

#define MOVDTOX_F0_O4 \
.word 0x99b02200
#define MOVDTOX_F2_O5 \
.word 0x9bb02202
#define MOVXTOD_G1_F60 \
.word 0xbbb02301
#define MOVXTOD_G1_F62 \
.word 0xbfb02301
#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;

#endif /* _OPCODES_H */
8 changes: 4 additions & 4 deletions trunk/arch/sparc/crypto/sha1_asm.S
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include <linux/linkage.h>
#include <asm/visasm.h>

#include "opcodes.h"

ENTRY(sha1_sparc64_transform)
/* %o0 = digest, %o1 = data, %o2 = rounds */
VISEntryHalf
Expand All @@ -22,8 +24,7 @@ ENTRY(sha1_sparc64_transform)
ldd [%o1 + 0x30], %f20
ldd [%o1 + 0x38], %f22

/* sha1 */
.word 0x81b02820
SHA1

subcc %o2, 1, %o2
bne,pt %xcc, 1b
Expand Down Expand Up @@ -60,8 +61,7 @@ ENTRY(sha1_sparc64_transform)
faligndata %f22, %f24, %f20
faligndata %f24, %f26, %f22

/* sha1 */
.word 0x81b02820
SHA1

subcc %o2, 1, %o2
fsrc2 %f26, %f10
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/sparc/crypto/sha256_asm.S
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include <linux/linkage.h>
#include <asm/visasm.h>

#include "opcodes.h"

ENTRY(sha256_sparc64_transform)
/* %o0 = digest, %o1 = data, %o2 = rounds */
VISEntryHalf
Expand All @@ -25,8 +27,7 @@ ENTRY(sha256_sparc64_transform)
ldd [%o1 + 0x30], %f20
ldd [%o1 + 0x38], %f22

/* sha256 */
.word 0x81b02840
SHA256

subcc %o2, 1, %o2
bne,pt %xcc, 1b
Expand Down Expand Up @@ -66,8 +67,7 @@ ENTRY(sha256_sparc64_transform)
faligndata %f22, %f24, %f20
faligndata %f24, %f26, %f22

/* sha256 */
.word 0x81b02840
SHA256

subcc %o2, 1, %o2
fsrc2 %f26, %f10
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/sparc/crypto/sha512_asm.S
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include <linux/linkage.h>
#include <asm/visasm.h>

#include "opcodes.h"

ENTRY(sha512_sparc64_transform)
/* %o0 = digest, %o1 = data, %o2 = rounds */
VISEntry
Expand Down Expand Up @@ -33,8 +35,7 @@ ENTRY(sha512_sparc64_transform)
ldd [%o1 + 0x70], %f44
ldd [%o1 + 0x78], %f46

/* sha512 */
.word 0x81b02860
SHA512

subcc %o2, 1, %o2
bne,pt %xcc, 1b
Expand Down Expand Up @@ -90,8 +91,7 @@ ENTRY(sha512_sparc64_transform)
faligndata %f46, %f48, %f44
faligndata %f48, %f50, %f46

/* sha512 */
.word 0x81b02860
SHA512

subcc %o2, 1, %o2
fsrc2 %f50, %f18
Expand Down

0 comments on commit 07b3143

Please sign in to comment.