Re: [PATCH -next] crypto: hisilicon - Fix build error

[Arnd Bergmann]

On Mon, Mar 30, 2020 at 10:39 AM YueHaibing <yuehaibing@xxxxxxxxxx> wrote:
>
> When UACCE is m, CRYPTO_DEV_HISI_QM cannot be built-in.
> But CRYPTO_DEV_HISI_QM is selected by CRYPTO_DEV_HISI_SEC2
> and CRYPTO_DEV_HISI_HPRE unconditionally, which may leads this:
>
> drivers/crypto/hisilicon/qm.o: In function 'qm_alloc_uacce':
> drivers/crypto/hisilicon/qm.c:1579: undefined reference to 'uacce_alloc'
>
> Add Kconfig dependency to enforce usable configurations.
>
> Fixes: 47c16b449921 ("crypto: hisilicon - qm depends on UACCE")
> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>

Looks correct to me (based on having fixed many similar issues is other
places, not because of specific knowledge on this driver).

Reviewed-by: Arnd Bergmann <arnd@xxxxxxxx>

> ---
>  drivers/crypto/hisilicon/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kconfig
> index 095850d01dcc..f09c6cf7823e 100644
> --- a/drivers/crypto/hisilicon/Kconfig
> +++ b/drivers/crypto/hisilicon/Kconfig
> @@ -27,6 +27,7 @@ config CRYPTO_DEV_HISI_SEC2
>         select CRYPTO_SHA256
>         select CRYPTO_SHA512
>         depends on PCI && PCI_MSI
> +       depends on UACCE || UACCE=n
>         depends on ARM64 || (COMPILE_TEST && 64BIT)
>         help
>           Support for HiSilicon SEC Engine of version 2 in crypto subsystem.
> @@ -58,6 +59,7 @@ config CRYPTO_DEV_HISI_ZIP
>  config CRYPTO_DEV_HISI_HPRE
>         tristate "Support for HISI HPRE accelerator"
>         depends on PCI && PCI_MSI
> +       depends on UACCE || UACCE=n
>         depends on ARM64 || (COMPILE_TEST && 64BIT)
>         select CRYPTO_DEV_HISI_QM
>         select CRYPTO_DH
> --
> 2.17.1
>
>