Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 22:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: talitos - Add a helper function to clear j_extent field

Browse Source 
j_extent field is specific to SEC2 so we add a helper function to clear it
so that SEC1 can redefine that function as nop

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
LEROY Christophe 2015-04-17 16:31:55 +02:00 committed by Herbert Xu
parent edc6bd698a
commit 185eb79f6a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/crypto/talitos.c
View File

@ -61,6 +61,11 @@ static void to_talitos_ptr(struct talitos_ptr *ptr, dma_addr_t dma_addr)
ptr->eptr = upper_32_bits(dma_addr); ptr->eptr = upper_32_bits(dma_addr);
} }
static void to_talitos_ptr_extent_clear(struct talitos_ptr *ptr)
{
ptr->j_extent = 0;
}
/* /*
* map virtual single (contiguous) pointer to h/w descriptor pointer * map virtual single (contiguous) pointer to h/w descriptor pointer
*/ */
@ -1372,7 +1377,7 @@ int map_sg_in_talitos_ptr(struct device *dev, struct scatterlist *src,
int sg_count; int sg_count;
ptr->len = cpu_to_be16(len); ptr->len = cpu_to_be16(len);
ptr->j_extent = 0; to_talitos_ptr_extent_clear(ptr);
sg_count = talitos_map_sg(dev, src, edesc->src_nents ? : 1, dir, sg_count = talitos_map_sg(dev, src, edesc->src_nents ? : 1, dir,
edesc->src_chained); edesc->src_chained);
@ -1402,7 +1407,7 @@ void map_sg_out_talitos_ptr(struct device *dev, struct scatterlist *dst,
struct talitos_ptr *ptr, int sg_count) struct talitos_ptr *ptr, int sg_count)
{ {
ptr->len = cpu_to_be16(len); ptr->len = cpu_to_be16(len);
ptr->j_extent = 0; to_talitos_ptr_extent_clear(ptr);
if (dir != DMA_NONE) if (dir != DMA_NONE)
sg_count = talitos_map_sg(dev, dst, edesc->dst_nents ? : 1, sg_count = talitos_map_sg(dev, dst, edesc->dst_nents ? : 1,
@ -1444,7 +1449,7 @@ static int common_nonsnoop(struct talitos_edesc *edesc,
/* cipher iv */ /* cipher iv */
to_talitos_ptr(&desc->ptr[1], edesc->iv_dma); to_talitos_ptr(&desc->ptr[1], edesc->iv_dma);
desc->ptr[1].len = cpu_to_be16(ivsize); desc->ptr[1].len = cpu_to_be16(ivsize);
desc->ptr[1].j_extent = 0; to_talitos_ptr_extent_clear(&desc->ptr[1]);
/* cipher key */ /* cipher key */
map_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen, map_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen,