16e39624b7
This patch backports several patches that went upstream into Herbert Xu's cryptodev-2.6 tree: crypto: Use zeroing memory allocator instead of allocator/memset crypto: crypto4xx - performance optimizations crypto: crypto4xx - convert to skcipher crypto: crypto4xx - avoid VLA use crypto: crypto4xx - add aes-ctr support crypto: crypto4xx - properly set IV after de- and encrypt crypto: crypto4xx - extend aead fallback checks crypto: crypto4xx - put temporary dst sg into request ctx The older, outstanding patches from 120-wxyz series have been upstreamed as well and therefore they have been reassigned to fit into the series. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From c3621f23fed7d6fff33083ae538004ea59c01d8f Mon Sep 17 00:00:00 2001
|
|
From: Christian Lamparter <chunkeey@gmail.com>
|
|
Date: Thu, 21 Dec 2017 15:11:18 +0100
|
|
Subject: [PATCH 4/6] crypto: crypto4xx - kill MODULE_NAME
|
|
|
|
KBUILD_MODNAME provides the same value.
|
|
|
|
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|
---
|
|
drivers/crypto/amcc/crypto4xx_core.c | 2 +-
|
|
drivers/crypto/amcc/crypto4xx_core.h | 2 --
|
|
drivers/crypto/amcc/crypto4xx_trng.c | 2 +-
|
|
3 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/crypto/amcc/crypto4xx_core.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_core.c
|
|
@@ -1432,7 +1432,7 @@ MODULE_DEVICE_TABLE(of, crypto4xx_match)
|
|
|
|
static struct platform_driver crypto4xx_driver = {
|
|
.driver = {
|
|
- .name = MODULE_NAME,
|
|
+ .name = KBUILD_MODNAME,
|
|
.of_match_table = crypto4xx_match,
|
|
},
|
|
.probe = crypto4xx_probe,
|
|
--- a/drivers/crypto/amcc/crypto4xx_core.h
|
|
+++ b/drivers/crypto/amcc/crypto4xx_core.h
|
|
@@ -28,8 +28,6 @@
|
|
#include "crypto4xx_reg_def.h"
|
|
#include "crypto4xx_sa.h"
|
|
|
|
-#define MODULE_NAME "crypto4xx"
|
|
-
|
|
#define PPC460SX_SDR0_SRST 0x201
|
|
#define PPC405EX_SDR0_SRST 0x200
|
|
#define PPC460EX_SDR0_SRST 0x201
|
|
--- a/drivers/crypto/amcc/crypto4xx_trng.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_trng.c
|
|
@@ -92,7 +92,7 @@ void ppc4xx_trng_probe(struct crypto4xx_
|
|
if (!rng)
|
|
goto err_out;
|
|
|
|
- rng->name = MODULE_NAME;
|
|
+ rng->name = KBUILD_MODNAME;
|
|
rng->data_present = ppc4xx_trng_data_present;
|
|
rng->data_read = ppc4xx_trng_data_read;
|
|
rng->priv = (unsigned long) dev;
|