diff options
author | Tom Rini <trini@konsulko.com> | 2015-10-30 12:56:58 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-10-30 12:56:58 -0400 |
commit | 588eec2a8603ee8a8e2e913895767c4c02d523af (patch) | |
tree | 6c51f6e969c5ef309d424b87a0295800baefa87a /drivers/crypto/fsl/fsl_hash.c | |
parent | cde7f96109e4d367df51c8fc522acdcd10f2702e (diff) | |
parent | 7ee52af455c2cec7b674d2159806f7e95da8e6a5 (diff) | |
download | talos-obmc-uboot-588eec2a8603ee8a8e2e913895767c4c02d523af.tar.gz talos-obmc-uboot-588eec2a8603ee8a8e2e913895767c4c02d523af.zip |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/crypto/fsl/fsl_hash.c')
-rw-r--r-- | drivers/crypto/fsl/fsl_hash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c index c298404f25..887e88c9ca 100644 --- a/drivers/crypto/fsl/fsl_hash.c +++ b/drivers/crypto/fsl/fsl_hash.c @@ -84,7 +84,7 @@ static int caam_hash_update(void *hash_ctx, const void *buf, enum caam_hash_algos caam_algo) { uint32_t final = 0; - dma_addr_t addr = virt_to_phys((void *)buf); + phys_addr_t addr = virt_to_phys((void *)buf); struct sha_ctx *ctx = hash_ctx; if (ctx->sg_num >= MAX_SG_32) { @@ -93,11 +93,11 @@ static int caam_hash_update(void *hash_ctx, const void *buf, } #ifdef CONFIG_PHYS_64BIT - ctx->sg_tbl[ctx->sg_num].addr_hi = addr >> 32; + sec_out32(&ctx->sg_tbl[ctx->sg_num].addr_hi, (uint32_t)(addr >> 32)); #else - ctx->sg_tbl[ctx->sg_num].addr_hi = 0x0; + sec_out32(&ctx->sg_tbl[ctx->sg_num].addr_hi, 0x0); #endif - ctx->sg_tbl[ctx->sg_num].addr_lo = addr; + sec_out32(&ctx->sg_tbl[ctx->sg_num].addr_lo, (uint32_t)addr); sec_out32(&ctx->sg_tbl[ctx->sg_num].len_flag, (size & SG_ENTRY_LENGTH_MASK)); |