aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorHoria Geant? <horia.geanta@freescale.com>2015-05-11 13:04:56 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-05-12 22:31:57 -0400
commit42e8b0d7fed0628e21ec93e8cd547aef616e68f7 (patch)
treee004f86bc55d0faa641a7f520df01319bc7e24ae /drivers/crypto
parentbde9079f3cd5e4275be2169cf7b0c74bfb464f78 (diff)
crypto: talitos - static code checker fixes
-change req_ctx->nbuf from u64 to unsigned int to silence checker warnings; this is safe since nbuf value is <= HASH_MAX_BLOCK_SIZE -remove unused value read from TALITOS_CCPSR; there is no requirement to read upper 32b before reading lower 32b of a 64b register; SEC RM mentions: "reads can always be done by byte, word, or dword" -remove unused return value of sg_to_link_tbl() -change "len" parameter of map_single_talitos_ptr() and to_talitos_ptr_len() to unsigned int; later, cpu_to_be16 will __force downcast the value to unsigned short without any checker warning Signed-off-by: Horia Geanta <horia.geanta@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/talitos.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index ba5f68b987ab..83aca95a95bc 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -63,7 +63,7 @@ static void to_talitos_ptr(struct talitos_ptr *ptr, dma_addr_t dma_addr,
63 ptr->eptr = upper_32_bits(dma_addr); 63 ptr->eptr = upper_32_bits(dma_addr);
64} 64}
65 65
66static void to_talitos_ptr_len(struct talitos_ptr *ptr, unsigned short len, 66static void to_talitos_ptr_len(struct talitos_ptr *ptr, unsigned int len,
67 bool is_sec1) 67 bool is_sec1)
68{ 68{
69 if (is_sec1) { 69 if (is_sec1) {
@@ -94,7 +94,7 @@ static void to_talitos_ptr_extent_clear(struct talitos_ptr *ptr, bool is_sec1)
94 */ 94 */
95static void map_single_talitos_ptr(struct device *dev, 95static void map_single_talitos_ptr(struct device *dev,
96 struct talitos_ptr *ptr, 96 struct talitos_ptr *ptr,
97 unsigned short len, void *data, 97 unsigned int len, void *data,
98 enum dma_data_direction dir) 98 enum dma_data_direction dir)
99{ 99{
100 dma_addr_t dma_addr = dma_map_single(dev, data, len, dir); 100 dma_addr_t dma_addr = dma_map_single(dev, data, len, dir);
@@ -543,7 +543,7 @@ static void talitos_error(struct device *dev, u32 isr, u32 isr_lo)
543 struct talitos_private *priv = dev_get_drvdata(dev); 543 struct talitos_private *priv = dev_get_drvdata(dev);
544 unsigned int timeout = TALITOS_TIMEOUT; 544 unsigned int timeout = TALITOS_TIMEOUT;
545 int ch, error, reset_dev = 0; 545 int ch, error, reset_dev = 0;
546 u32 v, v_lo; 546 u32 v_lo;
547 bool is_sec1 = has_ftr_sec1(priv); 547 bool is_sec1 = has_ftr_sec1(priv);
548 int reset_ch = is_sec1 ? 1 : 0; /* only SEC2 supports continuation */ 548 int reset_ch = is_sec1 ? 1 : 0; /* only SEC2 supports continuation */
549 549
@@ -560,7 +560,6 @@ static void talitos_error(struct device *dev, u32 isr, u32 isr_lo)
560 560
561 error = -EINVAL; 561 error = -EINVAL;
562 562
563 v = in_be32(priv->chan[ch].reg + TALITOS_CCPSR);
564 v_lo = in_be32(priv->chan[ch].reg + TALITOS_CCPSR_LO); 563 v_lo = in_be32(priv->chan[ch].reg + TALITOS_CCPSR_LO);
565 564
566 if (v_lo & TALITOS_CCPSR_LO_DOF) { 565 if (v_lo & TALITOS_CCPSR_LO_DOF) {
@@ -815,7 +814,7 @@ struct talitos_ahash_req_ctx {
815 unsigned int first; 814 unsigned int first;
816 unsigned int last; 815 unsigned int last;
817 unsigned int to_hash_later; 816 unsigned int to_hash_later;
818 u64 nbuf; 817 unsigned int nbuf;
819 struct scatterlist bufsl[2]; 818 struct scatterlist bufsl[2];
820 struct scatterlist *psrc; 819 struct scatterlist *psrc;
821}; 820};
@@ -1639,8 +1638,7 @@ void map_sg_out_talitos_ptr(struct device *dev, struct scatterlist *dst,
1639 (edesc->src_nents + 1) * 1638 (edesc->src_nents + 1) *
1640 sizeof(struct talitos_ptr), 0); 1639 sizeof(struct talitos_ptr), 0);
1641 ptr->j_extent |= DESC_PTR_LNKTBL_JUMP; 1640 ptr->j_extent |= DESC_PTR_LNKTBL_JUMP;
1642 sg_count = sg_to_link_tbl(dst, sg_count, len, 1641 sg_to_link_tbl(dst, sg_count, len, link_tbl_ptr);
1643 link_tbl_ptr);
1644 dma_sync_single_for_device(dev, edesc->dma_link_tbl, 1642 dma_sync_single_for_device(dev, edesc->dma_link_tbl,
1645 edesc->dma_len, 1643 edesc->dma_len,
1646 DMA_BIDIRECTIONAL); 1644 DMA_BIDIRECTIONAL);