crypto: atmel - Fixes and cleanup patches
Subsystems (2)
cover crypto: atmel - Fixes and cleanup patches
From: Tudor Ambarus <[email protected]>
Fix AES CTR and other cleanup patches.
Tudor Ambarus (16):
crypto: atmel-tdes: Constify value to write to hw
crypto: atmel-{sha,tdes} - Change algorithm priorities
crypto: atmel-tdes - Remove unused header includes
crypto: atmel-{sha,tdes} - Propagate error from _hw_version_init()
crypto: atmel-{aes,sha,tdes} - Drop superfluous error message in
probe()
crypto: atmel-{aes,sha,tdes} - Rename labels in probe()
crypto: atmel-tdes - Remove useless write in Control Register
crypto: atmel-tdes - Map driver data flags to Mode Register
crypto: atmel-tdes - Drop unnecessary passing of tfm
crypto: atmel-{aes,tdes} - Do not save IV for ECB mode
crypto: atmel-aes - Fix counter overflow in CTR mode
crypto: atmel-aes - Fix saving of IV for CTR mode
crypto: atmel-{sha,tdes} - Remove unused 'err' member of driver data
crypto: atmel-sha - Void return type for atmel_sha_update_dma_stop()
crypto: atmel-aes - Use gcm helper to check authsize
crypto: atmel-{aes,sha,tdes} - Group common alg type init in dedicated
methods
drivers/crypto/atmel-aes.c | 227 ++++++++++++++----------------------- drivers/crypto/atmel-sha.c | 102 +++++++---------- drivers/crypto/atmel-tdes.c | 270 ++++++++++++++++++++------------------------ 3 files changed, 247 insertions(+), 352 deletions(-)
Signature · 1 line
2.14.5
PATCH 1/16 crypto: atmel-tdes: Constify value to write to hw
From: Tudor Ambarus <[email protected]>
atmel_tdes_write_n() should not modify its value argument.
--- drivers/crypto/atmel-tdes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/atmel-tdes.c +1 -1
@@ -189,7 +189,7 @@ static inline void atmel_tdes_write(struct atmel_tdes_dev *dd, }static void atmel_tdes_write_n (struct atmel_tdes_dev *dd,u32 offset, -u32 *value,int count) +const u32 *value,int count) {for (; count--; value++, offset +=4 )atmel_tdes_write (dd, offset, *value);
Signature · 1 line
2.14.5
PATCH 2/16 crypto: atmel-{sha,tdes} - Change algorithm priorities
In reply to [email protected]From: Tudor Ambarus <[email protected]>
Increase the algorithm priorities so the hardware acceleration is now preferred to the software computation: the generic drivers use 100 as priority.
--- drivers/crypto/atmel-sha.c | 22 ++++++++++++---------- drivers/crypto/atmel-tdes.c | 22 ++++++++++++---------- 2 files changed, 24 insertions(+), 20 deletions(-)
drivers/crypto/atmel-sha.c +12 -10
@@ -40,6 +40,8 @@#include "atmel-sha-regs.h" #include "atmel-authenc.h" +#define ATMEL_SHA_PRIORITY 300 +/* SHA flags */ #define SHA_FLAGS_BUSY BIT(0)#define SHA_FLAGS_FINAL BIT(1)
@@ -1263,7 +1265,7 @@ static struct ahash_alg sha_1_256_algs[] = { .base = { .cra_name = "sha1", .cra_driver_name = "atmel-sha1", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA1_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_ctx),
@@ -1287,7 +1289,7 @@ static struct ahash_alg sha_1_256_algs[] = { .base = { .cra_name = "sha256", .cra_driver_name = "atmel-sha256", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA256_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_ctx),
@@ -1313,7 +1315,7 @@ static struct ahash_alg sha_224_alg = { .base = { .cra_name = "sha224", .cra_driver_name = "atmel-sha224", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA224_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_ctx),
@@ -1339,7 +1341,7 @@ static struct ahash_alg sha_384_512_algs[] = { .base = { .cra_name = "sha384", .cra_driver_name = "atmel-sha384", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA384_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_ctx),
@@ -1363,7 +1365,7 @@ static struct ahash_alg sha_384_512_algs[] = { .base = { .cra_name = "sha512", .cra_driver_name = "atmel-sha512", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA512_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_ctx),
@@ -2099,7 +2101,7 @@ static struct ahash_alg sha_hmac_algs[] = { .base = { .cra_name = "hmac(sha1)", .cra_driver_name = "atmel-hmac-sha1", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA1_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_hmac_ctx),
@@ -2124,7 +2126,7 @@ static struct ahash_alg sha_hmac_algs[] = { .base = { .cra_name = "hmac(sha224)", .cra_driver_name = "atmel-hmac-sha224", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA224_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_hmac_ctx),
@@ -2149,7 +2151,7 @@ static struct ahash_alg sha_hmac_algs[] = { .base = { .cra_name = "hmac(sha256)", .cra_driver_name = "atmel-hmac-sha256", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA256_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_hmac_ctx),
@@ -2174,7 +2176,7 @@ static struct ahash_alg sha_hmac_algs[] = { .base = { .cra_name = "hmac(sha384)", .cra_driver_name = "atmel-hmac-sha384", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA384_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_hmac_ctx),
@@ -2199,7 +2201,7 @@ static struct ahash_alg sha_hmac_algs[] = { .base = { .cra_name = "hmac(sha512)", .cra_driver_name = "atmel-hmac-sha512", - .cra_priority = 100, + .cra_priority = ATMEL_SHA_PRIORITY, .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = SHA512_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_sha_hmac_ctx),
drivers/crypto/atmel-tdes.c +12 -10
@@ -40,6 +40,8 @@#include <linux/platform_data/crypto-atmel.h> #include "atmel-tdes-regs.h" +#define ATMEL_TDES_PRIORITY 300 +/* TDES flags */ #define TDES_FLAGS_MODE_MASK 0x00ff#define TDES_FLAGS_ENCRYPT BIT(0)
@@ -929,7 +931,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "ecb(des)", .base.cra_driver_name = "atmel-ecb-des", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -946,7 +948,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cbc(des)", .base.cra_driver_name = "atmel-cbc-des", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -964,7 +966,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cfb(des)", .base.cra_driver_name = "atmel-cfb-des", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -982,7 +984,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cfb8(des)", .base.cra_driver_name = "atmel-cfb8-des", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB8_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -1000,7 +1002,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cfb16(des)", .base.cra_driver_name = "atmel-cfb16-des", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB16_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -1018,7 +1020,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cfb32(des)", .base.cra_driver_name = "atmel-cfb32-des", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB32_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -1036,7 +1038,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "ofb(des)", .base.cra_driver_name = "atmel-ofb-des", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -1054,7 +1056,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "ecb(des3_ede)", .base.cra_driver_name = "atmel-ecb-tdes", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -1071,7 +1073,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cbc(des3_ede)", .base.cra_driver_name = "atmel-cbc-tdes", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
@@ -1089,7 +1091,7 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "ofb(des3_ede)", .base.cra_driver_name = "atmel-ofb-tdes", - .base.cra_priority = 100, + .base.cra_priority = ATMEL_TDES_PRIORITY, .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx),
Signature · 1 line
2.14.5
PATCH 3/16 crypto: atmel-tdes - Remove unused header includes
In reply to [email protected]From: Tudor Ambarus <[email protected]>
Hash headers are not used.
--- drivers/crypto/atmel-tdes.c | 3 --- 1 file changed, 3 deletions(-)
drivers/crypto/atmel-tdes.c +0 -3
@@ -30,12 +30,9 @@#include <linux/of_device.h> #include <linux/delay.h> #include <linux/crypto.h> -#include <linux/cryptohash.h> #include <crypto/scatterwalk.h> #include <crypto/algapi.h> #include <crypto/internal/des.h> -#include <crypto/hash.h> -#include <crypto/internal/hash.h> #include <crypto/internal/skcipher.h> #include <linux/platform_data/crypto-atmel.h> #include "atmel-tdes-regs.h"
Signature · 1 line
2.14.5
PATCH 4/16 crypto: atmel-{sha,tdes} - Propagate error from _hw_version_init()
In reply to [email protected]From: Tudor Ambarus <[email protected]>
atmel_{sha,tdes}_hw_version_init() calls atmel_{sha,tdes}_hw_init(), which may fail. Check the return code of atmel_{sha,tdes}_hw_init() and propagate the error if needed.
--- drivers/crypto/atmel-sha.c | 14 +++++++++++--- drivers/crypto/atmel-tdes.c | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-)
drivers/crypto/atmel-sha.c +11 -3
@@ -1038,9 +1038,13 @@ static inline unsigned int atmel_sha_get_version(struct atmel_sha_dev *dd)return atmel_sha_read (dd,SHA_HW_VERSION ) &0x00000fff ; } -static void atmel_sha_hw_version_init (struct atmel_sha_dev *dd) +static int atmel_sha_hw_version_init (struct atmel_sha_dev *dd) { -atmel_sha_hw_init (dd); +int err; + + err =atmel_sha_hw_init (dd); +if (err) +return err; dd->hw_version =atmel_sha_get_version (dd);
@@ -1048,6 +1052,8 @@ static void atmel_sha_hw_version_init(struct atmel_sha_dev *dd) "version: 0x%x\n", dd->hw_version);clk_disable (dd->iclk); + +return 0 ; } static int atmel_sha_handle_queue(struct atmel_sha_dev *dd,
@@ -2811,7 +2817,9 @@ static int atmel_sha_probe(struct platform_device *pdev)if (err) goto res_err; -atmel_sha_hw_version_init (sha_dd); + err =atmel_sha_hw_version_init (sha_dd); +if (err) + goto iclk_unprepare;atmel_sha_get_cap (sha_dd);
drivers/crypto/atmel-tdes.c +11 -3
@@ -236,9 +236,13 @@ static inline unsigned int atmel_tdes_get_version(struct atmel_tdes_dev *dd)return atmel_tdes_read (dd,TDES_HW_VERSION ) &0x00000fff ; } -static void atmel_tdes_hw_version_init (struct atmel_tdes_dev *dd) +static int atmel_tdes_hw_version_init (struct atmel_tdes_dev *dd) { -atmel_tdes_hw_init (dd); +int err; + + err =atmel_tdes_hw_init (dd); +if (err) +return err; dd->hw_version =atmel_tdes_get_version (dd);
@@ -246,6 +250,8 @@ static void atmel_tdes_hw_version_init(struct atmel_tdes_dev *dd) "version: 0x%x\n", dd->hw_version);clk_disable_unprepare (dd->iclk); + +return 0 ; }static void atmel_tdes_dma_callback (void *data)
@@ -1309,7 +1315,9 @@ static int atmel_tdes_probe(struct platform_device *pdev) goto res_err; } -atmel_tdes_hw_version_init (tdes_dd); + err =atmel_tdes_hw_version_init (tdes_dd); +if (err) + goto res_err;atmel_tdes_get_cap (tdes_dd);
Signature · 1 line
2.14.5
PATCH 5/16 crypto: atmel-{aes,sha,tdes} - Drop superfluous error message in probe()
In reply to [email protected]From: Tudor Ambarus <[email protected]>
In case the probe fails, the device/driver core takes care of printing the driver name, device name and error code. Drop superfluous error message at probe.
--- drivers/crypto/atmel-aes.c | 21 ++++++--------------- drivers/crypto/atmel-sha.c | 8 ++------ drivers/crypto/atmel-tdes.c | 8 ++------ 3 files changed, 10 insertions(+), 27 deletions(-)
drivers/crypto/atmel-aes.c +6 -15
@@ -2620,22 +2620,16 @@ static int atmel_aes_probe(struct platform_device *pdev) pdata = pdev->dev.platform_data;if (!pdata) { pdata =atmel_aes_of_init (pdev); -if (IS_ERR (pdata)) { - err =PTR_ERR (pdata); - goto aes_dd_err; - } +if (IS_ERR (pdata)) +return PTR_ERR (pdata); } -if (!pdata->dma_slave) { - err = -ENXIO ; - goto aes_dd_err; - } +if (!pdata->dma_slave) +return -ENXIO ; aes_dd =devm_kzalloc (&pdev->dev,sizeof (*aes_dd),GFP_KERNEL ); -if (aes_dd ==NULL ) { - err = -ENOMEM ; - goto aes_dd_err; - } +if (!aes_dd) +return -ENOMEM ; aes_dd->dev = dev;
@@ -2741,9 +2735,6 @@ static int atmel_aes_probe(struct platform_device *pdev) res_err:tasklet_kill (&aes_dd->done_task);tasklet_kill (&aes_dd->queue_task); -aes_dd_err: -if (err != -EPROBE_DEFER ) -dev_err (dev,"initialization failed.\n" );return err; }
drivers/crypto/atmel-sha.c +2 -6
@@ -2756,10 +2756,8 @@ static int atmel_sha_probe(struct platform_device *pdev)int err; sha_dd =devm_kzalloc (&pdev->dev,sizeof (*sha_dd),GFP_KERNEL ); -if (sha_dd ==NULL ) { - err = -ENOMEM ; - goto sha_dd_err; - } +if (!sha_dd) +return -ENOMEM ; sha_dd->dev = dev;
@@ -2871,8 +2869,6 @@ static int atmel_sha_probe(struct platform_device *pdev) res_err:tasklet_kill (&sha_dd->queue_task);tasklet_kill (&sha_dd->done_task); -sha_dd_err: -dev_err (dev,"initialization failed.\n" );return err; }
drivers/crypto/atmel-tdes.c +2 -6
@@ -1258,10 +1258,8 @@ static int atmel_tdes_probe(struct platform_device *pdev)int err; tdes_dd =devm_kmalloc (&pdev->dev,sizeof (*tdes_dd),GFP_KERNEL ); -if (tdes_dd ==NULL ) { - err = -ENOMEM ; - goto tdes_dd_err; - } +if (!tdes_dd) +return -ENOMEM ; tdes_dd->dev = dev;
@@ -1373,8 +1371,6 @@ static int atmel_tdes_probe(struct platform_device *pdev) res_err:tasklet_kill (&tdes_dd->done_task);tasklet_kill (&tdes_dd->queue_task); -tdes_dd_err: -dev_err (dev,"initialization failed.\n" );return err; }
Signature · 1 line
2.14.5
PATCH 6/16 crypto: atmel-{aes,sha,tdes} - Rename labels in probe()
In reply to [email protected]From: Tudor Ambarus <[email protected]>
Choose label names which say what the goto does and not from where the goto was issued. This avoids adding superfluous labels like "err_aes_buff".
--- drivers/crypto/atmel-aes.c | 27 +++++++++++++-------------- drivers/crypto/atmel-sha.c | 25 ++++++++++++------------- drivers/crypto/atmel-tdes.c | 26 ++++++++++++-------------- 3 files changed, 37 insertions(+), 41 deletions(-)
drivers/crypto/atmel-aes.c +13 -14
@@ -2650,7 +2650,7 @@ static int atmel_aes_probe(struct platform_device *pdev)if (!aes_res) {dev_err (dev,"no MEM resource info\n" ); err = -ENODEV ; - goto res_err; + goto err_tasklet_kill; } aes_dd->phys_base = aes_res->start;
@@ -2658,14 +2658,14 @@ static int atmel_aes_probe(struct platform_device *pdev) aes_dd->irq =platform_get_irq (pdev,0 );if (aes_dd->irq <0 ) { err = aes_dd->irq; - goto res_err; + goto err_tasklet_kill; } err =devm_request_irq (&pdev->dev, aes_dd->irq, atmel_aes_irq,IRQF_SHARED ,"atmel-aes" , aes_dd);if (err) {dev_err (dev,"unable to request aes irq.\n" ); - goto res_err; + goto err_tasklet_kill; }/* Initializing the clock */
@@ -2673,40 +2673,40 @@ static int atmel_aes_probe(struct platform_device *pdev)if (IS_ERR (aes_dd->iclk)) {dev_err (dev,"clock initialization failed.\n" ); err =PTR_ERR (aes_dd->iclk); - goto res_err; + goto err_tasklet_kill; } aes_dd->io_base =devm_ioremap_resource (&pdev->dev, aes_res);if (IS_ERR (aes_dd->io_base)) {dev_err (dev,"can't ioremap\n" ); err =PTR_ERR (aes_dd->io_base); - goto res_err; + goto err_tasklet_kill; } err =clk_prepare (aes_dd->iclk);if (err) - goto res_err; + goto err_tasklet_kill; err =atmel_aes_hw_version_init (aes_dd);if (err) - goto iclk_unprepare; + goto err_iclk_unprepare;atmel_aes_get_cap (aes_dd);#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )if (aes_dd->caps.has_authenc && !atmel_sha_authenc_is_ready ()) { err = -EPROBE_DEFER ; - goto iclk_unprepare; + goto err_iclk_unprepare; }#endif err =atmel_aes_buff_init (aes_dd);if (err) - goto err_aes_buff; + goto err_iclk_unprepare; err =atmel_aes_dma_init (aes_dd, pdata);if (err) - goto err_aes_dma; + goto err_buff_cleanup;spin_lock (&atmel_aes.lock);list_add_tail (&aes_dd->list, &atmel_aes.dev_list);
@@ -2727,12 +2727,11 @@ static int atmel_aes_probe(struct platform_device *pdev)list_del (&aes_dd->list);spin_unlock (&atmel_aes.lock);atmel_aes_dma_cleanup (aes_dd); -err_aes_dma: +err_buff_cleanup:atmel_aes_buff_cleanup (aes_dd); -err_aes_buff: -iclk_unprepare: +err_iclk_unprepare:clk_unprepare (aes_dd->iclk); -res_err: +err_tasklet_kill:tasklet_kill (&aes_dd->done_task);tasklet_kill (&aes_dd->queue_task);
drivers/crypto/atmel-sha.c +12 -13
@@ -2778,7 +2778,7 @@ static int atmel_sha_probe(struct platform_device *pdev)if (!sha_res) {dev_err (dev,"no MEM resource info\n" ); err = -ENODEV ; - goto res_err; + goto err_tasklet_kill; } sha_dd->phys_base = sha_res->start;
@@ -2786,14 +2786,14 @@ static int atmel_sha_probe(struct platform_device *pdev) sha_dd->irq =platform_get_irq (pdev,0 );if (sha_dd->irq <0 ) { err = sha_dd->irq; - goto res_err; + goto err_tasklet_kill; } err =devm_request_irq (&pdev->dev, sha_dd->irq, atmel_sha_irq,IRQF_SHARED ,"atmel-sha" , sha_dd);if (err) {dev_err (dev,"unable to request sha irq.\n" ); - goto res_err; + goto err_tasklet_kill; }/* Initializing the clock */
@@ -2801,23 +2801,23 @@ static int atmel_sha_probe(struct platform_device *pdev)if (IS_ERR (sha_dd->iclk)) {dev_err (dev,"clock initialization failed.\n" ); err =PTR_ERR (sha_dd->iclk); - goto res_err; + goto err_tasklet_kill; } sha_dd->io_base =devm_ioremap_resource (&pdev->dev, sha_res);if (IS_ERR (sha_dd->io_base)) {dev_err (dev,"can't ioremap\n" ); err =PTR_ERR (sha_dd->io_base); - goto res_err; + goto err_tasklet_kill; } err =clk_prepare (sha_dd->iclk);if (err) - goto res_err; + goto err_tasklet_kill; err =atmel_sha_hw_version_init (sha_dd);if (err) - goto iclk_unprepare; + goto err_iclk_unprepare;atmel_sha_get_cap (sha_dd);
@@ -2828,16 +2828,16 @@ static int atmel_sha_probe(struct platform_device *pdev)if (IS_ERR (pdata)) {dev_err (&pdev->dev,"platform data not available\n" ); err =PTR_ERR (pdata); - goto iclk_unprepare; + goto err_iclk_unprepare; } }if (!pdata->dma_slave) { err = -ENXIO ; - goto iclk_unprepare; + goto err_iclk_unprepare; } err =atmel_sha_dma_init (sha_dd, pdata);if (err) - goto err_sha_dma; + goto err_iclk_unprepare;dev_info (dev,"using %s for DMA transfers\n" ,dma_chan_name (sha_dd->dma_lch_in.chan));
@@ -2863,10 +2863,9 @@ static int atmel_sha_probe(struct platform_device *pdev)spin_unlock (&atmel_sha.lock);if (sha_dd->caps.has_dma)atmel_sha_dma_cleanup (sha_dd); -err_sha_dma: -iclk_unprepare: +err_iclk_unprepare:clk_unprepare (sha_dd->iclk); -res_err: +err_tasklet_kill:tasklet_kill (&sha_dd->queue_task);tasklet_kill (&sha_dd->done_task);
drivers/crypto/atmel-tdes.c +12 -14
@@ -1280,7 +1280,7 @@ static int atmel_tdes_probe(struct platform_device *pdev)if (!tdes_res) {dev_err (dev,"no MEM resource info\n" ); err = -ENODEV ; - goto res_err; + goto err_tasklet_kill; } tdes_dd->phys_base = tdes_res->start;
@@ -1288,14 +1288,14 @@ static int atmel_tdes_probe(struct platform_device *pdev) tdes_dd->irq =platform_get_irq (pdev,0 );if (tdes_dd->irq <0 ) { err = tdes_dd->irq; - goto res_err; + goto err_tasklet_kill; } err =devm_request_irq (&pdev->dev, tdes_dd->irq, atmel_tdes_irq,IRQF_SHARED ,"atmel-tdes" , tdes_dd);if (err) {dev_err (dev,"unable to request tdes irq.\n" ); - goto res_err; + goto err_tasklet_kill; }/* Initializing the clock */
@@ -1303,25 +1303,25 @@ static int atmel_tdes_probe(struct platform_device *pdev)if (IS_ERR (tdes_dd->iclk)) {dev_err (dev,"clock initialization failed.\n" ); err =PTR_ERR (tdes_dd->iclk); - goto res_err; + goto err_tasklet_kill; } tdes_dd->io_base =devm_ioremap_resource (&pdev->dev, tdes_res);if (IS_ERR (tdes_dd->io_base)) {dev_err (dev,"can't ioremap\n" ); err =PTR_ERR (tdes_dd->io_base); - goto res_err; + goto err_tasklet_kill; } err =atmel_tdes_hw_version_init (tdes_dd);if (err) - goto res_err; + goto err_tasklet_kill;atmel_tdes_get_cap (tdes_dd); err =atmel_tdes_buff_init (tdes_dd);if (err) - goto err_tdes_buff; + goto err_tasklet_kill;if (tdes_dd->caps.has_dma) { pdata = pdev->dev.platform_data;
@@ -1330,16 +1330,16 @@ static int atmel_tdes_probe(struct platform_device *pdev)if (IS_ERR (pdata)) {dev_err (&pdev->dev,"platform data not available\n" ); err =PTR_ERR (pdata); - goto err_pdata; + goto err_buff_cleanup; } }if (!pdata->dma_slave) { err = -ENXIO ; - goto err_pdata; + goto err_buff_cleanup; } err =atmel_tdes_dma_init (tdes_dd, pdata);if (err) - goto err_tdes_dma; + goto err_buff_cleanup; dev_info(dev, "using %s, %s for DMA transfers\n", dma_chan_name(tdes_dd->dma_lch_in.chan),
@@ -1364,11 +1364,9 @@ static int atmel_tdes_probe(struct platform_device *pdev)spin_unlock (&atmel_tdes.lock);if (tdes_dd->caps.has_dma)atmel_tdes_dma_cleanup (tdes_dd); -err_tdes_dma: -err_pdata: +err_buff_cleanup:atmel_tdes_buff_cleanup (tdes_dd); -err_tdes_buff: -res_err: +err_tasklet_kill:tasklet_kill (&tdes_dd->done_task);tasklet_kill (&tdes_dd->queue_task);
Signature · 1 line
2.14.5
PATCH 7/16 crypto: atmel-tdes - Remove useless write in Control Register
In reply to [email protected]From: Tudor Ambarus <[email protected]>
As claimed by the datasheet, writing 0 into the Control Register has no effect. Remove this useless register access.
--- drivers/crypto/atmel-tdes.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/crypto/atmel-tdes.c +1 -2
@@ -265,7 +265,7 @@ static void atmel_tdes_dma_callback(void *data)static int atmel_tdes_write_ctrl (struct atmel_tdes_dev *dd) {int err; -u32 valcr =0 , valmr =TDES_MR_SMOD_PDC ; +u32 valmr =TDES_MR_SMOD_PDC ; err =atmel_tdes_hw_init (dd);
@@ -307,7 +307,6 @@ static int atmel_tdes_write_ctrl(struct atmel_tdes_dev *dd)if ((dd->flags &TDES_FLAGS_ENCRYPT ) || (dd->flags &TDES_FLAGS_OFB )) valmr |=TDES_MR_CYPHER_ENC ; -atmel_tdes_write (dd,TDES_CR , valcr);atmel_tdes_write (dd,TDES_MR , valmr); atmel_tdes_write_n(dd, TDES_KEY1W1R, dd->ctx->key,
Signature · 1 line
2.14.5
PATCH 8/16 crypto: atmel-tdes - Map driver data flags to Mode Register
In reply to [email protected]From: Tudor Ambarus <[email protected]>
Simplifies the configuration of the TDES IP.
--- drivers/crypto/atmel-tdes.c | 144 ++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 73 deletions(-)
drivers/crypto/atmel-tdes.c +71 -73
@@ -40,20 +40,23 @@#define ATMEL_TDES_PRIORITY 300/* TDES flags */ -#define TDES_FLAGS_MODE_MASK 0x00ff -#define TDES_FLAGS_ENCRYPT BIT(0) -#define TDES_FLAGS_CBC BIT(1) -#define TDES_FLAGS_CFB BIT(2) -#define TDES_FLAGS_CFB8 BIT(3) -#define TDES_FLAGS_CFB16 BIT(4) -#define TDES_FLAGS_CFB32 BIT(5) -#define TDES_FLAGS_CFB64 BIT(6) -#define TDES_FLAGS_OFB BIT(7) - -#define TDES_FLAGS_INIT BIT(16) -#define TDES_FLAGS_FAST BIT(17) -#define TDES_FLAGS_BUSY BIT(18) -#define TDES_FLAGS_DMA BIT(19) +/* Reserve bits [17:16], [13:12], [2:0] for AES Mode Register */ +#define TDES_FLAGS_ENCRYPT TDES_MR_CYPHER_ENC +#define TDES_FLAGS_OPMODE_MASK (TDES_MR_OPMOD_MASK | TDES_MR_CFBS_MASK) +#define TDES_FLAGS_ECB TDES_MR_OPMOD_ECB +#define TDES_FLAGS_CBC TDES_MR_OPMOD_CBC +#define TDES_FLAGS_OFB TDES_MR_OPMOD_OFB +#define TDES_FLAGS_CFB64 (TDES_MR_OPMOD_CFB | TDES_MR_CFBS_64b) +#define TDES_FLAGS_CFB32 (TDES_MR_OPMOD_CFB | TDES_MR_CFBS_32b) +#define TDES_FLAGS_CFB16 (TDES_MR_OPMOD_CFB | TDES_MR_CFBS_16b) +#define TDES_FLAGS_CFB8 (TDES_MR_OPMOD_CFB | TDES_MR_CFBS_8b) + +#define TDES_FLAGS_MODE_MASK (TDES_FLAGS_OPMODE_MASK | TDES_FLAGS_ENCRYPT) + +#define TDES_FLAGS_INIT BIT(3) +#define TDES_FLAGS_FAST BIT(4) +#define TDES_FLAGS_BUSY BIT(5) +#define TDES_FLAGS_DMA BIT(6)#define ATMEL_TDES_QUEUE_LENGTH 50
@@ -287,35 +290,15 @@ static int atmel_tdes_write_ctrl(struct atmel_tdes_dev *dd) valmr |=TDES_MR_TDESMOD_DES ; } -if (dd->flags &TDES_FLAGS_CBC ) { - valmr |=TDES_MR_OPMOD_CBC ; - }else if (dd->flags &TDES_FLAGS_CFB ) { - valmr |=TDES_MR_OPMOD_CFB ; - -if (dd->flags &TDES_FLAGS_CFB8 ) - valmr |= TDES_MR_CFBS_8b; -else if (dd->flags &TDES_FLAGS_CFB16 ) - valmr |= TDES_MR_CFBS_16b; -else if (dd->flags &TDES_FLAGS_CFB32 ) - valmr |= TDES_MR_CFBS_32b; -else if (dd->flags &TDES_FLAGS_CFB64 ) - valmr |= TDES_MR_CFBS_64b; - }else if (dd->flags &TDES_FLAGS_OFB ) { - valmr |=TDES_MR_OPMOD_OFB ; - } - -if ((dd->flags &TDES_FLAGS_ENCRYPT ) || (dd->flags &TDES_FLAGS_OFB )) - valmr |=TDES_MR_CYPHER_ENC ; + valmr |= dd->flags &TDES_FLAGS_MODE_MASK ;atmel_tdes_write (dd,TDES_MR , valmr);atmel_tdes_write_n (dd,TDES_KEY1W1R , dd->ctx->key, dd->ctx->keylen >>2 ); -if (((dd->flags &TDES_FLAGS_CBC ) || (dd->flags &TDES_FLAGS_CFB ) || - (dd->flags &TDES_FLAGS_OFB )) && dd->req->iv) { +if (dd->req->iv && (valmr &TDES_MR_OPMOD_MASK ) !=TDES_MR_OPMOD_ECB )atmel_tdes_write_n (dd,TDES_IV1R , (void *)dd->req->iv,2 ); - }return 0 ; }
@@ -406,6 +389,7 @@ static int atmel_tdes_crypt_pdc(struct crypto_tfm *tfm, dma_addr_t dma_addr_in, {struct atmel_tdes_ctx *ctx =crypto_tfm_ctx (tfm);struct atmel_tdes_dev *dd = ctx->dd; +struct atmel_tdes_reqctx *rctx =skcipher_request_ctx (dd->req);int len32; dd->dma_size = length;
@@ -415,12 +399,19 @@ static int atmel_tdes_crypt_pdc(struct crypto_tfm *tfm, dma_addr_t dma_addr_in, DMA_TO_DEVICE); } -if ((dd->flags &TDES_FLAGS_CFB ) && (dd->flags &TDES_FLAGS_CFB8 )) +switch (rctx->mode &TDES_FLAGS_OPMODE_MASK ) { +case TDES_FLAGS_CFB8 : len32 =DIV_ROUND_UP (length,sizeof (u8)); -else if ((dd->flags &TDES_FLAGS_CFB ) && (dd->flags &TDES_FLAGS_CFB16 )) +break ; + +case TDES_FLAGS_CFB16 : len32 =DIV_ROUND_UP (length,sizeof (u16)); -else +break ; + +default : len32 =DIV_ROUND_UP (length,sizeof (u32)); +break ; + }atmel_tdes_write (dd,TDES_PTCR ,TDES_PTCR_TXTDIS |TDES_PTCR_RXTDIS );atmel_tdes_write (dd,TDES_TPR , dma_addr_in);
@@ -442,8 +433,10 @@ static int atmel_tdes_crypt_dma(struct crypto_tfm *tfm, dma_addr_t dma_addr_in, {struct atmel_tdes_ctx *ctx =crypto_tfm_ctx (tfm);struct atmel_tdes_dev *dd = ctx->dd; +struct atmel_tdes_reqctx *rctx =skcipher_request_ctx (dd->req);struct scatterlist sg[2 ];struct dma_async_tx_descriptor *in_desc, *out_desc; +enum dma_slave_buswidth addr_width; dd->dma_size = length;
@@ -452,23 +445,23 @@ static int atmel_tdes_crypt_dma(struct crypto_tfm *tfm, dma_addr_t dma_addr_in, DMA_TO_DEVICE); } -if (dd->flags &TDES_FLAGS_CFB8 ) { - dd->dma_lch_in.dma_conf.dst_addr_width = -DMA_SLAVE_BUSWIDTH_1_BYTE ; - dd->dma_lch_out.dma_conf.src_addr_width = -DMA_SLAVE_BUSWIDTH_1_BYTE ; - }else if (dd->flags &TDES_FLAGS_CFB16 ) { - dd->dma_lch_in.dma_conf.dst_addr_width = -DMA_SLAVE_BUSWIDTH_2_BYTES ; - dd->dma_lch_out.dma_conf.src_addr_width = -DMA_SLAVE_BUSWIDTH_2_BYTES ; - }else { - dd->dma_lch_in.dma_conf.dst_addr_width = -DMA_SLAVE_BUSWIDTH_4_BYTES ; - dd->dma_lch_out.dma_conf.src_addr_width = -DMA_SLAVE_BUSWIDTH_4_BYTES ; +switch (rctx->mode &TDES_FLAGS_OPMODE_MASK ) { +case TDES_FLAGS_CFB8 : + addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; +break ; + +case TDES_FLAGS_CFB16 : + addr_width =DMA_SLAVE_BUSWIDTH_2_BYTES ; +break ; + +default : + addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; +break ; } + dd->dma_lch_in.dma_conf.dst_addr_width = addr_width; + dd->dma_lch_out.dma_conf.src_addr_width = addr_width; +dmaengine_slave_config (dd->dma_lch_in.chan, &dd->dma_lch_in.dma_conf);dmaengine_slave_config (dd->dma_lch_out.chan, &dd->dma_lch_out.dma_conf);
@@ -703,30 +696,38 @@ static int atmel_tdes_crypt(struct skcipher_request *req, unsigned long mode)struct atmel_tdes_ctx *ctx =crypto_skcipher_ctx (skcipher);struct atmel_tdes_reqctx *rctx =skcipher_request_ctx (req); -if (mode &TDES_FLAGS_CFB8 ) { +switch (mode &TDES_FLAGS_OPMODE_MASK ) { +case TDES_FLAGS_CFB8 :if (!IS_ALIGNED (req->cryptlen,CFB8_BLOCK_SIZE )) {pr_err ("request size is not exact amount of CFB8 blocks\n" );return -EINVAL ; } ctx->block_size =CFB8_BLOCK_SIZE ; - }else if (mode &TDES_FLAGS_CFB16 ) { +break ; + +case TDES_FLAGS_CFB16 :if (!IS_ALIGNED (req->cryptlen,CFB16_BLOCK_SIZE )) {pr_err ("request size is not exact amount of CFB16 blocks\n" );return -EINVAL ; } ctx->block_size =CFB16_BLOCK_SIZE ; - }else if (mode &TDES_FLAGS_CFB32 ) { +break ; + +case TDES_FLAGS_CFB32 :if (!IS_ALIGNED (req->cryptlen,CFB32_BLOCK_SIZE )) {pr_err ("request size is not exact amount of CFB32 blocks\n" );return -EINVAL ; } ctx->block_size =CFB32_BLOCK_SIZE ; - }else { +break ; + +default :if (!IS_ALIGNED (req->cryptlen,DES_BLOCK_SIZE )) {pr_err ("request size is not exact amount of DES blocks\n" );return -EINVAL ; } ctx->block_size =DES_BLOCK_SIZE ; +break ; } rctx->mode = mode;
@@ -845,17 +846,17 @@ static int atmel_tdes_setkey(struct crypto_skcipher *tfm, const u8 *key,static int atmel_tdes_ecb_encrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_ENCRYPT ); +return atmel_tdes_crypt (req,TDES_FLAGS_ECB |TDES_FLAGS_ENCRYPT ); }static int atmel_tdes_ecb_decrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,0 ); +return atmel_tdes_crypt (req,TDES_FLAGS_ECB ); }static int atmel_tdes_cbc_encrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_ENCRYPT |TDES_FLAGS_CBC ); +return atmel_tdes_crypt (req,TDES_FLAGS_CBC |TDES_FLAGS_ENCRYPT ); }static int atmel_tdes_cbc_decrypt (struct skcipher_request *req)
@@ -864,50 +865,47 @@ static int atmel_tdes_cbc_decrypt(struct skcipher_request *req) }static int atmel_tdes_cfb_encrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_ENCRYPT |TDES_FLAGS_CFB ); +return atmel_tdes_crypt (req,TDES_FLAGS_CFB64 |TDES_FLAGS_ENCRYPT ); }static int atmel_tdes_cfb_decrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_CFB ); +return atmel_tdes_crypt (req,TDES_FLAGS_CFB64 ); }static int atmel_tdes_cfb8_encrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_ENCRYPT |TDES_FLAGS_CFB | -TDES_FLAGS_CFB8 ); +return atmel_tdes_crypt (req,TDES_FLAGS_CFB8 |TDES_FLAGS_ENCRYPT ); }static int atmel_tdes_cfb8_decrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_CFB |TDES_FLAGS_CFB8 ); +return atmel_tdes_crypt (req,TDES_FLAGS_CFB8 ); }static int atmel_tdes_cfb16_encrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_ENCRYPT |TDES_FLAGS_CFB | -TDES_FLAGS_CFB16 ); +return atmel_tdes_crypt (req,TDES_FLAGS_CFB16 |TDES_FLAGS_ENCRYPT ); }static int atmel_tdes_cfb16_decrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_CFB |TDES_FLAGS_CFB16 ); +return atmel_tdes_crypt (req,TDES_FLAGS_CFB16 ); }static int atmel_tdes_cfb32_encrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_ENCRYPT |TDES_FLAGS_CFB | -TDES_FLAGS_CFB32 ); +return atmel_tdes_crypt (req,TDES_FLAGS_CFB32 |TDES_FLAGS_ENCRYPT ); }static int atmel_tdes_cfb32_decrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_CFB |TDES_FLAGS_CFB32 ); +return atmel_tdes_crypt (req,TDES_FLAGS_CFB32 ); }static int atmel_tdes_ofb_encrypt (struct skcipher_request *req) { -return atmel_tdes_crypt (req,TDES_FLAGS_ENCRYPT |TDES_FLAGS_OFB ); +return atmel_tdes_crypt (req,TDES_FLAGS_OFB |TDES_FLAGS_ENCRYPT ); }static int atmel_tdes_ofb_decrypt (struct skcipher_request *req)
Signature · 1 line
2.14.5
PATCH 9/16 crypto: atmel-tdes - Drop unnecessary passing of tfm
In reply to [email protected]From: Tudor Ambarus <[email protected]>
atmel_tdes_crypt_start() obtained a pointer to tfm from dd, passed the tfm pointer to atmel_tdes_crypt_{dma,pdc}, and in the calles we obtained dd back from the tfm. Pass pointer to dd directly.
--- drivers/crypto/atmel-tdes.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/crypto/atmel-tdes.c +8 -12
@@ -384,11 +384,10 @@ static void atmel_tdes_buff_cleanup(struct atmel_tdes_dev *dd)free_page ((unsigned long )dd->buf_in); } -static int atmel_tdes_crypt_pdc (struct crypto_tfm *tfm,dma_addr_t dma_addr_in, -dma_addr_t dma_addr_out,int length) +static int atmel_tdes_crypt_pdc (struct atmel_tdes_dev *dd, +dma_addr_t dma_addr_in, +dma_addr_t dma_addr_out,int length) { -struct atmel_tdes_ctx *ctx =crypto_tfm_ctx (tfm); -struct atmel_tdes_dev *dd = ctx->dd;struct atmel_tdes_reqctx *rctx =skcipher_request_ctx (dd->req);int len32;
@@ -428,11 +427,10 @@ static int atmel_tdes_crypt_pdc(struct crypto_tfm *tfm, dma_addr_t dma_addr_in,return 0 ; } -static int atmel_tdes_crypt_dma (struct crypto_tfm *tfm,dma_addr_t dma_addr_in, -dma_addr_t dma_addr_out,int length) +static int atmel_tdes_crypt_dma (struct atmel_tdes_dev *dd, +dma_addr_t dma_addr_in, +dma_addr_t dma_addr_out,int length) { -struct atmel_tdes_ctx *ctx =crypto_tfm_ctx (tfm); -struct atmel_tdes_dev *dd = ctx->dd;struct atmel_tdes_reqctx *rctx =skcipher_request_ctx (dd->req);struct scatterlist sg[2 ];struct dma_async_tx_descriptor *in_desc, *out_desc;
@@ -501,8 +499,6 @@ static int atmel_tdes_crypt_dma(struct crypto_tfm *tfm, dma_addr_t dma_addr_in,static int atmel_tdes_crypt_start (struct atmel_tdes_dev *dd) { -struct crypto_tfm *tfm =crypto_skcipher_tfm ( -crypto_skcipher_reqtfm (dd->req));int err, fast =0 , in, out;size_t count;dma_addr_t addr_in, addr_out;
@@ -558,9 +554,9 @@ static int atmel_tdes_crypt_start(struct atmel_tdes_dev *dd) dd->total -= count;if (dd->caps.has_dma) - err =atmel_tdes_crypt_dma (tfm, addr_in, addr_out, count); + err =atmel_tdes_crypt_dma (dd, addr_in, addr_out, count);else - err =atmel_tdes_crypt_pdc (tfm, addr_in, addr_out, count); + err =atmel_tdes_crypt_pdc (dd, addr_in, addr_out, count);if (err && (dd->flags &TDES_FLAGS_FAST )) {dma_unmap_sg (dd->dev, dd->in_sg,1 ,DMA_TO_DEVICE );
Signature · 1 line
2.14.5
PATCH 10/16 crypto: atmel-{aes,tdes} - Do not save IV for ECB mode
In reply to [email protected]From: Tudor Ambarus <[email protected]>
ECB mode does not use IV.
--- drivers/crypto/atmel-aes.c | 9 +++++++-- drivers/crypto/atmel-tdes.c | 7 +++++-- 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/crypto/atmel-aes.c +7 -2
@@ -516,6 +516,9 @@ static void atmel_aes_set_iv_as_last_ciphertext_block(struct atmel_aes_dev *dd)static inline int atmel_aes_complete (struct atmel_aes_dev *dd,int err) { +struct skcipher_request *req =skcipher_request_cast (dd->areq); +struct atmel_aes_reqctx *rctx =skcipher_request_ctx (req); +#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )if (dd->ctx->is_aead)atmel_aes_authenc_complete (dd, err);
@@ -524,7 +527,8 @@ static inline int atmel_aes_complete(struct atmel_aes_dev *dd, int err)clk_disable (dd->iclk); dd->flags &= ~AES_FLAGS_BUSY ; -if (!dd->ctx->is_aead) +if (!dd->ctx->is_aead && + (rctx->mode &AES_FLAGS_OPMODE_MASK ) !=AES_FLAGS_ECB )atmel_aes_set_iv_as_last_ciphertext_block (dd);if (dd->is_async)
@@ -1131,7 +1135,8 @@ static int atmel_aes_crypt(struct skcipher_request *req, unsigned long mode) rctx =skcipher_request_ctx (req); rctx->mode = mode; -if (!(mode &AES_FLAGS_ENCRYPT ) && (req->src == req->dst)) { +if ((mode &AES_FLAGS_OPMODE_MASK ) !=AES_FLAGS_ECB && + !(mode &AES_FLAGS_ENCRYPT ) && req->src == req->dst) {unsigned int ivsize =crypto_skcipher_ivsize (skcipher);if (req->cryptlen >= ivsize)
drivers/crypto/atmel-tdes.c +5 -2
@@ -593,12 +593,14 @@ atmel_tdes_set_iv_as_last_ciphertext_block(struct atmel_tdes_dev *dd)static void atmel_tdes_finish_req (struct atmel_tdes_dev *dd,int err) {struct skcipher_request *req = dd->req; +struct atmel_tdes_reqctx *rctx =skcipher_request_ctx (req);clk_disable_unprepare (dd->iclk); dd->flags &= ~TDES_FLAGS_BUSY ; -atmel_tdes_set_iv_as_last_ciphertext_block (dd); +if ((rctx->mode &TDES_FLAGS_OPMODE_MASK ) !=TDES_FLAGS_ECB ) +atmel_tdes_set_iv_as_last_ciphertext_block (dd); req->base.complete (&req->base, err); }
@@ -728,7 +730,8 @@ static int atmel_tdes_crypt(struct skcipher_request *req, unsigned long mode) rctx->mode = mode; -if (!(mode &TDES_FLAGS_ENCRYPT ) && req->src == req->dst) { +if ((mode &TDES_FLAGS_OPMODE_MASK ) !=TDES_FLAGS_ECB && + !(mode &TDES_FLAGS_ENCRYPT ) && req->src == req->dst) {unsigned int ivsize =crypto_skcipher_ivsize (skcipher);if (req->cryptlen >= ivsize)
Signature · 1 line
2.14.5
PATCH 11/16 crypto: atmel-aes - Fix counter overflow in CTR mode
In reply to [email protected]From: Tudor Ambarus <[email protected]>
32 bit counter is not supported by neither of our AES IPs, all implement a 16 bit block counter. Drop the 32 bit block counter logic.
--- drivers/crypto/atmel-aes.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-)
drivers/crypto/atmel-aes.c +12 -25
@@ -89,7 +89,6 @@struct atmel_aes_caps {bool has_dualbuff;bool has_cfb64; -bool has_ctr32;bool has_gcm;bool has_xts;bool has_authenc;
@@ -1019,8 +1018,9 @@ static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd)struct atmel_aes_ctr_ctx *ctx =atmel_aes_ctr_ctx_cast (dd->ctx);struct skcipher_request *req =skcipher_request_cast (dd->areq);struct scatterlist *src, *dst; -u32 ctr, blocks;size_t datalen; +u32 ctr; +u16 blocks, start, end;bool use_dma, fragmented = false;/* Check for transfer completion. */
@@ -1032,27 +1032,17 @@ static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd) datalen = req->cryptlen - ctx->offset; blocks =DIV_ROUND_UP (datalen,AES_BLOCK_SIZE ); ctr =be32_to_cpu (ctx->iv[3 ]); -if (dd->caps.has_ctr32) { -/* Check 32bit counter overflow. */ -u32 start = ctr; -u32 end = start + blocks -1 ; - -if (end < start) { - ctr |=0xffffffff ; - datalen =AES_BLOCK_SIZE * -start; - fragmented = true; - } - }else { -/* Check 16bit counter overflow. */ -u16 start = ctr &0xffff ; -u16 end = start + (u16 )blocks -1 ; - -if (blocks >>16 || end < start) { - ctr |=0xffff ; - datalen =AES_BLOCK_SIZE * (0x10000 -start); - fragmented = true; - } + +/* Check 16bit counter overflow. */ + start = ctr &0xffff ; + end = start + blocks -1 ; + +if (blocks >>16 || end < start) { + ctr |=0xffff ; + datalen =AES_BLOCK_SIZE * (0x10000 - start); + fragmented = true; } + use_dma = (datalen >=ATMEL_AES_DMA_THRESHOLD );/* Jump to offset. */
@@ -2538,7 +2528,6 @@ static void atmel_aes_get_cap(struct atmel_aes_dev *dd) { dd->caps.has_dualbuff =0 ; dd->caps.has_cfb64 =0 ; - dd->caps.has_ctr32 =0 ; dd->caps.has_gcm =0 ; dd->caps.has_xts =0 ; dd->caps.has_authenc =0 ;
@@ -2549,7 +2538,6 @@ static void atmel_aes_get_cap(struct atmel_aes_dev *dd)case 0x500 : dd->caps.has_dualbuff =1 ; dd->caps.has_cfb64 =1 ; - dd->caps.has_ctr32 =1 ; dd->caps.has_gcm =1 ; dd->caps.has_xts =1 ; dd->caps.has_authenc =1 ;
@@ -2558,7 +2546,6 @@ static void atmel_aes_get_cap(struct atmel_aes_dev *dd)case 0x200 : dd->caps.has_dualbuff =1 ; dd->caps.has_cfb64 =1 ; - dd->caps.has_ctr32 =1 ; dd->caps.has_gcm =1 ; dd->caps.max_burst_size =4 ;break ;
Signature · 1 line
2.14.5
PATCH 12/16 crypto: atmel-aes - Fix saving of IV for CTR mode
In reply to [email protected]From: Tudor Ambarus <[email protected]>
The req->iv of the skcipher_request is expected to contain the last used IV. Update the req->iv for CTR mode.
--- drivers/crypto/atmel-aes.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-)
drivers/crypto/atmel-aes.c +31 -12
@@ -121,6 +121,7 @@ struct atmel_aes_ctr_ctx {size_t offset;struct scatterlist src[2 ];struct scatterlist dst[2 ]; +u16 blocks; };struct atmel_aes_gcm_ctx {
@@ -513,6 +514,26 @@ static void atmel_aes_set_iv_as_last_ciphertext_block(struct atmel_aes_dev *dd) } } +static inline struct atmel_aes_ctr_ctx * +atmel_aes_ctr_ctx_cast (struct atmel_aes_base_ctx *ctx) +{ + return container_of(ctx, struct atmel_aes_ctr_ctx, base); +} + +static void atmel_aes_ctr_update_req_iv (struct atmel_aes_dev *dd) +{ +struct atmel_aes_ctr_ctx *ctx =atmel_aes_ctr_ctx_cast (dd->ctx); +struct skcipher_request *req =skcipher_request_cast (dd->areq); +struct crypto_skcipher *skcipher =crypto_skcipher_reqtfm (req); +unsigned int ivsize =crypto_skcipher_ivsize (skcipher); +int i; + +for (i =0 ; i < ctx->blocks; i++) +crypto_inc ((u8 *)ctx->iv,AES_BLOCK_SIZE ); + +memcpy (req->iv, ctx->iv, ivsize); +} +static inline int atmel_aes_complete (struct atmel_aes_dev *dd,int err) {struct skcipher_request *req =skcipher_request_cast (dd->areq);
@@ -527,8 +548,12 @@ static inline int atmel_aes_complete(struct atmel_aes_dev *dd, int err) dd->flags &= ~AES_FLAGS_BUSY ;if (!dd->ctx->is_aead && - (rctx->mode &AES_FLAGS_OPMODE_MASK ) !=AES_FLAGS_ECB ) -atmel_aes_set_iv_as_last_ciphertext_block (dd); + (rctx->mode &AES_FLAGS_OPMODE_MASK ) !=AES_FLAGS_ECB ) { +if ((rctx->mode &AES_FLAGS_OPMODE_MASK ) !=AES_FLAGS_CTR ) +atmel_aes_set_iv_as_last_ciphertext_block (dd); +else +atmel_aes_ctr_update_req_iv (dd); + }if (dd->is_async) dd->areq->complete (dd->areq, err);
@@ -1007,12 +1032,6 @@ static int atmel_aes_start(struct atmel_aes_dev *dd) atmel_aes_transfer_complete); } -static inline struct atmel_aes_ctr_ctx * -atmel_aes_ctr_ctx_cast (struct atmel_aes_base_ctx *ctx) -{ - return container_of(ctx, struct atmel_aes_ctr_ctx, base); -} -static int atmel_aes_ctr_transfer (struct atmel_aes_dev *dd) {struct atmel_aes_ctr_ctx *ctx =atmel_aes_ctr_ctx_cast (dd->ctx);
@@ -1020,7 +1039,7 @@ static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd)struct scatterlist *src, *dst;size_t datalen;u32 ctr; -u16 blocks, start, end; +u16 start, end;bool use_dma, fragmented = false;/* Check for transfer completion. */
@@ -1030,14 +1049,14 @@ static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd)/* Compute data length. */ datalen = req->cryptlen - ctx->offset; - blocks =DIV_ROUND_UP (datalen,AES_BLOCK_SIZE ); + ctx->blocks =DIV_ROUND_UP (datalen,AES_BLOCK_SIZE ); ctr =be32_to_cpu (ctx->iv[3 ]);/* Check 16bit counter overflow. */ start = ctr &0xffff ; - end = start + blocks -1 ; + end = start + ctx->blocks -1 ; -if (blocks >>16 || end < start) { +if (ctx->blocks >>16 || end < start) { ctr |=0xffff ; datalen =AES_BLOCK_SIZE * (0x10000 - start); fragmented = true;
Signature · 1 line
2.14.5
PATCH 13/16 crypto: atmel-{sha,tdes} - Remove unused 'err' member of driver data
In reply to [email protected]From: Tudor Ambarus <[email protected]>
'err' member was initialized to 0 but its value never changed.
--- drivers/crypto/atmel-sha.c | 6 ------ drivers/crypto/atmel-tdes.c | 4 ---- 2 files changed, 10 deletions(-)
drivers/crypto/atmel-sha.c +0 -6
@@ -136,7 +136,6 @@ struct atmel_sha_dev {void __iomem *io_base;spinlock_t lock; -int err;struct tasklet_struct done_task;struct tasklet_struct queue_task;
@@ -1027,7 +1026,6 @@ static int atmel_sha_hw_init(struct atmel_sha_dev *dd)if (!(SHA_FLAGS_INIT & dd->flags)) {atmel_sha_write (dd,SHA_CR ,SHA_CR_SWRST ); dd->flags |=SHA_FLAGS_INIT ; - dd->err =0 ; }return 0 ;
@@ -1403,10 +1401,6 @@ static int atmel_sha_done(struct atmel_sha_dev *dd)if (SHA_FLAGS_DMA_ACTIVE & dd->flags) { dd->flags &= ~SHA_FLAGS_DMA_ACTIVE ;atmel_sha_update_dma_stop (dd); -if (dd->err) { - err = dd->err; - goto finish; - } }if (SHA_FLAGS_OUTPUT_READY & dd->flags) {/* hash or semi-hash ready */
drivers/crypto/atmel-tdes.c +0 -4
@@ -102,7 +102,6 @@ struct atmel_tdes_dev {int irq;unsigned long flags; -int err;spinlock_t lock;struct crypto_queue queue;
@@ -228,7 +227,6 @@ static int atmel_tdes_hw_init(struct atmel_tdes_dev *dd)if (!(dd->flags &TDES_FLAGS_INIT )) {atmel_tdes_write (dd,TDES_CR ,TDES_CR_SWRST ); dd->flags |=TDES_FLAGS_INIT ; - dd->err =0 ; }return 0 ;
@@ -1124,8 +1122,6 @@ static void atmel_tdes_done_task(unsigned long data)else err =atmel_tdes_crypt_dma_stop (dd); - err = dd->err ? : err; -if (dd->total && !err) {if (dd->flags &TDES_FLAGS_FAST ) { dd->in_sg =sg_next (dd->in_sg);
Signature · 1 line
2.14.5
PATCH 14/16 crypto: atmel-sha - Void return type for atmel_sha_update_dma_stop()
In reply to [email protected]From: Tudor Ambarus <[email protected]>
No error handling, change return type to void.
--- drivers/crypto/atmel-sha.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/crypto/atmel-sha.c +1 -3
@@ -852,7 +852,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) 0, final); } -static int atmel_sha_update_dma_stop (struct atmel_sha_dev *dd) +static void atmel_sha_update_dma_stop (struct atmel_sha_dev *dd) {struct atmel_sha_reqctx *ctx =ahash_request_ctx (dd->req);
@@ -871,8 +871,6 @@ static int atmel_sha_update_dma_stop(struct atmel_sha_dev *dd)dma_unmap_single (dd->dev, ctx->dma_addr, ctx->buflen + ctx->block_size,DMA_TO_DEVICE ); } - -return 0 ; }static int atmel_sha_update_req (struct atmel_sha_dev *dd)
Signature · 1 line
2.14.5
PATCH 15/16 crypto: atmel-aes - Use gcm helper to check authsize
In reply to [email protected]From: Tudor Ambarus <[email protected]>
Use core helper functions.
--- drivers/crypto/atmel-aes.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/crypto/atmel-aes.c +1 -15
@@ -1790,21 +1790,7 @@ static int atmel_aes_gcm_setkey(struct crypto_aead *tfm, const u8 *key,static int atmel_aes_gcm_setauthsize (struct crypto_aead *tfm,unsigned int authsize) { -/* Same as crypto_gcm_authsize() from crypto/gcm.c */ -switch (authsize) { -case 4 : -case 8 : -case 12 : -case 13 : -case 14 : -case 15 : -case 16 : -break ; -default : -return -EINVAL ; - } - -return 0 ; +return crypto_gcm_check_authsize (authsize); }static int atmel_aes_gcm_encrypt (struct aead_request *req)
Signature · 1 line
2.14.5
PATCH 16/16 crypto: atmel-{aes,sha,tdes} - Group common alg type init in dedicated methods
In reply to [email protected]From: Tudor Ambarus <[email protected]>
Move common alg type init to dedicated methods.
--- drivers/crypto/atmel-aes.c | 82 ++++++++++----------------------------------- drivers/crypto/atmel-sha.c | 45 +++++++++---------------- drivers/crypto/atmel-tdes.c | 39 +++++---------------- 3 files changed, 42 insertions(+), 124 deletions(-)
drivers/crypto/atmel-aes.c +18 -64
@@ -1289,12 +1289,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "ecb(aes)", .base.cra_driver_name = "atmel-ecb-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1306,12 +1302,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cbc(aes)", .base.cra_driver_name = "atmel-cbc-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1324,12 +1316,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "ofb(aes)", .base.cra_driver_name = "atmel-ofb-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1342,12 +1330,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cfb(aes)", .base.cra_driver_name = "atmel-cfb-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1360,12 +1344,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cfb32(aes)", .base.cra_driver_name = "atmel-cfb32-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB32_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1378,12 +1358,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cfb16(aes)", .base.cra_driver_name = "atmel-cfb16-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB16_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1396,12 +1372,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cfb8(aes)", .base.cra_driver_name = "atmel-cfb8-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB8_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1414,12 +1386,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "ctr(aes)", .base.cra_driver_name = "atmel-ctr-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = 1, .base.cra_ctxsize = sizeof(struct atmel_aes_ctr_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_ctr_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1434,12 +1402,8 @@ static struct skcipher_alg aes_algs[] = {static struct skcipher_alg aes_cfb64_alg = { .base.cra_name ="cfb64(aes)" , .base.cra_driver_name ="atmel-cfb64-aes" , - .base.cra_priority =ATMEL_AES_PRIORITY , - .base.cra_flags =CRYPTO_ALG_ASYNC , .base.cra_blocksize =CFB64_BLOCK_SIZE , .base.cra_ctxsize =sizeof (struct atmel_aes_ctx ), - .base.cra_alignmask =0xf , - .base.cra_module =THIS_MODULE , .init = atmel_aes_init_tfm, .min_keysize =AES_MIN_KEY_SIZE ,
@@ -1825,12 +1789,8 @@ static struct aead_alg aes_gcm_alg = { .base = { .cra_name = "gcm(aes)", .cra_driver_name = "atmel-gcm-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = 1, .cra_ctxsize = sizeof(struct atmel_aes_gcm_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, };
@@ -1947,12 +1907,8 @@ static int atmel_aes_xts_init_tfm(struct crypto_skcipher *tfm)static struct skcipher_alg aes_xts_alg = { .base.cra_name ="xts(aes)" , .base.cra_driver_name ="atmel-xts-aes" , - .base.cra_priority =ATMEL_AES_PRIORITY , - .base.cra_flags =CRYPTO_ALG_ASYNC , .base.cra_blocksize =AES_BLOCK_SIZE , .base.cra_ctxsize =sizeof (struct atmel_aes_xts_ctx ), - .base.cra_alignmask =0xf , - .base.cra_module =THIS_MODULE , .min_keysize =2 *AES_MIN_KEY_SIZE , .max_keysize =2 *AES_MAX_KEY_SIZE ,
@@ -2252,12 +2208,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha1),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha1-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, {
@@ -2272,12 +2224,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha224),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha224-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, {
@@ -2292,12 +2240,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha256),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha256-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, {
@@ -2312,12 +2256,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha384),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha384-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, {
@@ -2332,12 +2272,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha512),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha512-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, };
@@ -2469,29 +2405,45 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd)crypto_unregister_skcipher (&aes_algs[i]); } +static void atmel_aes_crypto_alg_init (struct crypto_alg *alg) +{ + alg->cra_flags =CRYPTO_ALG_ASYNC ; + alg->cra_alignmask =0xf ; + alg->cra_priority =ATMEL_AES_PRIORITY ; + alg->cra_module =THIS_MODULE ; +} +static int atmel_aes_register_algs (struct atmel_aes_dev *dd) {int err, i, j;for (i =0 ; i <ARRAY_SIZE (aes_algs); i++) { +atmel_aes_crypto_alg_init (&aes_algs[i].base); + err =crypto_register_skcipher (&aes_algs[i]);if (err) goto err_aes_algs; }if (dd->caps.has_cfb64) { +atmel_aes_crypto_alg_init (&aes_cfb64_alg.base); + err =crypto_register_skcipher (&aes_cfb64_alg);if (err) goto err_aes_cfb64_alg; }if (dd->caps.has_gcm) { +atmel_aes_crypto_alg_init (&aes_gcm_alg.base); + err =crypto_register_aead (&aes_gcm_alg);if (err) goto err_aes_gcm_alg; }if (dd->caps.has_xts) { +atmel_aes_crypto_alg_init (&aes_xts_alg.base); + err =crypto_register_skcipher (&aes_xts_alg);if (err) goto err_aes_xts_alg;
@@ -2500,6 +2452,8 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )if (dd->caps.has_authenc) {for (i =0 ; i <ARRAY_SIZE (aes_authenc_algs); i++) { +atmel_aes_crypto_alg_init (&aes_authenc_algs[i].base); + err =crypto_register_aead (&aes_authenc_algs[i]);if (err) goto err_aes_authenc_alg;
drivers/crypto/atmel-sha.c +15 -30
163 lines not on this page · raw message
drivers/crypto/atmel-tdes.c +9 -30
@@ -928,12 +928,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "ecb(des)", .base.cra_driver_name = "atmel-ecb-des", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x7, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES_KEY_SIZE,
@@ -945,12 +942,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cbc(des)", .base.cra_driver_name = "atmel-cbc-des", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x7, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES_KEY_SIZE,
@@ -963,12 +957,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cfb(des)", .base.cra_driver_name = "atmel-cfb-des", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x7, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES_KEY_SIZE,
@@ -981,12 +972,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cfb8(des)", .base.cra_driver_name = "atmel-cfb8-des", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB8_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES_KEY_SIZE,
@@ -999,12 +987,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cfb16(des)", .base.cra_driver_name = "atmel-cfb16-des", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB16_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x1, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES_KEY_SIZE,
@@ -1017,12 +1002,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cfb32(des)", .base.cra_driver_name = "atmel-cfb32-des", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB32_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x3, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES_KEY_SIZE,
@@ -1035,12 +1017,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "ofb(des)", .base.cra_driver_name = "atmel-ofb-des", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x7, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES_KEY_SIZE,
@@ -1053,12 +1032,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "ecb(des3_ede)", .base.cra_driver_name = "atmel-ecb-tdes", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x7, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES3_EDE_KEY_SIZE,
@@ -1070,12 +1046,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "cbc(des3_ede)", .base.cra_driver_name = "atmel-cbc-tdes", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x7, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES3_EDE_KEY_SIZE,
@@ -1088,12 +1061,9 @@ static struct skcipher_alg tdes_algs[] = { { .base.cra_name = "ofb(des3_ede)", .base.cra_driver_name = "atmel-ofb-tdes", - .base.cra_priority = ATMEL_TDES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_tdes_ctx), .base.cra_alignmask = 0x7, - .base.cra_module = THIS_MODULE, .init = atmel_tdes_init_tfm, .min_keysize = DES3_EDE_KEY_SIZE,
@@ -1165,11 +1135,20 @@ static void atmel_tdes_unregister_algs(struct atmel_tdes_dev *dd)crypto_unregister_skcipher (&tdes_algs[i]); } +static void atmel_tdes_skcipher_alg_init (struct skcipher_alg *alg) +{ + alg->base.cra_flags =CRYPTO_ALG_ASYNC ; + alg->base.cra_priority =ATMEL_TDES_PRIORITY ; + alg->base.cra_module =THIS_MODULE ; +} +static int atmel_tdes_register_algs (struct atmel_tdes_dev *dd) {int err, i, j;for (i =0 ; i <ARRAY_SIZE (tdes_algs); i++) { +atmel_tdes_skcipher_alg_init (&tdes_algs[i]); + err =crypto_register_skcipher (&tdes_algs[i]);if (err) goto err_tdes_algs;
Signature · 1 line
2.14.5
PATCH v2 16/16 crypto: atmel-{aes,sha,tdes} - Group common alg type init in dedicated methods
From: Tudor Ambarus <[email protected]>
Move common alg type init to dedicated methods.
---
v2: more common alg init for atmel-sha
drivers/crypto/atmel-aes.c | 82 +++-------- drivers/crypto/atmel-sha.c | 324 ++++++++++++++------------------------------ drivers/crypto/atmel-tdes.c | 62 ++------- 3 files changed, 129 insertions(+), 339 deletions(-)
drivers/crypto/atmel-aes.c +18 -64
@@ -1289,12 +1289,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "ecb(aes)", .base.cra_driver_name = "atmel-ecb-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1306,12 +1302,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cbc(aes)", .base.cra_driver_name = "atmel-cbc-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1324,12 +1316,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "ofb(aes)", .base.cra_driver_name = "atmel-ofb-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1342,12 +1330,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cfb(aes)", .base.cra_driver_name = "atmel-cfb-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1360,12 +1344,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cfb32(aes)", .base.cra_driver_name = "atmel-cfb32-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB32_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1378,12 +1358,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cfb16(aes)", .base.cra_driver_name = "atmel-cfb16-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB16_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1396,12 +1372,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "cfb8(aes)", .base.cra_driver_name = "atmel-cfb8-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = CFB8_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct atmel_aes_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1414,12 +1386,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_name = "ctr(aes)", .base.cra_driver_name = "atmel-ctr-aes", - .base.cra_priority = ATMEL_AES_PRIORITY, - .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = 1, .base.cra_ctxsize = sizeof(struct atmel_aes_ctr_ctx), - .base.cra_alignmask = 0xf, - .base.cra_module = THIS_MODULE, .init = atmel_aes_ctr_init_tfm, .min_keysize = AES_MIN_KEY_SIZE,
@@ -1434,12 +1402,8 @@ static struct skcipher_alg aes_algs[] = {static struct skcipher_alg aes_cfb64_alg = { .base.cra_name ="cfb64(aes)" , .base.cra_driver_name ="atmel-cfb64-aes" , - .base.cra_priority =ATMEL_AES_PRIORITY , - .base.cra_flags =CRYPTO_ALG_ASYNC , .base.cra_blocksize =CFB64_BLOCK_SIZE , .base.cra_ctxsize =sizeof (struct atmel_aes_ctx ), - .base.cra_alignmask =0xf , - .base.cra_module =THIS_MODULE , .init = atmel_aes_init_tfm, .min_keysize =AES_MIN_KEY_SIZE ,
@@ -1825,12 +1789,8 @@ static struct aead_alg aes_gcm_alg = { .base = { .cra_name = "gcm(aes)", .cra_driver_name = "atmel-gcm-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = 1, .cra_ctxsize = sizeof(struct atmel_aes_gcm_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, };
@@ -1947,12 +1907,8 @@ static int atmel_aes_xts_init_tfm(struct crypto_skcipher *tfm)static struct skcipher_alg aes_xts_alg = { .base.cra_name ="xts(aes)" , .base.cra_driver_name ="atmel-xts-aes" , - .base.cra_priority =ATMEL_AES_PRIORITY , - .base.cra_flags =CRYPTO_ALG_ASYNC , .base.cra_blocksize =AES_BLOCK_SIZE , .base.cra_ctxsize =sizeof (struct atmel_aes_xts_ctx ), - .base.cra_alignmask =0xf , - .base.cra_module =THIS_MODULE , .min_keysize =2 *AES_MIN_KEY_SIZE , .max_keysize =2 *AES_MAX_KEY_SIZE ,
@@ -2252,12 +2208,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha1),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha1-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, {
@@ -2272,12 +2224,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha224),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha224-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, {
@@ -2292,12 +2240,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha256),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha256-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, {
@@ -2312,12 +2256,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha384),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha384-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, {
@@ -2332,12 +2272,8 @@ static struct aead_alg aes_authenc_algs[] = { .base = { .cra_name = "authenc(hmac(sha512),cbc(aes))", .cra_driver_name = "atmel-authenc-hmac-sha512-cbc-aes", - .cra_priority = ATMEL_AES_PRIORITY, - .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_authenc_ctx), - .cra_alignmask = 0xf, - .cra_module = THIS_MODULE, }, }, };
@@ -2469,29 +2405,45 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd)crypto_unregister_skcipher (&aes_algs[i]); } +static void atmel_aes_crypto_alg_init (struct crypto_alg *alg) +{ + alg->cra_flags =CRYPTO_ALG_ASYNC ; + alg->cra_alignmask =0xf ; + alg->cra_priority =ATMEL_AES_PRIORITY ; + alg->cra_module =THIS_MODULE ; +} +static int atmel_aes_register_algs (struct atmel_aes_dev *dd) {int err, i, j;for (i =0 ; i <ARRAY_SIZE (aes_algs); i++) { +atmel_aes_crypto_alg_init (&aes_algs[i].base); + err =crypto_register_skcipher (&aes_algs[i]);if (err) goto err_aes_algs; }if (dd->caps.has_cfb64) { +atmel_aes_crypto_alg_init (&aes_cfb64_alg.base); + err =crypto_register_skcipher (&aes_cfb64_alg);if (err) goto err_aes_cfb64_alg; }if (dd->caps.has_gcm) { +atmel_aes_crypto_alg_init (&aes_gcm_alg.base); + err =crypto_register_aead (&aes_gcm_alg);if (err) goto err_aes_gcm_alg; }if (dd->caps.has_xts) { +atmel_aes_crypto_alg_init (&aes_xts_alg.base); + err =crypto_register_skcipher (&aes_xts_alg);if (err) goto err_aes_xts_alg;
@@ -2500,6 +2452,8 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)#if IS_ENABLED (CONFIG_CRYPTO_DEV_ATMEL_AUTHENC )if (dd->caps.has_authenc) {for (i =0 ; i <ARRAY_SIZE (aes_authenc_algs); i++) { +atmel_aes_crypto_alg_init (&aes_authenc_algs[i].base); + err =crypto_register_aead (&aes_authenc_algs[i]);if (err) goto err_aes_authenc_alg;
drivers/crypto/atmel-sha.c +99 -225
384 lines not on this page · raw message
drivers/crypto/atmel-tdes.c +12 -50
162 lines not on this page · raw message
Signature · 1 line
2.14.5
Herbert Xu
maintainerQuoted 24 lines · On Thu, Dec 05, 2019 at 09:53:43AM +0000, [email protected] wrote:
From: Tudor Ambarus <[email protected]>
Fix AES CTR and other cleanup patches.
Tudor Ambarus (16):
crypto: atmel-tdes: Constify value to write to hw
crypto: atmel-{sha,tdes} - Change algorithm priorities
crypto: atmel-tdes - Remove unused header includes
crypto: atmel-{sha,tdes} - Propagate error from_hw_version_init()
crypto: atmel-{aes,sha,tdes} - Drop superfluous error message inprobe()crypto: atmel-{aes,sha,tdes} - Rename labels in
probe()
crypto: atmel-tdes - Remove useless write in Control Register
crypto: atmel-tdes - Map driver data flags to Mode Register
crypto: atmel-tdes - Drop unnecessary passing of tfm
crypto: atmel-{aes,tdes} - Do not save IV for ECB mode
crypto: atmel-aes - Fix counter overflow in CTR mode
crypto: atmel-aes - Fix saving of IV for CTR mode
crypto: atmel-{sha,tdes} - Remove unused 'err' member of driver data
crypto: atmel-sha - Void return type foratmel_sha_update_dma_stop()
crypto: atmel-aes - Use gcm helper to check authsize
crypto: atmel-{aes,sha,tdes} - Group common alg type init in dedicated
methods
Quoted 4 lines
drivers/crypto/atmel-aes.c | 227 ++++++++++++++----------------------- drivers/crypto/atmel-sha.c | 102 +++++++---------- drivers/crypto/atmel-tdes.c | 270 ++++++++++++++++++++------------------------ 3 files changed, 247 insertions(+), 352 deletions(-)
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt