Commit 36ebc747 authored by Giovanni Cabiddu's avatar Giovanni Cabiddu Committed by Herbert Xu
Browse files

crypto: qat - generalize crypto request buffers 



The structure qat_crypto_request_buffs which contains the source and
destination buffer lists and correspondent sizes and dma addresses is
also required for the compression service.
Rename it as qat_request_buffs and move it to qat_bl.h.

Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarWojciech Ziemba <wojciech.ziemba@intel.com>
Reviewed-by: default avatarAdam Guerin <adam.guerin@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3ed330d0

drivers/crypto/qat/qat_common/qat_bl.c

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include "qat_crypto.h"



void qat_bl_free_bufl(struct adf_accel_dev *accel_dev,

		      struct qat_crypto_request_buffs *buf)

		      struct qat_request_buffs *buf)

{

	struct device *dev = &GET_DEV(accel_dev);

	struct qat_alg_buf_list *bl = buf->bl;
@@ -53,7 +53,7 @@ void qat_bl_free_bufl(struct adf_accel_dev *accel_dev, 
int qat_bl_sgl_to_bufl(struct adf_accel_dev *accel_dev,

		       struct scatterlist *sgl,

		       struct scatterlist *sglout,

		       struct qat_crypto_request_buffs *buf,

		       struct qat_request_buffs *buf,

		       gfp_t flags)

{

	struct device *dev = &GET_DEV(accel_dev);

drivers/crypto/qat/qat_common/qat_bl.h

+35 −3
Original line number Diff line number Diff line
@@ -4,14 +4,46 @@ 
#define QAT_BL_H

#include <linux/scatterlist.h>

#include <linux/types.h>

#include "qat_crypto.h"



#define QAT_MAX_BUFF_DESC	4



struct qat_alg_buf {

	u32 len;

	u32 resrvd;

	u64 addr;

} __packed;



struct qat_alg_buf_list {

	u64 resrvd;

	u32 num_bufs;

	u32 num_mapped_bufs;

	struct qat_alg_buf bufers[];

} __packed;



struct qat_alg_fixed_buf_list {

	struct qat_alg_buf_list sgl_hdr;

	struct qat_alg_buf descriptors[QAT_MAX_BUFF_DESC];

} __packed __aligned(64);



struct qat_request_buffs {

	struct qat_alg_buf_list *bl;

	dma_addr_t blp;

	struct qat_alg_buf_list *blout;

	dma_addr_t bloutp;

	size_t sz;

	size_t sz_out;

	bool sgl_src_valid;

	bool sgl_dst_valid;

	struct qat_alg_fixed_buf_list sgl_src;

	struct qat_alg_fixed_buf_list sgl_dst;

};



void qat_bl_free_bufl(struct adf_accel_dev *accel_dev,

		      struct qat_crypto_request_buffs *buf);

		      struct qat_request_buffs *buf);

int qat_bl_sgl_to_bufl(struct adf_accel_dev *accel_dev,

		       struct scatterlist *sgl,

		       struct scatterlist *sglout,

		       struct qat_crypto_request_buffs *buf,

		       struct qat_request_buffs *buf,

		       gfp_t flags);



#endif

drivers/crypto/qat/qat_common/qat_crypto.h

+2 −34
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/slab.h>

#include "adf_accel_devices.h"

#include "icp_qat_fw_la.h"

#include "qat_bl.h"



struct qat_instance_backlog {

	struct list_head list;
@@ -35,39 +36,6 @@ struct qat_crypto_instance { 
	struct qat_instance_backlog backlog;

};



#define QAT_MAX_BUFF_DESC	4



struct qat_alg_buf {

	u32 len;

	u32 resrvd;

	u64 addr;

} __packed;



struct qat_alg_buf_list {

	u64 resrvd;

	u32 num_bufs;

	u32 num_mapped_bufs;

	struct qat_alg_buf bufers[];

} __packed;



struct qat_alg_fixed_buf_list {

	struct qat_alg_buf_list sgl_hdr;

	struct qat_alg_buf descriptors[QAT_MAX_BUFF_DESC];

} __packed __aligned(64);



struct qat_crypto_request_buffs {

	struct qat_alg_buf_list *bl;

	dma_addr_t blp;

	struct qat_alg_buf_list *blout;

	dma_addr_t bloutp;

	size_t sz;

	size_t sz_out;

	bool sgl_src_valid;

	bool sgl_dst_valid;

	struct qat_alg_fixed_buf_list sgl_src;

	struct qat_alg_fixed_buf_list sgl_dst;

};



struct qat_crypto_request;



struct qat_crypto_request {
@@ -80,7 +48,7 @@ struct qat_crypto_request { 
		struct aead_request *aead_req;

		struct skcipher_request *skcipher_req;

	};

	struct qat_crypto_request_buffs buf;

	struct qat_request_buffs buf;

	void (*cb)(struct icp_qat_fw_la_resp *resp,

		   struct qat_crypto_request *req);

	union {