diff options
Diffstat (limited to 'drivers/crypto/caam/caamrng.c')
| -rw-r--r-- | drivers/crypto/caam/caamrng.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index 5d8cfb8bff..ea154913ca 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * caam - Freescale FSL CAAM support for hw_random * @@ -66,7 +67,7 @@ struct buf_data { /* rng per-device context */ struct caam_rng_ctx { - struct device_d *jrdev; + struct device *jrdev; dma_addr_t sh_desc_dma; u32 sh_desc[DESC_RNG_LEN]; unsigned int cur_buf_idx; @@ -77,7 +78,7 @@ struct caam_rng_ctx { static struct caam_rng_ctx *rng_ctx; -static void rng_done(struct device_d *jrdev, u32 *desc, u32 err, void *context) +static void rng_done(struct device *jrdev, u32 *desc, u32 err, void *context) { struct buf_data *bd; @@ -89,22 +90,19 @@ static void rng_done(struct device_d *jrdev, u32 *desc, u32 err, void *context) bd->empty = BUF_NOT_EMPTY; /* Buffer refilled, invalidate cache */ - dma_sync_single_for_cpu(bd->addr, RN_BUF_SIZE, DMA_FROM_DEVICE); - - print_hex_dump_debug("rng refreshed buf@: ", DUMP_PREFIX_OFFSET, - 16, 4, bd->buf, RN_BUF_SIZE, 1); + dma_sync_single_for_cpu(jrdev, bd->addr, RN_BUF_SIZE, DMA_FROM_DEVICE); } static inline int submit_job(struct caam_rng_ctx *ctx, int to_current) { struct buf_data *bd = &ctx->bufs[!(to_current ^ ctx->current_buf)]; - struct device_d *jrdev = ctx->jrdev; + struct device *jrdev = ctx->jrdev; u32 *desc = bd->hw_desc; int err; dev_dbg(jrdev, "submitting job %d\n", !(to_current ^ ctx->current_buf)); - dma_sync_single_for_device((unsigned long)desc, desc_bytes(desc), + dma_sync_single_for_device(jrdev, (unsigned long)desc, desc_bytes(desc), DMA_TO_DEVICE); err = caam_jr_enqueue(jrdev, desc, rng_done, ctx); @@ -182,7 +180,7 @@ static inline int rng_create_sh_desc(struct caam_rng_ctx *ctx) ctx->sh_desc_dma = (dma_addr_t)desc; - dma_sync_single_for_device((unsigned long)desc, desc_bytes(desc), + dma_sync_single_for_device(ctx->jrdev, (unsigned long)desc, desc_bytes(desc), DMA_TO_DEVICE); print_hex_dump_debug("rng shdesc@: ", DUMP_PREFIX_OFFSET, 16, 4, @@ -221,7 +219,7 @@ static int caam_init_buf(struct caam_rng_ctx *ctx, int buf_id) return submit_job(ctx, buf_id == ctx->current_buf); } -static int caam_init_rng(struct caam_rng_ctx *ctx, struct device_d *jrdev) +static int caam_init_rng(struct caam_rng_ctx *ctx, struct device *jrdev) { int err; @@ -241,7 +239,7 @@ static int caam_init_rng(struct caam_rng_ctx *ctx, struct device_d *jrdev) return caam_init_buf(ctx, 1); } -int caam_rng_probe(struct device_d *dev, struct device_d *jrdev) +int caam_rng_probe(struct device *dev, struct device *jrdev) { int err; |