Le Fri, Apr 25, 2025 at 04:47:35PM +0300, Ovidiu Panait a écrit :
> Hi,
>
> On 4/25/25 4:30 PM, Corentin Labbe wrote:
> > Le Fri, Apr 25, 2025 at 03:45:16PM +0300, Ovidiu Panait a écrit :
> >> Add IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG) checks before the
> >> fallback counter updates to make sure the code is not included when
> >> debugfs statistics support is not enabled.
> >>
> >> Also, drop the existing ifdef guards, since 'struct sun8i_ce_alg_template'
> >> is always defined, even with CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG disabled.
> >>
> >> Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@xxxxxxxxx>
> >> ---
> >> .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 46 ++++++++++++-------
> >> 1 file changed, 30 insertions(+), 16 deletions(-)
> >>
> >> diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
> >> index f03a8fa7bfa2..433cd18f0b5b 100644
> >> --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
> >> +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
> >> @@ -34,22 +34,30 @@ static int sun8i_ce_cipher_need_fallback(struct skcipher_request *areq)
> >>
> ...
> >> @@ -101,9 +117,7 @@ static int sun8i_ce_cipher_fallback(struct skcipher_request *areq)
> >> algt = container_of(alg, struct sun8i_ce_alg_template,
> >> alg.skcipher.base);
> >>
> >> -#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
> >> algt->stat_fb++;
> >> -#endif
> >
> > Hello
> >
> > You put IS_ENABLED everywhere, but here you remove it, why ?
> > I think you forgot it.
> >
>
> This is already part of an IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)
> block, so no need to add an extra IS_ENABLED() check here. Just the
> ifdef was dropped, as it was not really necessary.
>
> Original code:
>
> if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) {
> struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
> struct sun8i_ce_alg_template *algt __maybe_unused;
>
> algt = container_of(alg, struct sun8i_ce_alg_template,
> alg.skcipher.base);
>
> #ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
> algt->stat_fb++;
> #endif
> }
>
Oups sorry didnt check with enough diff context.
So:
Tested-by: Corentin LABBE <clabbe.montjoie@xxxxxxxxx>
Acked-by: Corentin LABBE <clabbe.montjoie@xxxxxxxxx>
Thanks
Regards
