iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware: qcom: scm: Don't break compile test on non-ARM platforms

Browse Source 
The introduction of __qcom_scm_set_boot_addr_mc() relies on
cpu_logical_map() and MPIDR_AFFINITY_LEVEL() from smp_plat.h, but only
ARM and ARM64 has this include file, so the introduction of this
dependency broke compile testing on e.g. x86_64.

Make the inclusion of smp_plat.h and the affected function depend on
ARM || ARM64 to allow the code to still be compiled.

Fixes: 55845f46df ("firmware: qcom: scm: Add support for MC boot address API")
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211025025816.2937465-1-bjorn.andersson@linaro.org
This commit is contained in:
Bjorn Andersson 2021-10-24 19:58:16 -07:00
parent e1b391e971
commit c50031f03d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/firmware/qcom_scm.c
View File

@ -17,7 +17,9 @@
#include <linux/reset-controller.h> #include <linux/reset-controller.h>
#include <linux/arm-smccc.h> #include <linux/arm-smccc.h>
#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#endif
#include "qcom_scm.h" #include "qcom_scm.h"
@ -262,6 +264,7 @@ static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id,
return ret ? false : !!res.result[0]; return ret ? false : !!res.result[0];
} }
#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
static int __qcom_scm_set_boot_addr_mc(void *entry, const cpumask_t *cpus, static int __qcom_scm_set_boot_addr_mc(void *entry, const cpumask_t *cpus,
unsigned int flags) unsigned int flags)
{ {
@ -290,6 +293,13 @@ static int __qcom_scm_set_boot_addr_mc(void *entry, const cpumask_t *cpus,
return qcom_scm_call(__scm->dev, &desc, NULL); return qcom_scm_call(__scm->dev, &desc, NULL);
} }
#else
static inline int __qcom_scm_set_boot_addr_mc(void *entry, const cpumask_t *cpus,
unsigned int flags)
{
return -EINVAL;
}
#endif
static int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus) static int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus)
{ {