forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376 
 kernel/arch/x86/crypto/camellia-aesni-avx-asm_64.S
....@@ -189,20 +189,20 @@
189189  * larger and would only be 0.5% faster (on sandy-bridge).
190190  */
191191 .align 8
192
-roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
192
+SYM_FUNC_START_LOCAL(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
193193 	roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
194194 		  %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
195195 		  %rcx, (%r9));
196
-	ret;
197
-ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
196
+	RET;
197
+SYM_FUNC_END(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
198198 
199199 .align 8
200
-roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
200
+SYM_FUNC_START_LOCAL(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
201201 	roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
202202 		  %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
203203 		  %rax, (%r9));
204
-	ret;
205
-ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
204
+	RET;
205
+SYM_FUNC_END(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
206206 
207207 /*
208208  * IN/OUT:
....@@ -722,7 +722,7 @@
722722 .text
723723 
724724 .align 8
725
-__camellia_enc_blk16:
725
+SYM_FUNC_START_LOCAL(__camellia_enc_blk16)
726726 	/* input:
727727 	 *	%rdi: ctx, CTX
728728 	 *	%rax: temporary storage, 256 bytes
....@@ -787,7 +787,7 @@
787787 		    %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
788788 
789789 	FRAME_END
790
-	ret;
790
+	RET;
791791 
792792 .align 8
793793 .Lenc_max32:
....@@ -806,10 +806,10 @@
806806 		     %xmm15, %rax, %rcx, 24);
807807 
808808 	jmp .Lenc_done;
809
-ENDPROC(__camellia_enc_blk16)
809
+SYM_FUNC_END(__camellia_enc_blk16)
810810 
811811 .align 8
812
-__camellia_dec_blk16:
812
+SYM_FUNC_START_LOCAL(__camellia_dec_blk16)
813813 	/* input:
814814 	 *	%rdi: ctx, CTX
815815 	 *	%rax: temporary storage, 256 bytes
....@@ -874,7 +874,7 @@
874874 		    %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
875875 
876876 	FRAME_END
877
-	ret;
877
+	RET;
878878 
879879 .align 8
880880 .Ldec_max32:
....@@ -891,9 +891,9 @@
891891 	      ((key_table + (24) * 8) + 4)(CTX));
892892 
893893 	jmp .Ldec_max24;
894
-ENDPROC(__camellia_dec_blk16)
894
+SYM_FUNC_END(__camellia_dec_blk16)
895895 
896
-ENTRY(camellia_ecb_enc_16way)
896
+SYM_FUNC_START(camellia_ecb_enc_16way)
897897 	/* input:
898898 	 *	%rdi: ctx, CTX
899899 	 *	%rsi: dst (16 blocks)
....@@ -915,10 +915,10 @@
915915 		     %xmm8, %rsi);
916916 
917917 	FRAME_END
918
-	ret;
919
-ENDPROC(camellia_ecb_enc_16way)
918
+	RET;
919
+SYM_FUNC_END(camellia_ecb_enc_16way)
920920 
921
-ENTRY(camellia_ecb_dec_16way)
921
+SYM_FUNC_START(camellia_ecb_dec_16way)
922922 	/* input:
923923 	 *	%rdi: ctx, CTX
924924 	 *	%rsi: dst (16 blocks)
....@@ -945,10 +945,10 @@
945945 		     %xmm8, %rsi);
946946 
947947 	FRAME_END
948
-	ret;
949
-ENDPROC(camellia_ecb_dec_16way)
948
+	RET;
949
+SYM_FUNC_END(camellia_ecb_dec_16way)
950950 
951
-ENTRY(camellia_cbc_dec_16way)
951
+SYM_FUNC_START(camellia_cbc_dec_16way)
952952 	/* input:
953953 	 *	%rdi: ctx, CTX
954954 	 *	%rsi: dst (16 blocks)
....@@ -996,8 +996,8 @@
996996 		     %xmm8, %rsi);
997997 
998998 	FRAME_END
999
-	ret;
1000
-ENDPROC(camellia_cbc_dec_16way)
999
+	RET;
1000
+SYM_FUNC_END(camellia_cbc_dec_16way)
10011001 
10021002 #define inc_le128(x, minus_one, tmp) \
10031003 	vpcmpeqq minus_one, x, tmp; \
....@@ -1005,7 +1005,7 @@
10051005 	vpslldq $8, tmp, tmp; \
10061006 	vpsubq tmp, x, x;
10071007 
1008
-ENTRY(camellia_ctr_16way)
1008
+SYM_FUNC_START(camellia_ctr_16way)
10091009 	/* input:
10101010 	 *	%rdi: ctx, CTX
10111011 	 *	%rsi: dst (16 blocks)
....@@ -1109,8 +1109,8 @@
11091109 		     %xmm8, %rsi);
11101110 
11111111 	FRAME_END
1112
-	ret;
1113
-ENDPROC(camellia_ctr_16way)
1112
+	RET;
1113
+SYM_FUNC_END(camellia_ctr_16way)
11141114 
11151115 #define gf128mul_x_ble(iv, mask, tmp) \
11161116 	vpsrad $31, iv, tmp; \
....@@ -1120,7 +1120,7 @@
11201120 	vpxor tmp, iv, iv;
11211121 
11221122 .align 8
1123
-camellia_xts_crypt_16way:
1123
+SYM_FUNC_START_LOCAL(camellia_xts_crypt_16way)
11241124 	/* input:
11251125 	 *	%rdi: ctx, CTX
11261126 	 *	%rsi: dst (16 blocks)
....@@ -1228,7 +1228,7 @@
12281228 	vpxor 14 * 16(%rax), %xmm15, %xmm14;
12291229 	vpxor 15 * 16(%rax), %xmm15, %xmm15;
12301230 
1231
-	CALL_NOSPEC %r9;
1231
+	CALL_NOSPEC r9;
12321232 
12331233 	addq $(16 * 16), %rsp;
12341234 
....@@ -1253,10 +1253,10 @@
12531253 		     %xmm8, %rsi);
12541254 
12551255 	FRAME_END
1256
-	ret;
1257
-ENDPROC(camellia_xts_crypt_16way)
1256
+	RET;
1257
+SYM_FUNC_END(camellia_xts_crypt_16way)
12581258 
1259
-ENTRY(camellia_xts_enc_16way)
1259
+SYM_FUNC_START(camellia_xts_enc_16way)
12601260 	/* input:
12611261 	 *	%rdi: ctx, CTX
12621262 	 *	%rsi: dst (16 blocks)
....@@ -1268,9 +1268,9 @@
12681268 	leaq __camellia_enc_blk16, %r9;
12691269 
12701270 	jmp camellia_xts_crypt_16way;
1271
-ENDPROC(camellia_xts_enc_16way)
1271
+SYM_FUNC_END(camellia_xts_enc_16way)
12721272 
1273
-ENTRY(camellia_xts_dec_16way)
1273
+SYM_FUNC_START(camellia_xts_dec_16way)
12741274 	/* input:
12751275 	 *	%rdi: ctx, CTX
12761276 	 *	%rsi: dst (16 blocks)
....@@ -1286,4 +1286,4 @@
12861286 	leaq __camellia_dec_blk16, %r9;
12871287 
12881288 	jmp camellia_xts_crypt_16way;
1289
-ENDPROC(camellia_xts_dec_16way)
1289
+SYM_FUNC_END(camellia_xts_dec_16way)