| Message ID | 20200330083643.28824-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | [-next] crypto: hisilicon - Fix build error | expand |
On Mon, Mar 30, 2020 at 10:39 AM YueHaibing <yuehaibing@huawei.com> 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@huawei.com> 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@arndb.de> > --- > 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 > >
On 2020/3/30 16:36, YueHaibing 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@huawei.com> Forgot to do the same thing like ZIP. Thanks for fixing this :) so Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com> Best, Zhou > --- > 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 >
On Mon, Mar 30, 2020 at 04:36:43PM +0800, YueHaibing 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@huawei.com> > --- > drivers/crypto/hisilicon/Kconfig | 2 ++ > 1 file changed, 2 insertions(+) Patch applied. Thanks.
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
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@huawei.com> --- drivers/crypto/hisilicon/Kconfig | 2 ++ 1 file changed, 2 insertions(+)