From 79d8dbf155d4e670b6ac20acbb6b22f02c728da5 Mon Sep 17 00:00:00 2001

From: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

Date: Mon, 28 Nov 2022 12:21:18 +0000

Subject: crypto: qat - relocate qat_algs_alloc_flags()

Git-commit: 79d8dbf155d4e670b6ac20acbb6b22f02c728da5

Patch-mainline: v6.2-rc1

References: jsc#PED-3692

Move qat_algs_alloc_flags() from qat_crypto.h to qat_bl.h as this will

be used also by the compression logic.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

Reviewed-by: Wojciech Ziemba <wojciech.ziemba@intel.com>

Reviewed-by: Adam Guerin <adam.guerin@intel.com>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Acked-by: Torsten Duwe <duwe@suse.de>

---

 drivers/crypto/qat/qat_common/qat_bl.h     | 6 ++++++

 drivers/crypto/qat/qat_common/qat_crypto.h | 5 -----

 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/qat/qat_common/qat_bl.h b/drivers/crypto/qat/qat_common/qat_bl.h

index 0c174fee9e64..5f2ea8f352f7 100644

--- a/drivers/crypto/qat/qat_common/qat_bl.h

+++ b/drivers/crypto/qat/qat_common/qat_bl.h

@@ -2,6 +2,7 @@

 /* Copyright(c) 2014 - 2022 Intel Corporation */

 #ifndef QAT_BL_H

 #define QAT_BL_H

+#include <linux/crypto.h>

 #include <linux/scatterlist.h>

 #include <linux/types.h>

@@ -52,4 +53,9 @@ int qat_bl_sgl_to_bufl(struct adf_accel_dev *accel_dev,

 		       struct qat_sgl_to_bufl_params *params,

 		       gfp_t flags);

+static inline gfp_t qat_algs_alloc_flags(struct crypto_async_request *req)

+{

+	return req->flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : GFP_ATOMIC;

+}

+

 #endif

diff --git a/drivers/crypto/qat/qat_common/qat_crypto.h b/drivers/crypto/qat/qat_common/qat_crypto.h

index 505e881022a7..6a0e961bb9dc 100644

--- a/drivers/crypto/qat/qat_common/qat_crypto.h

+++ b/drivers/crypto/qat/qat_common/qat_crypto.h

@@ -65,9 +65,4 @@ static inline bool adf_hw_dev_has_crypto(struct adf_accel_dev *accel_dev)

 	return true;

 }

-static inline gfp_t qat_algs_alloc_flags(struct crypto_async_request *req)

-{

-	return req->flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : GFP_ATOMIC;

-}

-

 #endif

-- 

2.35.3