Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c21c8b89 authored by Corentin LABBE's avatar Corentin LABBE Committed by Herbert Xu
Browse files

crypto: omap - convert to new crypto engine API 



This patch convert the driver to the new crypto engine API.

Signed-off-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 218d1cc1

drivers/crypto/omap-aes.c

+15 −6
Original line number Original line Diff line number Diff line
@@ -388,7 +388,7 @@ static void omap_aes_finish_req(struct omap_aes_dev *dd, int err) 




	pr_debug("err: %d\n", err);

	pr_debug("err: %d\n", err);





	crypto_finalize_cipher_request(dd->engine, req, err);

	crypto_finalize_ablkcipher_request(dd->engine, req, err);





	pm_runtime_mark_last_busy(dd->dev);

	pm_runtime_mark_last_busy(dd->dev);

	pm_runtime_put_autosuspend(dd->dev);

	pm_runtime_put_autosuspend(dd->dev);
@@ -408,14 +408,15 @@ static int omap_aes_handle_queue(struct omap_aes_dev *dd, 
				 struct ablkcipher_request *req)

				 struct ablkcipher_request *req)

{

{

	if (req)

	if (req)

		return crypto_transfer_cipher_request_to_engine(dd->engine, req);

		return crypto_transfer_ablkcipher_request_to_engine(dd->engine, req);





	return 0;

	return 0;

}

}





static int omap_aes_prepare_req(struct crypto_engine *engine,

static int omap_aes_prepare_req(struct crypto_engine *engine,

				struct ablkcipher_request *req)

				void *areq)

{

{

	struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base);

	struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx(

	struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx(

			crypto_ablkcipher_reqtfm(req));

			crypto_ablkcipher_reqtfm(req));

	struct omap_aes_reqctx *rctx = ablkcipher_request_ctx(req);

	struct omap_aes_reqctx *rctx = ablkcipher_request_ctx(req);
@@ -468,8 +469,9 @@ static int omap_aes_prepare_req(struct crypto_engine *engine, 
}

}





static int omap_aes_crypt_req(struct crypto_engine *engine,

static int omap_aes_crypt_req(struct crypto_engine *engine,

			      struct ablkcipher_request *req)

			      void *areq)

{

{

	struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base);

	struct omap_aes_reqctx *rctx = ablkcipher_request_ctx(req);

	struct omap_aes_reqctx *rctx = ablkcipher_request_ctx(req);

	struct omap_aes_dev *dd = rctx->dd;

	struct omap_aes_dev *dd = rctx->dd;
@@ -601,6 +603,11 @@ static int omap_aes_ctr_decrypt(struct ablkcipher_request *req) 
	return omap_aes_crypt(req, FLAGS_CTR);

	return omap_aes_crypt(req, FLAGS_CTR);

}

}





static int omap_aes_prepare_req(struct crypto_engine *engine,

				void *req);

static int omap_aes_crypt_req(struct crypto_engine *engine,

			      void *req);



static int omap_aes_cra_init(struct crypto_tfm *tfm)

static int omap_aes_cra_init(struct crypto_tfm *tfm)

{

{

	const char *name = crypto_tfm_alg_name(tfm);

	const char *name = crypto_tfm_alg_name(tfm);
@@ -616,6 +623,10 @@ static int omap_aes_cra_init(struct crypto_tfm *tfm) 




	tfm->crt_ablkcipher.reqsize = sizeof(struct omap_aes_reqctx);

	tfm->crt_ablkcipher.reqsize = sizeof(struct omap_aes_reqctx);





	ctx->enginectx.op.prepare_request = omap_aes_prepare_req;

	ctx->enginectx.op.unprepare_request = NULL;

	ctx->enginectx.op.do_one_request = omap_aes_crypt_req;



	return 0;

	return 0;

}

}
@@ -1119,8 +1130,6 @@ static int omap_aes_probe(struct platform_device *pdev) 
		goto err_engine;

		goto err_engine;

	}

	}





	dd->engine->prepare_cipher_request = omap_aes_prepare_req;

	dd->engine->cipher_one_request = omap_aes_crypt_req;

	err = crypto_engine_start(dd->engine);

	err = crypto_engine_start(dd->engine);

	if (err)

	if (err)

		goto err_engine;

		goto err_engine;

drivers/crypto/omap-aes.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,8 @@ 
#ifndef __OMAP_AES_H__

#ifndef __OMAP_AES_H__

#define __OMAP_AES_H__

#define __OMAP_AES_H__





#include <crypto/engine.h>



#define DST_MAXBURST			4

#define DST_MAXBURST			4

#define DMA_MIN				(DST_MAXBURST * sizeof(u32))

#define DMA_MIN				(DST_MAXBURST * sizeof(u32))
@@ -95,6 +97,7 @@ struct omap_aes_gcm_result { 
};

};





struct omap_aes_ctx {

struct omap_aes_ctx {

	struct crypto_engine_ctx enginectx;

	int		keylen;

	int		keylen;

	u32		key[AES_KEYSIZE_256 / sizeof(u32)];

	u32		key[AES_KEYSIZE_256 / sizeof(u32)];

	u8		nonce[4];

	u8		nonce[4];

drivers/crypto/omap-des.c

+18 −6
Original line number Original line Diff line number Diff line
@@ -86,6 +86,7 @@ 
#define FLAGS_OUT_DATA_ST_SHIFT	10

#define FLAGS_OUT_DATA_ST_SHIFT	10





struct omap_des_ctx {

struct omap_des_ctx {

	struct crypto_engine_ctx enginectx;

	struct omap_des_dev *dd;

	struct omap_des_dev *dd;





	int		keylen;

	int		keylen;
@@ -498,7 +499,7 @@ static void omap_des_finish_req(struct omap_des_dev *dd, int err) 




	pr_debug("err: %d\n", err);

	pr_debug("err: %d\n", err);





	crypto_finalize_cipher_request(dd->engine, req, err);

	crypto_finalize_ablkcipher_request(dd->engine, req, err);





	pm_runtime_mark_last_busy(dd->dev);

	pm_runtime_mark_last_busy(dd->dev);

	pm_runtime_put_autosuspend(dd->dev);

	pm_runtime_put_autosuspend(dd->dev);
@@ -520,14 +521,15 @@ static int omap_des_handle_queue(struct omap_des_dev *dd, 
				 struct ablkcipher_request *req)

				 struct ablkcipher_request *req)

{

{

	if (req)

	if (req)

		return crypto_transfer_cipher_request_to_engine(dd->engine, req);

		return crypto_transfer_ablkcipher_request_to_engine(dd->engine, req);





	return 0;

	return 0;

}

}





static int omap_des_prepare_req(struct crypto_engine *engine,

static int omap_des_prepare_req(struct crypto_engine *engine,

				struct ablkcipher_request *req)

				void *areq)

{

{

	struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base);

	struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(

	struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(

			crypto_ablkcipher_reqtfm(req));

			crypto_ablkcipher_reqtfm(req));

	struct omap_des_dev *dd = omap_des_find_dev(ctx);

	struct omap_des_dev *dd = omap_des_find_dev(ctx);
@@ -582,8 +584,9 @@ static int omap_des_prepare_req(struct crypto_engine *engine, 
}

}





static int omap_des_crypt_req(struct crypto_engine *engine,

static int omap_des_crypt_req(struct crypto_engine *engine,

			      struct ablkcipher_request *req)

			      void *areq)

{

{

	struct ablkcipher_request *req = container_of(areq, struct ablkcipher_request, base);

	struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(

	struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(

			crypto_ablkcipher_reqtfm(req));

			crypto_ablkcipher_reqtfm(req));

	struct omap_des_dev *dd = omap_des_find_dev(ctx);

	struct omap_des_dev *dd = omap_des_find_dev(ctx);
@@ -695,12 +698,23 @@ static int omap_des_cbc_decrypt(struct ablkcipher_request *req) 
	return omap_des_crypt(req, FLAGS_CBC);

	return omap_des_crypt(req, FLAGS_CBC);

}

}





static int omap_des_prepare_req(struct crypto_engine *engine,

				void *areq);

static int omap_des_crypt_req(struct crypto_engine *engine,

			      void *areq);



static int omap_des_cra_init(struct crypto_tfm *tfm)

static int omap_des_cra_init(struct crypto_tfm *tfm)

{

{

	struct omap_des_ctx *ctx = crypto_tfm_ctx(tfm);



	pr_debug("enter\n");

	pr_debug("enter\n");





	tfm->crt_ablkcipher.reqsize = sizeof(struct omap_des_reqctx);

	tfm->crt_ablkcipher.reqsize = sizeof(struct omap_des_reqctx);





	ctx->enginectx.op.prepare_request = omap_des_prepare_req;

	ctx->enginectx.op.unprepare_request = NULL;

	ctx->enginectx.op.do_one_request = omap_des_crypt_req;



	return 0;

	return 0;

}

}
@@ -1046,8 +1060,6 @@ static int omap_des_probe(struct platform_device *pdev) 
		goto err_engine;

		goto err_engine;

	}

	}





	dd->engine->prepare_cipher_request = omap_des_prepare_req;

	dd->engine->cipher_one_request = omap_des_crypt_req;

	err = crypto_engine_start(dd->engine);

	err = crypto_engine_start(dd->engine);

	if (err)

	if (err)

		goto err_engine;

		goto err_engine;