* [PATCH] firmware: qcom: scm: fix non-SMP build
@ 2021-10-27 7:24 Arnd Bergmann
2021-10-27 8:49 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2021-10-27 7:24 UTC (permalink / raw)
To: soc, Andy Gross, Bjorn Andersson
Cc: Arnd Bergmann, Stephen Boyd, linux-arm-msm, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
A check was added for non-arm platforms, but the same code
is still broken on Arm non-SMP:
ERROR: modpost: "__cpu_logical_map" [drivers/firmware/qcom-scm.ko] undefined!
Fixes: c50031f03dfe ("firmware: qcom: scm: Don't break compile test on non-ARM platforms")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/firmware/qcom_scm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index 11464f6502be..f08036f8c296 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -17,7 +17,7 @@
#include <linux/reset-controller.h>
#include <linux/arm-smccc.h>
-#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
+#if defined(CONFIG_SMP) && (defined(CONFIG_ARM) || defined(CONFIG_ARM64))
#include <asm/smp_plat.h>
#endif
@@ -264,7 +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)
+#if defined(CONFIG_SMP) && (defined(CONFIG_ARM) || defined(CONFIG_ARM64))
static int __qcom_scm_set_boot_addr_mc(void *entry, const cpumask_t *cpus,
unsigned int flags)
{
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] firmware: qcom: scm: fix non-SMP build
2021-10-27 7:24 [PATCH] firmware: qcom: scm: fix non-SMP build Arnd Bergmann
@ 2021-10-27 8:49 ` Arnd Bergmann
2021-10-27 14:09 ` Bjorn Andersson
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2021-10-27 8:49 UTC (permalink / raw)
To: SoC Team, Andy Gross, Bjorn Andersson
Cc: Arnd Bergmann, Stephen Boyd, linux-arm-msm, Linux Kernel Mailing List
On Wed, Oct 27, 2021 at 9:24 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> A check was added for non-arm platforms, but the same code
> is still broken on Arm non-SMP:
>
> ERROR: modpost: "__cpu_logical_map" [drivers/firmware/qcom-scm.ko] undefined!
>
> Fixes: c50031f03dfe ("firmware: qcom: scm: Don't break compile test on non-ARM platforms")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Nevermind, this is not sufficient, as the symbol is not actually
exported, so this still
fails on SMP configurations, both 32 and 64 bit.
Any ideas for a better fix, or should I revert 55845f46df03
("firmware: qcom: scm:
Add support for MC boot address API") for the merge window?
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] firmware: qcom: scm: fix non-SMP build
2021-10-27 8:49 ` Arnd Bergmann
@ 2021-10-27 14:09 ` Bjorn Andersson
0 siblings, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2021-10-27 14:09 UTC (permalink / raw)
To: Arnd Bergmann
Cc: SoC Team, Andy Gross, Stephen Boyd, linux-arm-msm,
Linux Kernel Mailing List
On Wed 27 Oct 01:49 PDT 2021, Arnd Bergmann wrote:
> On Wed, Oct 27, 2021 at 9:24 AM Arnd Bergmann <arnd@kernel.org> wrote:
> >
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > A check was added for non-arm platforms, but the same code
> > is still broken on Arm non-SMP:
> >
> > ERROR: modpost: "__cpu_logical_map" [drivers/firmware/qcom-scm.ko] undefined!
> >
> > Fixes: c50031f03dfe ("firmware: qcom: scm: Don't break compile test on non-ARM platforms")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Nevermind, this is not sufficient, as the symbol is not actually
> exported, so this still
> fails on SMP configurations, both 32 and 64 bit.
>
Damn, it seems I only compile tested it on the three platforms with
configurations where it ended up =y in the end.
> Any ideas for a better fix, or should I revert 55845f46df03
> ("firmware: qcom: scm:
> Add support for MC boot address API") for the merge window?
>
Let's revert the patch (and the fix) for v5.16 and try to figure this
one out for next round.
Regards,
Bjorn
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-27 14:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-27 7:24 [PATCH] firmware: qcom: scm: fix non-SMP build Arnd Bergmann
2021-10-27 8:49 ` Arnd Bergmann
2021-10-27 14:09 ` Bjorn Andersson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.