[PATCH v2] crypto: hisilicon - qm depends on UACCE

[PATCH v2] crypto: hisilicon - qm depends on UACCE

[Zhou Wang]

From: Hongbo Yao <yaohongbo@huawei.com>

If UACCE=m and CRYPTO_DEV_HISI_QM=y, the following error
is seen while building qm.o:

drivers/crypto/hisilicon/qm.o: In function `hisi_qm_init':
(.text+0x23c6): undefined reference to `uacce_alloc'
(.text+0x2474): undefined reference to `uacce_remove'
(.text+0x286b): undefined reference to `uacce_remove'
drivers/crypto/hisilicon/qm.o: In function `hisi_qm_uninit':
(.text+0x2918): undefined reference to `uacce_remove'
make[1]: *** [vmlinux] Error 1
make: *** [autoksyms_recursive] Error 2

This patch fixes the config dependency for QM and ZIP.

reported-by: Hulk Robot <hulkci@huawei.com>
Suggested-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Hongbo Yao <yaohongbo@huawei.com>
Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
---
 drivers/crypto/hisilicon/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kconfig
index 8851161..095850d 100644
--- a/drivers/crypto/hisilicon/Kconfig
+++ b/drivers/crypto/hisilicon/Kconfig
@@ -40,6 +40,7 @@ config CRYPTO_DEV_HISI_QM
 	tristate
 	depends on ARM64 || COMPILE_TEST
 	depends on PCI && PCI_MSI
+	depends on UACCE || UACCE=n
 	help
 	  HiSilicon accelerator engines use a common queue management
 	  interface. Specific engine driver may use this module.
@@ -49,6 +50,7 @@ config CRYPTO_DEV_HISI_ZIP
 	depends on PCI && PCI_MSI
 	depends on ARM64 || (COMPILE_TEST && 64BIT)
 	depends on !CPU_BIG_ENDIAN || COMPILE_TEST
+	depends on UACCE || UACCE=n
 	select CRYPTO_DEV_HISI_QM
 	help
 	  Support for HiSilicon ZIP Driver
-- 
2.8.1

Re: [PATCH v2] crypto: hisilicon - qm depends on UACCE

[Herbert Xu]

On Thu, Feb 27, 2020 at 03:12:28PM +0800, Zhou Wang wrote:
> From: Hongbo Yao <yaohongbo@huawei.com>
> 
> If UACCE=m and CRYPTO_DEV_HISI_QM=y, the following error
> is seen while building qm.o:
> 
> drivers/crypto/hisilicon/qm.o: In function `hisi_qm_init':
> (.text+0x23c6): undefined reference to `uacce_alloc'
> (.text+0x2474): undefined reference to `uacce_remove'
> (.text+0x286b): undefined reference to `uacce_remove'
> drivers/crypto/hisilicon/qm.o: In function `hisi_qm_uninit':
> (.text+0x2918): undefined reference to `uacce_remove'
> make[1]: *** [vmlinux] Error 1
> make: *** [autoksyms_recursive] Error 2
> 
> This patch fixes the config dependency for QM and ZIP.
> 
> reported-by: Hulk Robot <hulkci@huawei.com>
> Suggested-by: Herbert Xu <herbert@gondor.apana.org.au>
> Signed-off-by: Hongbo Yao <yaohongbo@huawei.com>
> Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
> ---
>  drivers/crypto/hisilicon/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH v2] crypto: hisilicon - qm depends on UACCE

[Zhou Wang]

On 2020/3/6 9:51, Herbert Xu wrote:
> On Thu, Feb 27, 2020 at 03:12:28PM +0800, Zhou Wang wrote:
>> From: Hongbo Yao <yaohongbo@huawei.com>
>>
>> If UACCE=m and CRYPTO_DEV_HISI_QM=y, the following error
>> is seen while building qm.o:
>>
>> drivers/crypto/hisilicon/qm.o: In function `hisi_qm_init':
>> (.text+0x23c6): undefined reference to `uacce_alloc'
>> (.text+0x2474): undefined reference to `uacce_remove'
>> (.text+0x286b): undefined reference to `uacce_remove'
>> drivers/crypto/hisilicon/qm.o: In function `hisi_qm_uninit':
>> (.text+0x2918): undefined reference to `uacce_remove'
>> make[1]: *** [vmlinux] Error 1
>> make: *** [autoksyms_recursive] Error 2
>>
>> This patch fixes the config dependency for QM and ZIP.
>>
>> reported-by: Hulk Robot <hulkci@huawei.com>
>> Suggested-by: Herbert Xu <herbert@gondor.apana.org.au>
>> Signed-off-by: Hongbo Yao <yaohongbo@huawei.com>
>> Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
>> ---
>>  drivers/crypto/hisilicon/Kconfig | 2 ++
>>  1 file changed, 2 insertions(+)
> 
> Patch applied.  Thanks.

Thanks and Best,

Zhou

>