diff options
Diffstat (limited to 'drivers/crypto/caam/caam-blobgen.c')
| -rw-r--r-- | drivers/crypto/caam/caam-blobgen.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/drivers/crypto/caam/caam-blobgen.c b/drivers/crypto/caam/caam-blobgen.c index acbe5a110d..1ce636a716 100644 --- a/drivers/crypto/caam/caam-blobgen.c +++ b/drivers/crypto/caam/caam-blobgen.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2015 Pengutronix, Steffen Trumtrar <kernel@pengutronix.de> - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License version 2 as published by the - * Free Software Foundation. */ #include <common.h> #include <asm/io.h> @@ -91,7 +88,7 @@ static void jr_jobdesc_blob_encap(struct blob_priv *ctx, u8 modlen, u16 input_si append_operation(desc, OP_TYPE_ENCAP_PROTOCOL | OP_PCLID_BLOB); } -static void blob_job_done(struct device_d *dev, u32 *desc, u32 err, void *arg) +static void blob_job_done(struct device *dev, u32 *desc, u32 err, void *arg) { struct blob_job_result *res = arg; @@ -109,7 +106,7 @@ static int caam_blob_decrypt(struct blobgen *bg, const char *modifier, int *plainsize) { struct blob_priv *ctx = to_blob_priv(bg); - struct device_d *jrdev = bg->dev.parent; + struct device *jrdev = bg->dev.parent; struct blob_job_result testres; int modifier_len = strlen(modifier); u32 *desc = ctx->desc; @@ -132,14 +129,14 @@ static int caam_blob_decrypt(struct blobgen *bg, const char *modifier, jr_jobdesc_blob_decap(ctx, modifier_len, blobsize); - 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); - dma_sync_single_for_device((unsigned long)modifier, modifier_len, + dma_sync_single_for_device(jrdev, (unsigned long)modifier, modifier_len, DMA_TO_DEVICE); - dma_sync_single_for_device((unsigned long)*plain, *plainsize, + dma_sync_single_for_device(jrdev, (unsigned long)*plain, *plainsize, DMA_FROM_DEVICE); - dma_sync_single_for_device((unsigned long)blob, blobsize, + dma_sync_single_for_device(jrdev, (unsigned long)blob, blobsize, DMA_TO_DEVICE); testres.err = 0; @@ -150,11 +147,11 @@ static int caam_blob_decrypt(struct blobgen *bg, const char *modifier, ret = testres.err; - dma_sync_single_for_cpu((unsigned long)modifier, modifier_len, + dma_sync_single_for_cpu(jrdev, (unsigned long)modifier, modifier_len, DMA_TO_DEVICE); - dma_sync_single_for_cpu((unsigned long)*plain, *plainsize, + dma_sync_single_for_cpu(jrdev, (unsigned long)*plain, *plainsize, DMA_FROM_DEVICE); - dma_sync_single_for_cpu((unsigned long)blob, blobsize, + dma_sync_single_for_cpu(jrdev, (unsigned long)blob, blobsize, DMA_TO_DEVICE); return ret; @@ -165,7 +162,7 @@ static int caam_blob_encrypt(struct blobgen *bg, const char *modifier, int *blobsize) { struct blob_priv *ctx = to_blob_priv(bg); - struct device_d *jrdev = bg->dev.parent; + struct device *jrdev = bg->dev.parent; struct blob_job_result testres; int modifier_len = strlen(modifier); u32 *desc = ctx->desc; @@ -181,14 +178,14 @@ static int caam_blob_encrypt(struct blobgen *bg, const char *modifier, jr_jobdesc_blob_encap(ctx, modifier_len, plainsize); - 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); - dma_sync_single_for_device((unsigned long)modifier, modifier_len, + dma_sync_single_for_device(jrdev, (unsigned long)modifier, modifier_len, DMA_TO_DEVICE); - dma_sync_single_for_device((unsigned long)plain, plainsize, + dma_sync_single_for_device(jrdev, (unsigned long)plain, plainsize, DMA_TO_DEVICE); - dma_sync_single_for_device((unsigned long)blob, *blobsize, + dma_sync_single_for_device(jrdev, (unsigned long)blob, *blobsize, DMA_FROM_DEVICE); testres.err = 0; @@ -199,17 +196,17 @@ static int caam_blob_encrypt(struct blobgen *bg, const char *modifier, ret = testres.err; - dma_sync_single_for_cpu((unsigned long)modifier, modifier_len, + dma_sync_single_for_cpu(jrdev, (unsigned long)modifier, modifier_len, DMA_TO_DEVICE); - dma_sync_single_for_cpu((unsigned long)plain, plainsize, + dma_sync_single_for_cpu(jrdev, (unsigned long)plain, plainsize, DMA_TO_DEVICE); - dma_sync_single_for_cpu((unsigned long)blob, *blobsize, + dma_sync_single_for_cpu(jrdev, (unsigned long)blob, *blobsize, DMA_FROM_DEVICE); return ret; } -int caam_blob_gen_probe(struct device_d *dev, struct device_d *jrdev) +int caam_blob_gen_probe(struct device *dev, struct device *jrdev) { struct blob_priv *ctx; struct blobgen *bg; |