ARM: AT91SAM9G45: same platform data structure for all crypto peripherals
PATCH v4 1/4 ARM: AT91SAM9G45: same platform data structure for all crypto peripherals
Only AES use DMA in AT91SAM9G45 (TDES and SHA use PDC).
However latest Atmel TDES and SHA IP releases use DMA instead of PDC.
--> Atmel TDES and SHA drivers need DMA platform data for those IP releases.
Goal of this patch is to use the same platform data structure for all Atmel crypto peripherals. This structure contains information about DMA interface.
---
v2 : check kzalloc return value.
v3 : alt_atslave structure declared as static.
v4 : no change.
arch/arm/mach-at91/at91sam9g45_devices.c | 14 ++++++-------- include/linux/platform_data/atmel-aes.h | 22 ---------------------- include/linux/platform_data/crypto-atmel.h | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 30 deletions(-) delete mode 100644 include/linux/platform_data/atmel-aes.h create mode 100644 include/linux/platform_data/crypto-atmel.h
arch/arm/mach-at91/at91sam9g45_devices.c +6 -8
@@ -18,7 +18,7 @@#include <linux/platform_device.h> #include <linux/i2c-gpio.h> #include <linux/atmel-mci.h> -#include <linux/platform_data/atmel-aes.h> +#include <linux/platform_data/crypto-atmel.h> #include <linux/platform_data/at91_adc.h>
@@ -1900,7 +1900,8 @@ static void __init at91_add_device_tdes(void) {}* -------------------------------------------------------------------- */ #if defined(CONFIG_CRYPTO_DEV_ATMEL_AES ) || defined(CONFIG_CRYPTO_DEV_ATMEL_AES_MODULE ) -static struct aes_platform_data aes_data; +static struct crypto_platform_data aes_data; +static struct crypto_dma_data alt_atslave;static u64 aes_dmamask =DMA_BIT_MASK (32 ); static struct resource aes_resources[] = {
@@ -1931,23 +1932,20 @@ static struct platform_device at91sam9g45_aes_device = {static void __init at91_add_device_aes (void ) {struct at_dma_slave *atslave; -struct aes_dma_data *alt_atslave; - - alt_atslave =kzalloc (sizeof (struct aes_dma_data ),GFP_KERNEL );/* DMA TX slave channel configuration */ - atslave = &alt_atslave->txdata; + atslave = &alt_atslave.txdata; atslave->dma_dev = &at_hdmac_device.dev; atslave->cfg =ATC_FIFOCFG_ENOUGHSPACE |ATC_SRC_H2SEL_HW |ATC_SRC_PER (AT_DMA_ID_AES_RX );/* DMA RX slave channel configuration */ - atslave = &alt_atslave->rxdata; + atslave = &alt_atslave.rxdata; atslave->dma_dev = &at_hdmac_device.dev; atslave->cfg =ATC_FIFOCFG_ENOUGHSPACE |ATC_DST_H2SEL_HW |ATC_DST_PER (AT_DMA_ID_AES_TX ); - aes_data.dma_slave = alt_atslave; + aes_data.dma_slave = &alt_atslave;platform_device_register (&at91sam9g45_aes_device); }#else
include/linux/platform_data/atmel-aes.h deleted +0 -22
@@ -1,22 +0,0 @@ -#ifndef __LINUX_ATMEL_AES_H -#define __LINUX_ATMEL_AES_H - -#include <linux/platform_data/dma-atmel.h> - -/** -* struct aes_dma_data - DMA data for AES -*/ -struct aes_dma_data { -struct at_dma_slave txdata; -struct at_dma_slave rxdata; -}; - -/** -* struct aes_platform_data - board-specific AES configuration -* @dma_slave: DMA slave interface to use in data transfers. -*/ -struct aes_platform_data { -struct aes_dma_data *dma_slave; -}; - -#endif /* __LINUX_ATMEL_AES_H */
include/linux/platform_data/crypto-atmel.h new file +22 -0
@@ -0,0 +1,22 @@ +#ifndef __LINUX_CRYPTO_ATMEL_H +#define __LINUX_CRYPTO_ATMEL_H + +#include <linux/platform_data/dma-atmel.h> + +/** +* struct crypto_dma_data - DMA data for AES/TDES/SHA +*/ +struct crypto_dma_data { +struct at_dma_slave txdata; +struct at_dma_slave rxdata; +}; + +/** +* struct crypto_platform_data - board-specific AES/TDES/SHA configuration +* @dma_slave: DMA slave interface to use in data transfers. +*/ +struct crypto_platform_data { +struct crypto_dma_data *dma_slave; +}; + +#endif /* __LINUX_CRYPTO_ATMEL_H */
Signature · 1 line
1.8.1
PATCH v2 2/4 crypto: Atmel AES driver: add support for latest release of the IP (0x130)
Updates from previous IP release (0x120):
- add cfb64 support
- add DMA double input buffer support
---
v2 : add CKEY fix.
drivers/crypto/atmel-aes.c | 471 +++++++++++++++++++++++++++++++++------------ 1 file changed, 353 insertions(+), 118 deletions(-)
drivers/crypto/atmel-aes.c +353 -118
@@ -38,7 +38,7 @@#include <crypto/aes.h> #include <crypto/hash.h> #include <crypto/internal/hash.h> -#include <linux/platform_data/atmel-aes.h> +#include <linux/platform_data/crypto-atmel.h> #include "atmel-aes-regs.h" #define CFB8_BLOCK_SIZE 1
@@ -47,7 +47,7 @@#define CFB64_BLOCK_SIZE 8/* AES flags */ -#define AES_FLAGS_MODE_MASK 0x01ff +#define AES_FLAGS_MODE_MASK 0x03ff#define AES_FLAGS_ENCRYPT BIT(0)#define AES_FLAGS_CBC BIT(1)#define AES_FLAGS_CFB BIT(2)
@@ -55,21 +55,26 @@#define AES_FLAGS_CFB16 BIT(4)#define AES_FLAGS_CFB32 BIT(5)#define AES_FLAGS_CFB64 BIT(6) -#define AES_FLAGS_OFB BIT(7) -#define AES_FLAGS_CTR BIT(8) +#define AES_FLAGS_CFB128 BIT(7) +#define AES_FLAGS_OFB BIT(8) +#define AES_FLAGS_CTR BIT(9)#define AES_FLAGS_INIT BIT(16)#define AES_FLAGS_DMA BIT(17)#define AES_FLAGS_BUSY BIT(18) +#define AES_FLAGS_FAST BIT(19) -#define AES_FLAGS_DUALBUFF BIT(24) - -#define ATMEL_AES_QUEUE_LENGTH 1 -#define ATMEL_AES_CACHE_SIZE 0 +#define ATMEL_AES_QUEUE_LENGTH 50#define ATMEL_AES_DMA_THRESHOLD 16 +struct atmel_aes_caps { +bool has_dualbuff; +bool has_cfb64; +u32 max_burst_size; +}; +struct atmel_aes_dev ;struct atmel_aes_ctx {
@@ -77,6 +82,8 @@ struct atmel_aes_ctx {int keylen;u32 key[AES_KEYSIZE_256 /sizeof (u32)]; + +u16 block_size; };struct atmel_aes_reqctx {
@@ -112,20 +119,27 @@ struct atmel_aes_dev {struct scatterlist *in_sg;unsigned int nb_in_sg; - +size_t in_offset;struct scatterlist *out_sg;unsigned int nb_out_sg; +size_t out_offset;size_t bufcnt; +size_t buflen; +size_t dma_size; -u8 buf_in[ATMEL_AES_DMA_THRESHOLD ]__aligned(sizeof(u32)) ; -int dma_in; +void *buf_in; +int dma_in; +dma_addr_t dma_addr_in;struct atmel_aes_dma dma_lch_in; -u8 buf_out[ATMEL_AES_DMA_THRESHOLD ]__aligned(sizeof(u32)) ; -int dma_out; +void *buf_out; +int dma_out; +dma_addr_t dma_addr_out;struct atmel_aes_dma dma_lch_out; +struct atmel_aes_caps caps; +u32 hw_version; };
@@ -165,6 +179,37 @@ static int atmel_aes_sg_length(struct ablkcipher_request *req,return sg_nb; } +static int atmel_aes_sg_copy (struct scatterlist **sg,size_t *offset, +void *buf,size_t buflen,size_t total,int out) +{ +unsigned int count, off =0 ; + +while (buflen && total) { + count =min ((*sg)->length - *offset, total); + count =min (count, buflen); + +if (!count) +return off; + +scatterwalk_map_and_copy (buf + off, *sg, *offset, count, out); + + off += count; + buflen -= count; + *offset += count; + total -= count; + +if (*offset == (*sg)->length) { + *sg =sg_next (*sg); +if (*sg) + *offset =0 ; +else + total =0 ; + } + } + +return off; +} +static inline u32 atmel_aes_read (struct atmel_aes_dev *dd,u32 offset) {return readl_relaxed (dd->io_base + offset);
@@ -190,14 +235,6 @@ static void atmel_aes_write_n(struct atmel_aes_dev *dd, u32 offset,atmel_aes_write (dd, offset, *value); } -static void atmel_aes_dualbuff_test (struct atmel_aes_dev *dd) -{ -atmel_aes_write (dd,AES_MR ,AES_MR_DUALBUFF ); - -if (atmel_aes_read (dd,AES_MR ) &AES_MR_DUALBUFF ) - dd->flags |=AES_FLAGS_DUALBUFF ; -} -static struct atmel_aes_dev *atmel_aes_find_dev (struct atmel_aes_ctx *ctx) {struct atmel_aes_dev *aes_dd =NULL ;
@@ -225,7 +262,7 @@ static int atmel_aes_hw_init(struct atmel_aes_dev *dd)if (!(dd->flags &AES_FLAGS_INIT )) {atmel_aes_write (dd,AES_CR ,AES_CR_SWRST ); -atmel_aes_dualbuff_test (dd); +atmel_aes_write (dd,AES_MR ,0xE <<AES_MR_CKEY_OFFSET ); dd->flags |=AES_FLAGS_INIT ; dd->err =0 ; }
@@ -233,11 +270,19 @@ static int atmel_aes_hw_init(struct atmel_aes_dev *dd)return 0 ; } +static inline unsigned int atmel_aes_get_version (struct atmel_aes_dev *dd) +{ +return atmel_aes_read (dd,AES_HW_VERSION ) &0x00000fff ; +} +static void atmel_aes_hw_version_init (struct atmel_aes_dev *dd) {atmel_aes_hw_init (dd); - dd->hw_version =atmel_aes_read (dd,AES_HW_VERSION ); + dd->hw_version =atmel_aes_get_version (dd); + +dev_info (dd->dev, +"version: 0x%x\n" , dd->hw_version);clk_disable_unprepare (dd->iclk); }
@@ -260,50 +305,77 @@ static void atmel_aes_dma_callback(void *data)tasklet_schedule (&dd->done_task); } -static int atmel_aes_crypt_dma (struct atmel_aes_dev *dd) +static int atmel_aes_crypt_dma (struct atmel_aes_dev *dd, +dma_addr_t dma_addr_in,dma_addr_t dma_addr_out,int length) { +struct scatterlist sg[2 ];struct dma_async_tx_descriptor *in_desc, *out_desc; -int nb_dma_sg_in, nb_dma_sg_out; - dd->nb_in_sg =atmel_aes_sg_length (dd->req, dd->in_sg); -if (!dd->nb_in_sg) - goto exit_err; + dd->dma_size = length; - nb_dma_sg_in =dma_map_sg (dd->dev, dd->in_sg, dd->nb_in_sg, -DMA_TO_DEVICE ); -if (!nb_dma_sg_in) - goto exit_err; +if (!(dd->flags &AES_FLAGS_FAST )) { +dma_sync_single_for_device (dd->dev, dma_addr_in, length, +DMA_TO_DEVICE ); + } - in_desc =dmaengine_prep_slave_sg (dd->dma_lch_in.chan, dd->in_sg, - nb_dma_sg_in,DMA_MEM_TO_DEV , -DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +if (dd->flags &AES_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 &AES_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 ; + } -if (!in_desc) - goto unmap_in; +if (dd->flags & (AES_FLAGS_CFB8 |AES_FLAGS_CFB16 | +AES_FLAGS_CFB32 |AES_FLAGS_CFB64 )) { + dd->dma_lch_in.dma_conf.src_maxburst =1 ; + dd->dma_lch_in.dma_conf.dst_maxburst =1 ; + dd->dma_lch_out.dma_conf.src_maxburst =1 ; + dd->dma_lch_out.dma_conf.dst_maxburst =1 ; + }else { + dd->dma_lch_in.dma_conf.src_maxburst = dd->caps.max_burst_size; + dd->dma_lch_in.dma_conf.dst_maxburst = dd->caps.max_burst_size; + dd->dma_lch_out.dma_conf.src_maxburst = dd->caps.max_burst_size; + dd->dma_lch_out.dma_conf.dst_maxburst = dd->caps.max_burst_size; + } -/* callback not needed */ +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); - dd->nb_out_sg =atmel_aes_sg_length (dd->req, dd->out_sg); -if (!dd->nb_out_sg) - goto unmap_in; + dd->flags |=AES_FLAGS_DMA ; - nb_dma_sg_out =dma_map_sg (dd->dev, dd->out_sg, dd->nb_out_sg, -DMA_FROM_DEVICE ); -if (!nb_dma_sg_out) - goto unmap_out; +sg_init_table (&sg[0 ],1 ); +sg_dma_address (&sg[0 ]) = dma_addr_in; +sg_dma_len (&sg[0 ]) = length; - out_desc =dmaengine_prep_slave_sg (dd->dma_lch_out.chan, dd->out_sg, - nb_dma_sg_out,DMA_DEV_TO_MEM , -DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +sg_init_table (&sg[1 ],1 ); +sg_dma_address (&sg[1 ]) = dma_addr_out; +sg_dma_len (&sg[1 ]) = length; + + in_desc =dmaengine_prep_slave_sg (dd->dma_lch_in.chan, &sg[0 ], +1 ,DMA_MEM_TO_DEV , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +if (!in_desc) +return -EINVAL ; + out_desc =dmaengine_prep_slave_sg (dd->dma_lch_out.chan, &sg[1 ], +1 ,DMA_DEV_TO_MEM , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK );if (!out_desc) - goto unmap_out; +return -EINVAL ; out_desc->callback = atmel_aes_dma_callback; out_desc->callback_param = dd; - dd->total -= dd->req->nbytes; -dmaengine_submit (out_desc);dma_async_issue_pending (dd->dma_lch_out.chan);
@@ -311,15 +383,6 @@ static int atmel_aes_crypt_dma(struct atmel_aes_dev *dd)dma_async_issue_pending (dd->dma_lch_in.chan);return 0 ; - -unmap_out: -dma_unmap_sg (dd->dev, dd->out_sg, dd->nb_out_sg, -DMA_FROM_DEVICE ); -unmap_in: -dma_unmap_sg (dd->dev, dd->in_sg, dd->nb_in_sg, -DMA_TO_DEVICE ); -exit_err: -return -EINVAL ; }static int atmel_aes_crypt_cpu_start (struct atmel_aes_dev *dd)
@@ -352,30 +415,66 @@ static int atmel_aes_crypt_cpu_start(struct atmel_aes_dev *dd)static int atmel_aes_crypt_dma_start (struct atmel_aes_dev *dd) { -int err; +int err, fast =0 , in, out; +size_t count; +dma_addr_t addr_in, addr_out; + +if ((!dd->in_offset) && (!dd->out_offset)) { +/* check for alignment */ + in =IS_ALIGNED ((u32 )dd->in_sg->offset,sizeof (u32)) && +IS_ALIGNED (dd->in_sg->length, dd->ctx->block_size); + out =IS_ALIGNED ((u32 )dd->out_sg->offset,sizeof (u32)) && +IS_ALIGNED (dd->out_sg->length, dd->ctx->block_size); + fast = in && out; + +if (sg_dma_len (dd->in_sg) !=sg_dma_len (dd->out_sg)) + fast =0 ; + } + + +if (fast) { + count =min (dd->total,sg_dma_len (dd->in_sg)); + count =min (count,sg_dma_len (dd->out_sg)); + + err =dma_map_sg (dd->dev, dd->in_sg,1 ,DMA_TO_DEVICE ); +if (!err) { +dev_err (dd->dev,"dma_map_sg() error\n" ); +return -EINVAL ; + } + + err =dma_map_sg (dd->dev, dd->out_sg,1 , +DMA_FROM_DEVICE ); +if (!err) { +dev_err (dd->dev,"dma_map_sg() error\n" ); +dma_unmap_sg (dd->dev, dd->in_sg,1 , +DMA_TO_DEVICE ); +return -EINVAL ; + } + + addr_in =sg_dma_address (dd->in_sg); + addr_out =sg_dma_address (dd->out_sg); + + dd->flags |=AES_FLAGS_FAST ; -if (dd->flags &AES_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 &AES_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 ; +/* use cache buffers */ + count =atmel_aes_sg_copy (&dd->in_sg, &dd->in_offset, + dd->buf_in, dd->buflen, dd->total,0 ); + + addr_in = dd->dma_addr_in; + addr_out = dd->dma_addr_out; + + dd->flags &= ~AES_FLAGS_FAST ; } -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); + dd->total -= count; - dd->flags |=AES_FLAGS_DMA ; - err =atmel_aes_crypt_dma (dd); + err =atmel_aes_crypt_dma (dd, addr_in, addr_out, count); + +if (err && (dd->flags &AES_FLAGS_FAST )) { +dma_unmap_sg (dd->dev, dd->in_sg,1 ,DMA_TO_DEVICE ); +dma_unmap_sg (dd->dev, dd->out_sg,1 ,DMA_TO_DEVICE ); + }return err; }
@@ -410,6 +509,8 @@ static int atmel_aes_write_ctrl(struct atmel_aes_dev *dd) valmr |= AES_MR_CFBS_32b; else if (dd->flags & AES_FLAGS_CFB64) valmr |= AES_MR_CFBS_64b; + else if (dd->flags & AES_FLAGS_CFB128) + valmr |= AES_MR_CFBS_128b; }else if (dd->flags &AES_FLAGS_OFB ) { valmr |=AES_MR_OPMOD_OFB ; }else if (dd->flags &AES_FLAGS_CTR ) {
@@ -423,7 +524,7 @@ static int atmel_aes_write_ctrl(struct atmel_aes_dev *dd)if (dd->total >ATMEL_AES_DMA_THRESHOLD ) { valmr |=AES_MR_SMOD_IDATAR0 ; -if (dd->flags &AES_FLAGS_DUALBUFF ) +if (dd->caps.has_dualbuff) valmr |=AES_MR_DUALBUFF ; }else { valmr |=AES_MR_SMOD_AUTO ;
@@ -477,7 +578,9 @@ static int atmel_aes_handle_queue(struct atmel_aes_dev *dd,/* assign new request to device */ dd->req = req; dd->total = req->nbytes; + dd->in_offset =0 ; dd->in_sg = req->src; + dd->out_offset =0 ; dd->out_sg = req->dst; rctx =ablkcipher_request_ctx (req);
@@ -506,18 +609,86 @@ static int atmel_aes_handle_queue(struct atmel_aes_dev *dd,static int atmel_aes_crypt_dma_stop (struct atmel_aes_dev *dd) {int err = -EINVAL ; +size_t count;if (dd->flags &AES_FLAGS_DMA ) { -dma_unmap_sg (dd->dev, dd->out_sg, - dd->nb_out_sg,DMA_FROM_DEVICE ); -dma_unmap_sg (dd->dev, dd->in_sg, - dd->nb_in_sg,DMA_TO_DEVICE ); err =0 ; +if (dd->flags &AES_FLAGS_FAST ) { +dma_unmap_sg (dd->dev, dd->out_sg,1 ,DMA_FROM_DEVICE ); +dma_unmap_sg (dd->dev, dd->in_sg,1 ,DMA_TO_DEVICE ); + }else { +dma_sync_single_for_device (dd->dev, dd->dma_addr_out, + dd->dma_size,DMA_FROM_DEVICE ); + +/* copy data */ + count =atmel_aes_sg_copy (&dd->out_sg, &dd->out_offset, + dd->buf_out, dd->buflen, dd->dma_size,1 ); +if (count != dd->dma_size) { + err = -EINVAL ; +pr_err ("not all data converted: %u\n" , count); + } + } + } + +return err; +} + + +static int atmel_aes_buff_init (struct atmel_aes_dev *dd) +{ +int err = -ENOMEM ; + + dd->buf_in = (void *)__get_free_pages (GFP_KERNEL ,0 ); + dd->buf_out = (void *)__get_free_pages (GFP_KERNEL ,0 ); + dd->buflen =PAGE_SIZE ; + dd->buflen &= ~(AES_BLOCK_SIZE -1 ); + +if (!dd->buf_in || !dd->buf_out) { +dev_err (dd->dev,"unable to alloc pages.\n" ); + goto err_alloc; + } + +/* MAP here */ + dd->dma_addr_in =dma_map_single (dd->dev, dd->buf_in, + dd->buflen,DMA_TO_DEVICE ); +if (dma_mapping_error (dd->dev, dd->dma_addr_in)) { +dev_err (dd->dev,"dma %d bytes error\n" , dd->buflen); + err = -EINVAL ; + goto err_map_in; + } + + dd->dma_addr_out =dma_map_single (dd->dev, dd->buf_out, + dd->buflen,DMA_FROM_DEVICE ); +if (dma_mapping_error (dd->dev, dd->dma_addr_out)) { +dev_err (dd->dev,"dma %d bytes error\n" , dd->buflen); + err = -EINVAL ; + goto err_map_out; } +return 0 ; + +err_map_out: +dma_unmap_single (dd->dev, dd->dma_addr_in, dd->buflen, +DMA_TO_DEVICE ); +err_map_in: +free_page ((unsigned long )dd->buf_out); +free_page ((unsigned long )dd->buf_in); +err_alloc: +if (err) +pr_err ("error: %d\n" , err);return err; } +static void atmel_aes_buff_cleanup (struct atmel_aes_dev *dd) +{ +dma_unmap_single (dd->dev, dd->dma_addr_out, dd->buflen, +DMA_FROM_DEVICE ); +dma_unmap_single (dd->dev, dd->dma_addr_in, dd->buflen, +DMA_TO_DEVICE ); +free_page ((unsigned long )dd->buf_out); +free_page ((unsigned long )dd->buf_in); +} +static int atmel_aes_crypt (struct ablkcipher_request *req,unsigned long mode) { struct atmel_aes_ctx *ctx = crypto_ablkcipher_ctx(
@@ -525,9 +696,30 @@ static int atmel_aes_crypt(struct ablkcipher_request *req, unsigned long mode)struct atmel_aes_reqctx *rctx =ablkcipher_request_ctx (req);struct atmel_aes_dev *dd; -if (!IS_ALIGNED (req->nbytes,AES_BLOCK_SIZE )) { -pr_err ("request size is not exact amount of AES blocks\n" ); -return -EINVAL ; +if (mode &AES_FLAGS_CFB8 ) { +if (!IS_ALIGNED (req->nbytes,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 &AES_FLAGS_CFB16 ) { +if (!IS_ALIGNED (req->nbytes,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 &AES_FLAGS_CFB32 ) { +if (!IS_ALIGNED (req->nbytes,CFB32_BLOCK_SIZE )) { +pr_err ("request size is not exact amount of CFB32 blocks\n" ); +return -EINVAL ; + } + ctx->block_size =CFB32_BLOCK_SIZE ; + }else { +if (!IS_ALIGNED (req->nbytes,AES_BLOCK_SIZE )) { +pr_err ("request size is not exact amount of AES blocks\n" ); +return -EINVAL ; + } + ctx->block_size =AES_BLOCK_SIZE ; } dd =atmel_aes_find_dev (ctx);
@@ -551,14 +743,12 @@ static bool atmel_aes_filter(struct dma_chan *chan, void *slave) } } -static int atmel_aes_dma_init (struct atmel_aes_dev *dd) +static int atmel_aes_dma_init (struct atmel_aes_dev *dd, +struct crypto_platform_data *pdata) {int err = -ENOMEM ; -struct aes_platform_data *pdata;dma_cap_mask_t mask_in, mask_out; - pdata = dd->dev->platform_data; -if (pdata && pdata->dma_slave->txdata.dma_dev && pdata->dma_slave->rxdata.dma_dev) {
@@ -568,28 +758,38 @@ static int atmel_aes_dma_init(struct atmel_aes_dev *dd) dd->dma_lch_in.chan =dma_request_channel (mask_in, atmel_aes_filter, &pdata->dma_slave->rxdata); +if (!dd->dma_lch_in.chan) goto err_dma_in; dd->dma_lch_in.dma_conf.direction =DMA_MEM_TO_DEV ; dd->dma_lch_in.dma_conf.dst_addr = dd->phys_base +AES_IDATAR (0 ); - dd->dma_lch_in.dma_conf.src_maxburst =1 ; - dd->dma_lch_in.dma_conf.dst_maxburst =1 ; + dd->dma_lch_in.dma_conf.src_maxburst = dd->caps.max_burst_size; + dd->dma_lch_in.dma_conf.src_addr_width = +DMA_SLAVE_BUSWIDTH_4_BYTES ; + dd->dma_lch_in.dma_conf.dst_maxburst = dd->caps.max_burst_size; + dd->dma_lch_in.dma_conf.dst_addr_width = +DMA_SLAVE_BUSWIDTH_4_BYTES ; dd->dma_lch_in.dma_conf.device_fc = false;dma_cap_zero (mask_out);dma_cap_set (DMA_SLAVE , mask_out); dd->dma_lch_out.chan =dma_request_channel (mask_out, atmel_aes_filter, &pdata->dma_slave->txdata); +if (!dd->dma_lch_out.chan) goto err_dma_out; dd->dma_lch_out.dma_conf.direction =DMA_DEV_TO_MEM ; dd->dma_lch_out.dma_conf.src_addr = dd->phys_base +AES_ODATAR (0 ); - dd->dma_lch_out.dma_conf.src_maxburst =1 ; - dd->dma_lch_out.dma_conf.dst_maxburst =1 ; + dd->dma_lch_out.dma_conf.src_maxburst = dd->caps.max_burst_size; + dd->dma_lch_out.dma_conf.src_addr_width = +DMA_SLAVE_BUSWIDTH_4_BYTES ; + dd->dma_lch_out.dma_conf.dst_maxburst = dd->caps.max_burst_size; + dd->dma_lch_out.dma_conf.dst_addr_width = +DMA_SLAVE_BUSWIDTH_4_BYTES ; dd->dma_lch_out.dma_conf.device_fc = false;return 0 ;
@@ -665,13 +865,13 @@ static int atmel_aes_ofb_decrypt(struct ablkcipher_request *req)static int atmel_aes_cfb_encrypt (struct ablkcipher_request *req) {return atmel_aes_crypt (req, -AES_FLAGS_ENCRYPT |AES_FLAGS_CFB ); +AES_FLAGS_ENCRYPT |AES_FLAGS_CFB |AES_FLAGS_CFB128 ); }static int atmel_aes_cfb_decrypt (struct ablkcipher_request *req) {return atmel_aes_crypt (req, -AES_FLAGS_CFB ); +AES_FLAGS_CFB |AES_FLAGS_CFB128 ); }static int atmel_aes_cfb64_encrypt (struct ablkcipher_request *req)
@@ -753,7 +953,7 @@ static struct crypto_alg aes_algs[] = { .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_ctx), - .cra_alignmask = 0x0, + .cra_alignmask = 0xf, .cra_type = &crypto_ablkcipher_type, .cra_module = THIS_MODULE, .cra_init = atmel_aes_cra_init,
@@ -773,7 +973,7 @@ static struct crypto_alg aes_algs[] = { .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_ctx), - .cra_alignmask = 0x0, + .cra_alignmask = 0xf, .cra_type = &crypto_ablkcipher_type, .cra_module = THIS_MODULE, .cra_init = atmel_aes_cra_init,
@@ -794,7 +994,7 @@ static struct crypto_alg aes_algs[] = { .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_ctx), - .cra_alignmask = 0x0, + .cra_alignmask = 0xf, .cra_type = &crypto_ablkcipher_type, .cra_module = THIS_MODULE, .cra_init = atmel_aes_cra_init,
@@ -815,7 +1015,7 @@ static struct crypto_alg aes_algs[] = { .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_ctx), - .cra_alignmask = 0x0, + .cra_alignmask = 0xf, .cra_type = &crypto_ablkcipher_type, .cra_module = THIS_MODULE, .cra_init = atmel_aes_cra_init,
@@ -836,7 +1036,7 @@ static struct crypto_alg aes_algs[] = { .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_blocksize = CFB32_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_ctx), - .cra_alignmask = 0x0, + .cra_alignmask = 0x3, .cra_type = &crypto_ablkcipher_type, .cra_module = THIS_MODULE, .cra_init = atmel_aes_cra_init,
@@ -857,7 +1057,7 @@ static struct crypto_alg aes_algs[] = { .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_blocksize = CFB16_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_ctx), - .cra_alignmask = 0x0, + .cra_alignmask = 0x1, .cra_type = &crypto_ablkcipher_type, .cra_module = THIS_MODULE, .cra_init = atmel_aes_cra_init,
@@ -899,7 +1099,7 @@ static struct crypto_alg aes_algs[] = { .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct atmel_aes_ctx), - .cra_alignmask = 0x0, + .cra_alignmask = 0xf, .cra_type = &crypto_ablkcipher_type, .cra_module = THIS_MODULE, .cra_init = atmel_aes_cra_init,
@@ -915,15 +1115,14 @@ static struct crypto_alg aes_algs[] = { }, }; -static struct crypto_alg aes_cfb64_alg[] = { -{ +static struct crypto_alg aes_cfb64_alg = { .cra_name ="cfb64(aes)" , .cra_driver_name ="atmel-cfb64-aes" , .cra_priority =100 , .cra_flags =CRYPTO_ALG_TYPE_ABLKCIPHER |CRYPTO_ALG_ASYNC , .cra_blocksize =CFB64_BLOCK_SIZE , .cra_ctxsize =sizeof (struct atmel_aes_ctx ), - .cra_alignmask =0x0 , + .cra_alignmask =0x7 , .cra_type = &crypto_ablkcipher_type, .cra_module =THIS_MODULE , .cra_init = atmel_aes_cra_init,
@@ -936,7 +1135,6 @@ static struct crypto_alg aes_cfb64_alg[] = { .encrypt = atmel_aes_cfb64_encrypt, .decrypt = atmel_aes_cfb64_decrypt, } -}, };static void atmel_aes_queue_task (unsigned long data)
@@ -969,7 +1167,14 @@ static void atmel_aes_done_task(unsigned long data) err = dd->err ? : err;if (dd->total && !err) { - err =atmel_aes_crypt_dma_start (dd); +if (dd->flags &AES_FLAGS_FAST ) { + dd->in_sg =sg_next (dd->in_sg); + dd->out_sg =sg_next (dd->out_sg); +if (!dd->in_sg || !dd->out_sg) + err = -EINVAL ; + } +if (!err) + err =atmel_aes_crypt_dma_start (dd);if (!err)return ;/* DMA started. Not fininishing. */ }
@@ -1003,8 +1208,8 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd)for (i =0 ; i <ARRAY_SIZE (aes_algs); i++)crypto_unregister_alg (&aes_algs[i]); -if (dd->hw_version >=0x130 ) -crypto_unregister_alg (&aes_cfb64_alg[0 ]); +if (dd->caps.has_cfb64) +crypto_unregister_alg (&aes_cfb64_alg); }static int atmel_aes_register_algs (struct atmel_aes_dev *dd)
@@ -1017,10 +1222,8 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) goto err_aes_algs; } -atmel_aes_hw_version_init (dd); - -if (dd->hw_version >=0x130 ) { - err =crypto_register_alg (&aes_cfb64_alg[0 ]); +if (dd->caps.has_cfb64) { + err =crypto_register_alg (&aes_cfb64_alg);if (err) goto err_aes_cfb64_alg; }
@@ -1036,10 +1239,32 @@ err_aes_algs:return err; } +static void atmel_aes_get_cap (struct atmel_aes_dev *dd) +{ + dd->caps.has_dualbuff =0 ; + dd->caps.has_cfb64 =0 ; + dd->caps.max_burst_size =1 ; + +/* keep only major version number */ +switch (dd->hw_version &0xff0 ) { +case 0x130 : + dd->caps.has_dualbuff =1 ; + dd->caps.has_cfb64 =1 ; + dd->caps.max_burst_size =4 ; +break ; +case 0x120 : +break ; +default : +dev_warn (dd->dev, +"Unmanaged aes version, set minimum capabilities\n" ); +break ; + } +} +static int atmel_aes_probe (struct platform_device *pdev) {struct atmel_aes_dev *aes_dd; -struct aes_platform_data *pdata; +struct crypto_platform_data *pdata;struct device *dev = &pdev->dev;struct resource *aes_res;unsigned long aes_phys_size;
@@ -1099,7 +1324,7 @@ static int atmel_aes_probe(struct platform_device *pdev) }/* Initializing the clock */ - aes_dd->iclk =clk_get (&pdev->dev,NULL ); + aes_dd->iclk =clk_get (&pdev->dev,"aes_clk" );if (IS_ERR (aes_dd->iclk)) {dev_err (dev,"clock intialization failed.\n" ); err =PTR_ERR (aes_dd->iclk);
@@ -1113,7 +1338,15 @@ static int atmel_aes_probe(struct platform_device *pdev) goto aes_io_err; } - err =atmel_aes_dma_init (aes_dd); +atmel_aes_hw_version_init (aes_dd); + +atmel_aes_get_cap (aes_dd); + + err =atmel_aes_buff_init (aes_dd); +if (err) + goto err_aes_buff; + + err =atmel_aes_dma_init (aes_dd, pdata);if (err) goto err_aes_dma;
@@ -1135,6 +1368,8 @@ err_algs:spin_unlock (&atmel_aes.lock);atmel_aes_dma_cleanup (aes_dd); err_aes_dma: +atmel_aes_buff_cleanup (aes_dd); +err_aes_buff:iounmap (aes_dd->io_base); aes_io_err:clk_put (aes_dd->iclk);
Signature · 1 line
1.8.1
PATCH v2 3/4 crypto: Atmel TDES driver: add support for latest release of the IP (0x700)
In reply to Nicolas RoyerUpdate from previous IP release (0x600):
- add DMA support (previous IP release use PDC)
---
v2 : no change.
drivers/crypto/atmel-tdes-regs.h | 2 + drivers/crypto/atmel-tdes.c | 394 +++++++++++++++++++++++++++++++++------ 2 files changed, 343 insertions(+), 53 deletions(-)
drivers/crypto/atmel-tdes-regs.h +2 -0
@@ -69,6 +69,8 @@#define TDES_XTEARNDR_XTEA_RNDS_MASK (0x3F << 0)#define TDES_XTEARNDR_XTEA_RNDS_OFFSET 0 +#define TDES_HW_VERSION 0xFC +#define TDES_RPR 0x100#define TDES_RCR 0x104#define TDES_TPR 0x108
drivers/crypto/atmel-tdes.c +341 -53
698 lines not on this page · raw message
Signature · 1 line
1.8.1
PATCH v2 4/4 crypto: Atmel SHA driver: add support for latest release of the IP (0x410)
In reply to Nicolas RoyerUpdates from IP release 0x320 to 0x400:
- add DMA support (previous IP revision use PDC)
- add DMA double input buffer support
- add SHA224 support
Update from IP release 0x400 to 0x410:
- add SHA384 and SHA512 support
---
v2 : no change.
drivers/crypto/Kconfig | 8 +- drivers/crypto/atmel-sha-regs.h | 7 +- drivers/crypto/atmel-sha.c | 586 +++++++++++++++++++++++++++++++++------- 3 files changed, 497 insertions(+), 104 deletions(-)
drivers/crypto/Kconfig +5 -3
@@ -361,15 +361,17 @@ config CRYPTO_DEV_ATMEL_TDES will be called atmel-tdes. config CRYPTO_DEV_ATMEL_SHA - tristate "Support for Atmel SHA1/SHA256 hw accelerator" + tristate "Support for Atmel SHA hw accelerator" depends on ARCH_AT91 select CRYPTO_SHA1 select CRYPTO_SHA256 + select CRYPTO_SHA512 select CRYPTO_ALGAPI help - Some Atmel processors have SHA1/SHA256 hw accelerator. + Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512 + hw accelerator. Select this if you want to use the Atmel module for - SHA1/SHA256 algorithms. + SHA1/SHA224/SHA256/SHA384/SHA512 algorithms. To compile this driver as a module, choose M here: the module will be called atmel-sha.
drivers/crypto/atmel-sha-regs.h +6 -1
@@ -14,10 +14,13 @@#define SHA_MR_MODE_MANUAL 0x0#define SHA_MR_MODE_AUTO 0x1#define SHA_MR_MODE_PDC 0x2 -#define SHA_MR_DUALBUFF (1 << 3)#define SHA_MR_PROCDLY (1 << 4)#define SHA_MR_ALGO_SHA1 (0 << 8)#define SHA_MR_ALGO_SHA256 (1 << 8) +#define SHA_MR_ALGO_SHA384 (2 << 8) +#define SHA_MR_ALGO_SHA512 (3 << 8) +#define SHA_MR_ALGO_SHA224 (4 << 8) +#define SHA_MR_DUALBUFF (1 << 16)#define SHA_IER 0x10#define SHA_IDR 0x14
@@ -33,6 +36,8 @@#define SHA_ISR_URAT_MR (0x2 << 12)#define SHA_ISR_URAT_WO (0x5 << 12) +#define SHA_HW_VERSION 0xFC +#define SHA_TPR 0x108#define SHA_TCR 0x10C#define SHA_TNPR 0x118
drivers/crypto/atmel-sha.c +486 -100
916 lines not on this page · raw message
Signature · 1 line
1.8.1
Quoted 5 lines · Nicolas Royer
Only AES use DMA in AT91SAM9G45 (TDES and SHA use PDC).
However latest Atmel TDES and SHA IP releases use DMA instead of PDC.
--> Atmel TDES and SHA drivers need DMA platform data for those IP releases.
Quoted 7 lines
Goal of this patch is to use the same platform data structure for all Atmel crypto peripherals. This structure contains information about DMA interface.
Signed-off-by Nicolas Royer <[email protected]>Acked-by Nicolas Ferre <[email protected]>Acked-by Eric B?nard <[email protected]>Tested-by Eric B?nard <[email protected]>
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