mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/crypto/chelsio/chcr_algo.h
..
..
@@ -86,39 +86,6 @@
86
86
 	 KEY_CONTEXT_OPAD_PRESENT_M)
87
87
 #define KEY_CONTEXT_OPAD_PRESENT_F      KEY_CONTEXT_OPAD_PRESENT_V(1U)
88
88
 
89
-#define TLS_KEYCTX_RXFLIT_CNT_S 24
90
-#define TLS_KEYCTX_RXFLIT_CNT_V(x) ((x) << TLS_KEYCTX_RXFLIT_CNT_S)
91
-
92
-#define TLS_KEYCTX_RXPROT_VER_S 20
93
-#define TLS_KEYCTX_RXPROT_VER_M 0xf
94
-#define TLS_KEYCTX_RXPROT_VER_V(x) ((x) << TLS_KEYCTX_RXPROT_VER_S)
95
-
96
-#define TLS_KEYCTX_RXCIPH_MODE_S 16
97
-#define TLS_KEYCTX_RXCIPH_MODE_M 0xf
98
-#define TLS_KEYCTX_RXCIPH_MODE_V(x) ((x) << TLS_KEYCTX_RXCIPH_MODE_S)
99
-
100
-#define TLS_KEYCTX_RXAUTH_MODE_S 12
101
-#define TLS_KEYCTX_RXAUTH_MODE_M 0xf
102
-#define TLS_KEYCTX_RXAUTH_MODE_V(x) ((x) << TLS_KEYCTX_RXAUTH_MODE_S)
103
-
104
-#define TLS_KEYCTX_RXCIAU_CTRL_S 11
105
-#define TLS_KEYCTX_RXCIAU_CTRL_V(x) ((x) << TLS_KEYCTX_RXCIAU_CTRL_S)
106
-
107
-#define TLS_KEYCTX_RX_SEQCTR_S 9
108
-#define TLS_KEYCTX_RX_SEQCTR_M 0x3
109
-#define TLS_KEYCTX_RX_SEQCTR_V(x) ((x) << TLS_KEYCTX_RX_SEQCTR_S)
110
-
111
-#define TLS_KEYCTX_RX_VALID_S 8
112
-#define TLS_KEYCTX_RX_VALID_V(x) ((x) << TLS_KEYCTX_RX_VALID_S)
113
-
114
-#define TLS_KEYCTX_RXCK_SIZE_S 3
115
-#define TLS_KEYCTX_RXCK_SIZE_M 0x7
116
-#define TLS_KEYCTX_RXCK_SIZE_V(x) ((x) << TLS_KEYCTX_RXCK_SIZE_S)
117
-
118
-#define TLS_KEYCTX_RXMK_SIZE_S 0
119
-#define TLS_KEYCTX_RXMK_SIZE_M 0x7
120
-#define TLS_KEYCTX_RXMK_SIZE_V(x) ((x) << TLS_KEYCTX_RXMK_SIZE_S)
121
-
122
89
 #define CHCR_HASH_MAX_DIGEST_SIZE 64
123
90
 #define CHCR_MAX_SHA_DIGEST_SIZE 64
124
91
 
..
..
@@ -262,7 +229,7 @@
262
229
 #define MIN_AUTH_SG			1 /* IV */
263
230
 #define MIN_GCM_SG			1 /* IV */
264
231
 #define MIN_DIGEST_SG			1 /*Partial Buffer*/
265
-#define MIN_CCM_SG			2 /*IV+B0*/
232
+#define MIN_CCM_SG			1 /*IV+B0*/
266
233
 #define CIP_SPACE_LEFT(len) \
267
234
 	((SGE_MAX_WR_LEN - CIP_WR_MIN_LEN - (len)))
268
235
 #define HASH_SPACE_LEFT(len) \
..
..
@@ -287,7 +254,7 @@
287
254
 };
288
255
 
289
256
 struct cipher_wr_param {
290
-	struct ablkcipher_request *req;
257
+	struct skcipher_request *req;
291
258
 	char *iv;
292
259
 	int bytes;
293
260
 	unsigned short qid;
..
..
@@ -333,26 +300,26 @@
333
300
 };
334
301
 
335
302
 
336
-static const u32 sha1_init[SHA1_DIGEST_SIZE / 4] = {
303
+static const u32 chcr_sha1_init[SHA1_DIGEST_SIZE / 4] = {
337
304
 		SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4,
338
305
 };
339
306
 
340
-static const u32 sha224_init[SHA256_DIGEST_SIZE / 4] = {
307
+static const u32 chcr_sha224_init[SHA256_DIGEST_SIZE / 4] = {
341
308
 		SHA224_H0, SHA224_H1, SHA224_H2, SHA224_H3,
342
309
 		SHA224_H4, SHA224_H5, SHA224_H6, SHA224_H7,
343
310
 };
344
311
 
345
-static const u32 sha256_init[SHA256_DIGEST_SIZE / 4] = {
312
+static const u32 chcr_sha256_init[SHA256_DIGEST_SIZE / 4] = {
346
313
 		SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3,
347
314
 		SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7,
348
315
 };
349
316
 
350
-static const u64 sha384_init[SHA512_DIGEST_SIZE / 8] = {
317
+static const u64 chcr_sha384_init[SHA512_DIGEST_SIZE / 8] = {
351
318
 		SHA384_H0, SHA384_H1, SHA384_H2, SHA384_H3,
352
319
 		SHA384_H4, SHA384_H5, SHA384_H6, SHA384_H7,
353
320
 };
354
321
 
355
-static const u64 sha512_init[SHA512_DIGEST_SIZE / 8] = {
322
+static const u64 chcr_sha512_init[SHA512_DIGEST_SIZE / 8] = {
356
323
 		SHA512_H0, SHA512_H1, SHA512_H2, SHA512_H3,
357
324
 		SHA512_H4, SHA512_H5, SHA512_H6, SHA512_H7,
358
325
 };
..
..
@@ -362,21 +329,21 @@
362
329
 	u8 i;
363
330
 	__be32 *dkey = (__be32 *)key;
364
331
 	u64 *ldkey = (u64 *)key;
365
-	__be64 *sha384 = (__be64 *)sha384_init;
366
-	__be64 *sha512 = (__be64 *)sha512_init;
332
+	__be64 *sha384 = (__be64 *)chcr_sha384_init;
333
+	__be64 *sha512 = (__be64 *)chcr_sha512_init;
367
334
 
368
335
 	switch (digestsize) {
369
336
 	case SHA1_DIGEST_SIZE:
370
337
 		for (i = 0; i < SHA1_INIT_STATE; i++)
371
-			dkey[i] = cpu_to_be32(sha1_init[i]);
338
+			dkey[i] = cpu_to_be32(chcr_sha1_init[i]);
372
339
 		break;
373
340
 	case SHA224_DIGEST_SIZE:
374
341
 		for (i = 0; i < SHA224_INIT_STATE; i++)
375
-			dkey[i] = cpu_to_be32(sha224_init[i]);
342
+			dkey[i] = cpu_to_be32(chcr_sha224_init[i]);
376
343
 		break;
377
344
 	case SHA256_DIGEST_SIZE:
378
345
 		for (i = 0; i < SHA256_INIT_STATE; i++)
379
-			dkey[i] = cpu_to_be32(sha256_init[i]);
346
+			dkey[i] = cpu_to_be32(chcr_sha256_init[i]);
380
347
 		break;
381
348
 	case SHA384_DIGEST_SIZE:
382
349
 		for (i = 0; i < SHA384_INIT_STATE; i++)
..
..
@@ -388,10 +355,6 @@
388
355
 		break;
389
356
 	}
390
357
 }
391
-
392
-static const u8 sgl_lengths[20] = {
393
-	0, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11, 12, 13, 13, 14, 15
394
-};
395
358
 
396
359
 /* Number of len fields(8) * size of one addr field */
397
360
 #define PHYSDSGL_MAX_LEN_SIZE 16