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

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

crypto: engine - move crypto engine to its own header 



This patch move the whole crypto engine API to its own header
crypto/engine.h.

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

crypto/crypto_engine.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <linux/err.h>

#include <linux/delay.h>

#include <crypto/engine.h>

#include "internal.h"



#define CRYPTO_ENGINE_MAX_QLEN 10

drivers/crypto/omap-aes.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <crypto/scatterwalk.h>

#include <crypto/aes.h>

#include <crypto/algapi.h>

#include <crypto/engine.h>



#define DST_MAXBURST			4

#define DMA_MIN				(DST_MAXBURST * sizeof(u32))

drivers/crypto/omap-des.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <crypto/scatterwalk.h>

#include <crypto/des.h>

#include <crypto/algapi.h>

#include <crypto/engine.h>



#define DST_MAXBURST			2

include/crypto/algapi.h

+0 −70
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/crypto.h>

#include <linux/list.h>

#include <linux/kernel.h>

#include <linux/kthread.h>

#include <linux/skbuff.h>



struct crypto_aead;
@@ -129,75 +128,6 @@ struct ablkcipher_walk { 
	unsigned int		blocksize;

};



#define ENGINE_NAME_LEN	30

/*

 * struct crypto_engine - crypto hardware engine

 * @name: the engine name

 * @idling: the engine is entering idle state

 * @busy: request pump is busy

 * @running: the engine is on working

 * @cur_req_prepared: current request is prepared

 * @list: link with the global crypto engine list

 * @queue_lock: spinlock to syncronise access to request queue

 * @queue: the crypto queue of the engine

 * @rt: whether this queue is set to run as a realtime task

 * @prepare_crypt_hardware: a request will soon arrive from the queue

 * so the subsystem requests the driver to prepare the hardware

 * by issuing this call

 * @unprepare_crypt_hardware: there are currently no more requests on the

 * queue so the subsystem notifies the driver that it may relax the

 * hardware by issuing this call

 * @prepare_request: do some prepare if need before handle the current request

 * @unprepare_request: undo any work done by prepare_message()

 * @crypt_one_request: do encryption for current request

 * @kworker: thread struct for request pump

 * @kworker_task: pointer to task for request pump kworker thread

 * @pump_requests: work struct for scheduling work to the request pump

 * @priv_data: the engine private data

 * @cur_req: the current request which is on processing

 */

struct crypto_engine {

	char			name[ENGINE_NAME_LEN];

	bool			idling;

	bool			busy;

	bool			running;

	bool			cur_req_prepared;



	struct list_head	list;

	spinlock_t		queue_lock;

	struct crypto_queue	queue;



	bool			rt;



	int (*prepare_crypt_hardware)(struct crypto_engine *engine);

	int (*unprepare_crypt_hardware)(struct crypto_engine *engine);



	int (*prepare_request)(struct crypto_engine *engine,

			       struct ablkcipher_request *req);

	int (*unprepare_request)(struct crypto_engine *engine,

				 struct ablkcipher_request *req);

	int (*crypt_one_request)(struct crypto_engine *engine,

				 struct ablkcipher_request *req);



	struct kthread_worker           kworker;

	struct task_struct              *kworker_task;

	struct kthread_work             pump_requests;



	void				*priv_data;

	struct ablkcipher_request	*cur_req;

};



int crypto_transfer_request(struct crypto_engine *engine,

			    struct ablkcipher_request *req, bool need_pump);

int crypto_transfer_request_to_engine(struct crypto_engine *engine,

				      struct ablkcipher_request *req);

void crypto_finalize_request(struct crypto_engine *engine,

			     struct ablkcipher_request *req, int err);

int crypto_engine_start(struct crypto_engine *engine);

int crypto_engine_stop(struct crypto_engine *engine);

struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt);

int crypto_engine_exit(struct crypto_engine *engine);



extern const struct crypto_type crypto_ablkcipher_type;

extern const struct crypto_type crypto_blkcipher_type;

include/crypto/engine.h

0 → 100644
+90 −0
Original line number Diff line number Diff line 
/*

 * Crypto engine API

 *

 * Copyright (c) 2016 Baolin Wang <baolin.wang@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the Free

 * Software Foundation; either version 2 of the License, or (at your option)

 * any later version.

 *

 */

#ifndef _CRYPTO_ENGINE_H

#define _CRYPTO_ENGINE_H



#include <linux/crypto.h>

#include <linux/list.h>

#include <linux/kernel.h>

#include <linux/kthread.h>

#include <crypto/algapi.h>



#define ENGINE_NAME_LEN	30

/*

 * struct crypto_engine - crypto hardware engine

 * @name: the engine name

 * @idling: the engine is entering idle state

 * @busy: request pump is busy

 * @running: the engine is on working

 * @cur_req_prepared: current request is prepared

 * @list: link with the global crypto engine list

 * @queue_lock: spinlock to syncronise access to request queue

 * @queue: the crypto queue of the engine

 * @rt: whether this queue is set to run as a realtime task

 * @prepare_crypt_hardware: a request will soon arrive from the queue

 * so the subsystem requests the driver to prepare the hardware

 * by issuing this call

 * @unprepare_crypt_hardware: there are currently no more requests on the

 * queue so the subsystem notifies the driver that it may relax the

 * hardware by issuing this call

 * @prepare_request: do some prepare if need before handle the current request

 * @unprepare_request: undo any work done by prepare_message()

 * @crypt_one_request: do encryption for current request

 * @kworker: thread struct for request pump

 * @kworker_task: pointer to task for request pump kworker thread

 * @pump_requests: work struct for scheduling work to the request pump

 * @priv_data: the engine private data

 * @cur_req: the current request which is on processing

 */

struct crypto_engine {

	char			name[ENGINE_NAME_LEN];

	bool			idling;

	bool			busy;

	bool			running;

	bool			cur_req_prepared;



	struct list_head	list;

	spinlock_t		queue_lock;

	struct crypto_queue	queue;



	bool			rt;



	int (*prepare_crypt_hardware)(struct crypto_engine *engine);

	int (*unprepare_crypt_hardware)(struct crypto_engine *engine);



	int (*prepare_request)(struct crypto_engine *engine,

			       struct ablkcipher_request *req);

	int (*unprepare_request)(struct crypto_engine *engine,

				 struct ablkcipher_request *req);

	int (*crypt_one_request)(struct crypto_engine *engine,

				 struct ablkcipher_request *req);



	struct kthread_worker           kworker;

	struct task_struct              *kworker_task;

	struct kthread_work             pump_requests;



	void				*priv_data;

	struct ablkcipher_request	*cur_req;

};



int crypto_transfer_request(struct crypto_engine *engine,

			    struct ablkcipher_request *req, bool need_pump);

int crypto_transfer_request_to_engine(struct crypto_engine *engine,

				      struct ablkcipher_request *req);

void crypto_finalize_request(struct crypto_engine *engine,

			     struct ablkcipher_request *req, int err);

int crypto_engine_start(struct crypto_engine *engine);

int crypto_engine_stop(struct crypto_engine *engine);

struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt);

int crypto_engine_exit(struct crypto_engine *engine);



#endif /* _CRYPTO_ENGINE_H */