Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   He Ying <heying24@huawei.com>
To:     <gregkh@linuxfoundation.org>, <nsaenzjulienne@suse.de>,
        <sudeep.holla@arm.com>, <linus.walleij@linaro.org>,
        <robh@kernel.org>, <john.stultz@linaro.org>,
        <colin.king@canonical.com>
CC:     <heying24@huawei.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] firmware: qcom-scm: Fix QCOM_SCM configuration
Date:   Wed, 31 Mar 2021 02:49:41 -0400
Message-ID: <20210331064941.134333-1-heying24@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

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