Skip to contentSkip to conversation

cpuidle/firmware: qcom: fix smcc dependencies

PATCH In review Arnd Bergmann 2 participants 2 messages May 29, 2020 CPU idle time management framework

lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 cpuidle/firmware: qcom: fix smcc dependencies

Selecting QCOM_SCM for compile-tests is broken when the smcc firmware is not provided:

drivers/firmware/qcom_scm-smc.o: in function `scm_smc_call':
qcom_scm-smc.c:(.text+0x110): undefined reference to __arm_smccc_smc' drivers/firmware/qcom_scm-legacy.o: in function scm_legacy_call':
qcom_scm-smc.c:(.text+0x1bc): undefined reference to `__arm_smccc_smc'

Add a Kconfig dependency for the QCOM_SCM to make it easier to catch this, and fix the dependency for the newly added ARM_QCOM_SPM_CPUIDLE symbol that triggered it this time.

Fixes a871be6b8eee ("cpuidle: Convert Qualcomm SPM driver to a generic CPUidle driver")
Signed-off-by Arnd Bergmann <[email protected]>

---
As the bug is currently only present in the cpuidle tree, can we merge it through that?

---
 drivers/cpuidle/Kconfig.arm | 3 ++-
 drivers/firmware/Kconfig    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/cpuidle/Kconfig.arm +2 -1
index 51a7e89085c0..6cdcf5698c4c 100644
@@ -97,7 +97,8 @@ config ARM_TEGRA_CPUIDLE
 
 config ARM_QCOM_SPM_CPUIDLE
 	bool "CPU Idle Driver for Qualcomm Subsystem Power Manager (SPM)"
-	depends on (ARCH_QCOM || COMPILE_TEST) && !ARM64
+	depends on ARCH_QCOM || (COMPILE_TEST && HAVE_ARM_SMCCC)
+	depends on ARM
 	select ARM_CPU_SUSPEND
 	select CPU_IDLE_MULTIPLE_DRIVERS
 	select DT_IDLE_STATES
drivers/firmware/Kconfig +1 -0
index fbd785dd0513..297bed30a632 100644
@@ -238,6 +238,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
Signature · 1 line
2.26.2
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Arnd Bergmann

Selecting QCOM_SCM for compile-tests is broken when the smcc firmware is not provided:

drivers/firmware/qcom_scm-smc.o: in function `scm_smc_call':
qcom_scm-smc.c:(.text+0x110): undefined reference to __arm_smccc_smc' drivers/firmware/qcom_scm-legacy.o: in function scm_legacy_call':
qcom_scm-smc.c:(.text+0x1bc): undefined reference to `__arm_smccc_smc'

Add a Kconfig dependency for the QCOM_SCM to make it easier to catch this, and fix the dependency for the newly added ARM_QCOM_SPM_CPUIDLE symbol that triggered it this time.

Quoted 5 lines
Fixes a871be6b8eee ("cpuidle: Convert Qualcomm SPM driver to a generic CPUidle driver")
Signed-off-by Arnd Bergmann <[email protected]>

---
As the bug is currently only present in the cpuidle tree, can we merge it through that?

Sounds good to me.

Acked-by Bjorn Andersson <[email protected]>
Quoted 24 lines
---
 drivers/cpuidle/Kconfig.arm | 3 ++-
 drivers/firmware/Kconfig    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/cpuidle/Kconfig.arm +2 -1
index 51a7e89085c0..6cdcf5698c4c 100644
@@ -97,7 +97,8 @@ config ARM_TEGRA_CPUIDLE
 
 config ARM_QCOM_SPM_CPUIDLE
 	bool "CPU Idle Driver for Qualcomm Subsystem Power Manager (SPM)"
-	depends on (ARCH_QCOM || COMPILE_TEST) && !ARM64
+	depends on ARCH_QCOM || (COMPILE_TEST && HAVE_ARM_SMCCC)
+	depends on ARM
 	select ARM_CPU_SUSPEND
 	select CPU_IDLE_MULTIPLE_DRIVERS
 	select DT_IDLE_STATES
drivers/firmware/Kconfig +0 -0
index fbd785dd0513..297bed30a632 100644

drivers/firmware/Kconfig config INTEL_STRATIX10_RSU · line 241

Quoted 4 lines
drivers/firmware/Kconfig +1 -0
@@ -238,6 +238,7 @@ config INTEL_STRATIX10_RSU
 config QCOM_SCM
 	bool
 	depends on ARM || ARM64
+	depends on HAVE_ARM_SMCCC

While this is correct I wonder if we're not opening up for drivers (such as QCOM_RMTFS_MEM) to be selected without HAVE_ARM_SMCCC and cause an unmet dependency issue.

Regards,
Bjorn

Quoted 6 lines
drivers/firmware/Kconfig +0 -0
 	select RESET_CONTROLLER
 
 config QCOM_SCM_DOWNLOAD_MODE_DEFAULT
Signature · 1 line
2.26.2