Re: [PATCH v4 05/20] drivers: crypto: meson: move get_engine_number()

neil.armstrong
2024-02-12T17:11:47Z

On 12/02/2024 14:50, Alexey Romanov wrote:
> Move get_engine_number() function from cipher.c to core.c
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> ---
> drivers/crypto/amlogic/amlogic-gxl-cipher.c | 9 ++-------
> drivers/crypto/amlogic/amlogic-gxl-core.c | 5 +++++
> drivers/crypto/amlogic/amlogic-gxl.h | 2 ++
> 3 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> index 1fe916b0a138..18e9e2d39b1f 100644
> --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> @@ -17,11 +17,6 @@
> #include <crypto/internal/skcipher.h>
> #include "amlogic-gxl.h"
>
> -static int get_engine_number(struct meson_dev *mc)
> -{
> - return atomic_inc_return(&mc->flow) % mc->flow_cnt;
> -}
> -
> static bool meson_cipher_need_fallback(struct skcipher_request *areq)
> {
> struct scatterlist *src_sg = areq->src;
> @@ -282,7 +277,7 @@ int meson_skdecrypt(struct skcipher_request *areq)
> rctx->op_dir = MESON_DECRYPT;
> if (meson_cipher_need_fallback(areq))
> return meson_cipher_do_fallback(areq);
> - e = get_engine_number(op->mc);
> + e = meson_get_engine_number(op->mc);
> engine = op->mc->chanlist[e].engine;
> rctx->flow = e;
>
> @@ -300,7 +295,7 @@ int meson_skencrypt(struct skcipher_request *areq)
> rctx->op_dir = MESON_ENCRYPT;
> if (meson_cipher_need_fallback(areq))
> return meson_cipher_do_fallback(areq);
> - e = get_engine_number(op->mc);
> + e = meson_get_engine_number(op->mc);
> engine = op->mc->chanlist[e].engine;
> rctx->flow = e;
>
> diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
> index 372c30f72072..51291fdcf8b6 100644
> --- a/drivers/crypto/amlogic/amlogic-gxl-core.c
> +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
> @@ -23,6 +23,11 @@
>
> #include "amlogic-gxl.h"
>
> +int meson_get_engine_number(struct meson_dev *mc)
> +{
> + return atomic_inc_return(&mc->flow) % mc->flow_cnt;
> +}
> +
> void meson_dma_start(struct meson_dev *mc, int flow)
> {
> u32 offset = (mc->pdata->descs_reg + flow) << 2;
> diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
> index 59fc6a67e0a9..5f5e3115fcdf 100644
> --- a/drivers/crypto/amlogic/amlogic-gxl.h
> +++ b/drivers/crypto/amlogic/amlogic-gxl.h
> @@ -163,6 +163,8 @@ struct meson_alg_template {
> #endif
> };
>
> +int meson_get_engine_number(struct meson_dev *mc);
> +
> void meson_dma_start(struct meson_dev *mc, int flow);
>
> int meson_enqueue(struct crypto_async_request *areq, u32 type);

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>