crypto: atmel-tdes - simplify fast path in crypt_start
Subsystems (2)
PATCH 1/4 crypto: atmel-tdes - simplify fast path in crypt_start
Fold all fast path conditions into a single boolean expression and drop any redundant checks.
--- drivers/crypto/atmel-tdes.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
drivers/crypto/atmel-tdes.c +9 -15
@@ -451,25 +451,19 @@ static int atmel_tdes_crypt_dma(struct atmel_tdes_dev *dd,static int atmel_tdes_crypt_start (struct atmel_tdes_dev *dd) { -int err, fast =0 , in, out; +bool fast; +int err;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 (dd->in_sg->length != dd->out_sg->length) - fast =0 ; - } - + fast = !dd->in_offset && !dd->out_offset && + dd->in_sg->length == dd->out_sg->length && +IS_ALIGNED (dd->in_sg->offset,sizeof (u32)) && +IS_ALIGNED (dd->out_sg->offset,sizeof (u32)) && +IS_ALIGNED (dd->in_sg->length, dd->ctx->block_size); -if (fast) { - count =min_t (size_t, dd->total, dd->in_sg->length); +if (fast) { + count =min (dd->total, dd->in_sg->length); err =dma_map_sg (dd->dev, dd->in_sg,1 ,DMA_TO_DEVICE );if (!err) {
PATCH 2/4 crypto: atmel-tdes - use __get_free_page in buff_init
Replace __get_free_pages(..., 0) with __get_free_page().
--- drivers/crypto/atmel-tdes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/atmel-tdes.c +2 -2
@@ -313,8 +313,8 @@ static int atmel_tdes_buff_init(struct atmel_tdes_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->buf_in = (void *)__get_free_page (GFP_KERNEL ); + dd->buf_out = (void *)__get_free_page (GFP_KERNEL ); dd->buflen =PAGE_SIZE ; dd->buflen &= ~(DES_BLOCK_SIZE -1 );
PATCH 3/4 crypto: atmel-tdes - drop redundant return variable in crypt_pdc_stop
In reply to Thorsten BlumIn atmel_tdes_crypt_pdc_stop(), remove the redundant return variable and return the error directly.
--- drivers/crypto/atmel-tdes.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/crypto/atmel-tdes.c +2 -4
@@ -285,7 +285,6 @@ static int atmel_tdes_write_ctrl(struct atmel_tdes_dev *dd)static int atmel_tdes_crypt_pdc_stop (struct atmel_tdes_dev *dd) { -int err =0 ;size_t count;atmel_tdes_write (dd,TDES_PTCR ,TDES_PTCR_TXTDIS |TDES_PTCR_RXTDIS );
@@ -297,16 +296,15 @@ static int atmel_tdes_crypt_pdc_stop(struct atmel_tdes_dev *dd)dma_sync_single_for_cpu (dd->dev, dd->dma_addr_out, dd->dma_size,DMA_FROM_DEVICE ); -/* copy data */ count =atmel_tdes_sg_copy (&dd->out_sg, &dd->out_offset, dd->buf_out, dd->buflen, dd->dma_size,1 );if (count != dd->dma_size) { - err = -EINVAL ;dev_dbg (dd->dev,"not all data converted: %zu\n" , count); +return -EINVAL ; } } -return err; +return 0 ; }static int atmel_tdes_buff_init (struct atmel_tdes_dev *dd)
PATCH 4/4 crypto: atmel-tdes - drop redundant if check in crypt_dma_stop
In reply to Thorsten BlumThe call site already checks dd->flags & TDES_FLAGS_DMA before calling atmel_tdes_crypt_dma_stop(). Remove the redundant check, return early on error, and drop the now-obsolete return variable.
--- drivers/crypto/atmel-tdes.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
drivers/crypto/atmel-tdes.c +15 -18
@@ -601,28 +601,25 @@ static int atmel_tdes_handle_queue(struct atmel_tdes_dev *dd,static int atmel_tdes_crypt_dma_stop (struct atmel_tdes_dev *dd) { -int err = -EINVAL ;size_t count; -if (dd->flags &TDES_FLAGS_DMA ) { - err =0 ; -if (dd->flags &TDES_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_cpu (dd->dev, dd->dma_addr_out, - dd->dma_size,DMA_FROM_DEVICE ); - -/* copy data */ - count =atmel_tdes_sg_copy (&dd->out_sg, &dd->out_offset, - dd->buf_out, dd->buflen, dd->dma_size,1 ); -if (count != dd->dma_size) { - err = -EINVAL ; -dev_dbg (dd->dev,"not all data converted: %zu\n" , count); - } +if (dd->flags &TDES_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_cpu (dd->dev, dd->dma_addr_out, dd->dma_size, +DMA_FROM_DEVICE ); + + count =atmel_tdes_sg_copy (&dd->out_sg, &dd->out_offset, + dd->buf_out, dd->buflen, + dd->dma_size,1 ); +if (count != dd->dma_size) { +dev_dbg (dd->dev,"not all data converted: %zu\n" , count); +return -EINVAL ; } } -return err; + +return 0 ; }static int atmel_tdes_crypt (struct skcipher_request *req,unsigned long mode)
Herbert Xu
maintainerQuoted 7 lines · Thorsten Blum
Fold all fast path conditions into a single boolean expression and drop any redundant checks.
Signed-off-by Thorsten Blum <[email protected]>--- drivers/crypto/atmel-tdes.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 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