Skip to content

Commit 5a897e3

Browse files
committed
firmware: arm_scmi: fix psci dependency
When CONFIG_ARM_PSCI_FW is disabled but CONFIG_HAVE_ARM_SMCCC is enabled, arm-scmi runs into a link failure: arm-linux-gnueabi-ld: drivers/firmware/arm_scmi/smc.o: in function `smc_send_message': smc.c:(.text+0x200): undefined reference to `arm_smccc_1_1_get_conduit' Change from HAVE_ARM_SMCCC to ARM_PSCI_FW config dependency for now. We rely on PSCI bindings anyways for the conduit and this should be fine. Link: https://lore.kernel.org/r/[email protected] Fixes: 1dc6558 ("firmware: arm_scmi: Add smc/hvc transport") Signed-off-by: Sudeep Holla <[email protected]>
1 parent f7199cf commit 5a897e3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/firmware/arm_scmi/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ scmi-bus-y = bus.o
44
scmi-driver-y = driver.o
55
scmi-transport-y = shmem.o
66
scmi-transport-$(CONFIG_MAILBOX) += mailbox.o
7-
scmi-transport-$(CONFIG_HAVE_ARM_SMCCC) += smc.o
7+
scmi-transport-$(CONFIG_ARM_PSCI_FW) += smc.o
88
scmi-protocols-y = base.o clock.o perf.o power.o reset.o sensors.o
99
obj-$(CONFIG_ARM_SCMI_POWER_DOMAIN) += scmi_pm_domain.o

drivers/firmware/arm_scmi/driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ ATTRIBUTE_GROUPS(versions);
901901
/* Each compatible listed below must have descriptor associated with it */
902902
static const struct of_device_id scmi_of_match[] = {
903903
{ .compatible = "arm,scmi", .data = &scmi_mailbox_desc },
904-
#ifdef CONFIG_HAVE_ARM_SMCCC
904+
#ifdef CONFIG_ARM_PSCI_FW
905905
{ .compatible = "arm,scmi-smc", .data = &scmi_smc_desc},
906906
#endif
907907
{ /* Sentinel */ },

0 commit comments

Comments
 (0)