* [PATCH] remoteproc: stm32: fix building without ARM SMCC
@ 2019-07-08 12:42 Arnd Bergmann
2019-07-08 14:07 ` Bjorn Andersson
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2019-07-08 12:42 UTC (permalink / raw)
To: Ohad Ben-Cohen, Bjorn Andersson, Maxime Coquelin, Alexandre Torgue
Cc: Arnd Bergmann, Fabien Dessenne, Ludovic Barre, Loic Pallardy,
Arnaud Pouliquen, linux-remoteproc, linux-stm32,
linux-arm-kernel, linux-kernel
When compile testing this driver without SMCC support enabled,
we get a link error:
drivers/remoteproc/stm32_rproc.o: In function `stm32_rproc_start':
stm32_rproc.c:(.text+0x776): undefined reference to `__arm_smccc_smc'
drivers/remoteproc/stm32_rproc.o: In function `stm32_rproc_stop':
stm32_rproc.c:(.text+0x92c): undefined reference to `__arm_smccc_smc'
Make the actual call to arm_smccc_smc conditional on the Kconfig
symbol controlling its implementation.
Fixes: 13140de09cc2 ("remoteproc: stm32: add an ST stm32_rproc driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/remoteproc/stm32_rproc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index e83077b9ebf5..e2da7198b65f 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -344,7 +344,7 @@ static int stm32_rproc_set_hold_boot(struct rproc *rproc, bool hold)
val = hold ? HOLD_BOOT : RELEASE_BOOT;
- if (ddata->secured_soc) {
+ if (IS_ENABLED(CONFIG_HAVE_ARM_SMCCC) && ddata->secured_soc) {
arm_smccc_smc(STM32_SMC_RCC, STM32_SMC_REG_WRITE,
hold_boot.reg, val, 0, 0, 0, 0, &smc_res);
err = smc_res.a0;
--
2.20.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] remoteproc: stm32: fix building without ARM SMCC
2019-07-08 12:42 [PATCH] remoteproc: stm32: fix building without ARM SMCC Arnd Bergmann
@ 2019-07-08 14:07 ` Bjorn Andersson
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Andersson @ 2019-07-08 14:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ohad Ben-Cohen, Maxime Coquelin, Alexandre Torgue,
Fabien Dessenne, Ludovic Barre, Loic Pallardy, Arnaud Pouliquen,
linux-remoteproc, linux-stm32, linux-arm-kernel, linux-kernel
On Mon 08 Jul 05:42 PDT 2019, Arnd Bergmann wrote:
> When compile testing this driver without SMCC support enabled,
> we get a link error:
>
> drivers/remoteproc/stm32_rproc.o: In function `stm32_rproc_start':
> stm32_rproc.c:(.text+0x776): undefined reference to `__arm_smccc_smc'
> drivers/remoteproc/stm32_rproc.o: In function `stm32_rproc_stop':
> stm32_rproc.c:(.text+0x92c): undefined reference to `__arm_smccc_smc'
>
> Make the actual call to arm_smccc_smc conditional on the Kconfig
> symbol controlling its implementation.
>
> Fixes: 13140de09cc2 ("remoteproc: stm32: add an ST stm32_rproc driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks Arnd, applied
Regards,
Bjorn
> ---
> drivers/remoteproc/stm32_rproc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
> index e83077b9ebf5..e2da7198b65f 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -344,7 +344,7 @@ static int stm32_rproc_set_hold_boot(struct rproc *rproc, bool hold)
>
> val = hold ? HOLD_BOOT : RELEASE_BOOT;
>
> - if (ddata->secured_soc) {
> + if (IS_ENABLED(CONFIG_HAVE_ARM_SMCCC) && ddata->secured_soc) {
> arm_smccc_smc(STM32_SMC_RCC, STM32_SMC_REG_WRITE,
> hold_boot.reg, val, 0, 0, 0, 0, &smc_res);
> err = smc_res.a0;
> --
> 2.20.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-08 14:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-08 12:42 [PATCH] remoteproc: stm32: fix building without ARM SMCC Arnd Bergmann
2019-07-08 14:07 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).