diff options
| author |   Bjorn Andersson <bjorn.andersson@linaro.org> | 2021-10-24 19:58:16 -0700 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2021-10-25 14:21:34 -0500 |
| commit | c50031f03dfe1c1462f326973ddc5f0db839fb68 (patch) | |
| tree | 909cf02352be7e57cafff0356ede0ed970b43eb6 /drivers/firmware | |
| parent | soc: qcom: smp2p: Add of_node_put() before goto (diff) | |
| download | linux-dev-c50031f03dfe1c1462f326973ddc5f0db839fb68.tar.xz linux-dev-c50031f03dfe1c1462f326973ddc5f0db839fb68.zip | |
firmware: qcom: scm: Don't break compile test on non-ARM platforms
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: 55845f46df03 ("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
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/qcom_scm.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 7dd9e5e10f23..11464f6502be 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -17,7 +17,9 @@ #include <linux/reset-controller.h> #include <linux/arm-smccc.h> +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) #include <asm/smp_plat.h> +#endif #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]; } +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) static int __qcom_scm_set_boot_addr_mc(void *entry, const cpumask_t *cpus, 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); } +#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) { |