[PATCH] firmware: qcom-scm: Fix QCOM_SCM configuration

[PATCH] firmware: qcom-scm: Fix QCOM_SCM configuration

[He Ying]

When CONFIG_QCOM_SCM is y while CONFIG_HAVE_ARM_SMCCC
is not set, compiling errors are encountered as follows:

drivers/firmware/qcom_scm-smc.o: In function `__scm_smc_do_quirk':
qcom_scm-smc.c:(.text+0x36): undefined reference to `__arm_smccc_smc'
drivers/firmware/qcom_scm-legacy.o: In function `scm_legacy_call':
qcom_scm-legacy.c:(.text+0xe2): undefined reference to `__arm_smccc_smc'
drivers/firmware/qcom_scm-legacy.o: In function `scm_legacy_call_atomic':
qcom_scm-legacy.c:(.text+0x1f0): undefined reference to `__arm_smccc_smc'

So add dependency on HAVE_ARM_SMCCC in QCOM_SCM configuration.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: He Ying <heying24@huawei.com>
---
 drivers/firmware/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 3f14dffb9669..5dd19dbd67a3 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -237,6 +237,7 @@ config INTEL_STRATIX10_RSU
 config QCOM_SCM
 	bool
 	depends on ARM || ARM64
+	depends on HAVE_ARM_SMCCC
 	select RESET_CONTROLLER
 
 config QCOM_SCM_DOWNLOAD_MODE_DEFAULT
-- 
2.17.1

Re: [PATCH] firmware: qcom-scm: Fix QCOM_SCM configuration

[Greg KH]

On Wed, Mar 31, 2021 at 02:49:41AM -0400, He Ying wrote:
> When CONFIG_QCOM_SCM is y while CONFIG_HAVE_ARM_SMCCC
> is not set, compiling errors are encountered as follows:
> 
> drivers/firmware/qcom_scm-smc.o: In function `__scm_smc_do_quirk':
> qcom_scm-smc.c:(.text+0x36): undefined reference to `__arm_smccc_smc'
> drivers/firmware/qcom_scm-legacy.o: In function `scm_legacy_call':
> qcom_scm-legacy.c:(.text+0xe2): undefined reference to `__arm_smccc_smc'
> drivers/firmware/qcom_scm-legacy.o: In function `scm_legacy_call_atomic':
> qcom_scm-legacy.c:(.text+0x1f0): undefined reference to `__arm_smccc_smc'
> 
> So add dependency on HAVE_ARM_SMCCC in QCOM_SCM configuration.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: He Ying <heying24@huawei.com>
> ---
>  drivers/firmware/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

What commit caused this problem to show up?  Please add a "Fixes:" tag
in here and resend.

thanks,

greg k-h

Re: [PATCH] firmware: qcom-scm: Fix QCOM_SCM configuration

[heying (H)]

Hello,

在 2021/4/2 22:25, Greg KH 写道:
> On Wed, Mar 31, 2021 at 02:49:41AM -0400, He Ying wrote:
>> When CONFIG_QCOM_SCM is y while CONFIG_HAVE_ARM_SMCCC
>> is not set, compiling errors are encountered as follows:
>>
>> drivers/firmware/qcom_scm-smc.o: In function `__scm_smc_do_quirk':
>> qcom_scm-smc.c:(.text+0x36): undefined reference to `__arm_smccc_smc'
>> drivers/firmware/qcom_scm-legacy.o: In function `scm_legacy_call':
>> qcom_scm-legacy.c:(.text+0xe2): undefined reference to `__arm_smccc_smc'
>> drivers/firmware/qcom_scm-legacy.o: In function `scm_legacy_call_atomic':
>> qcom_scm-legacy.c:(.text+0x1f0): undefined reference to `__arm_smccc_smc'
>>
>> So add dependency on HAVE_ARM_SMCCC in QCOM_SCM configuration.
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: He Ying <heying24@huawei.com>
>> ---
>>   drivers/firmware/Kconfig | 1 +
>>   1 file changed, 1 insertion(+)
> What commit caused this problem to show up?  Please add a "Fixes:" tag
> in here and resend.

OK. I'll resend.


Thanks.