| Message ID | 20180528084016.9271-1-maxime.ripard@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 28, 2018 at 10:40:16AM +0200, Maxime Ripard wrote: > The secure_cntvoff_init function is only compiled if CONFIG_SMP is set to > true. However, that will lead to linking errors if one uses this function > without an ifdef CONFIG_SMP guard, which isn't ideal. > > Provide a dumb implementation when CONFIG_SMP is false so that we don't end > up with a compilation error on our hands. > > Cc: Olof Johansson <olof@lixom.net> > Cc: Mylène Josserand <mylene.josserand@bootlin.com> > Cc: Simon Horman <horms@verge.net.au> > Cc: Magnus Damm <magnus.damm@gmail.com> > Fixes: cad160ed0a94 ("ARM: shmobile: Convert file to use cntvoff") > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Ping? Maxime
On Mon, Jun 04, 2018 at 06:26:03PM +0200, Maxime Ripard wrote: > On Mon, May 28, 2018 at 10:40:16AM +0200, Maxime Ripard wrote: > > The secure_cntvoff_init function is only compiled if CONFIG_SMP is set to > > true. However, that will lead to linking errors if one uses this function > > without an ifdef CONFIG_SMP guard, which isn't ideal. > > > > Provide a dumb implementation when CONFIG_SMP is false so that we don't end > > up with a compilation error on our hands. What are the errors that this patch fixes? > > > > Cc: Olof Johansson <olof@lixom.net> > > Cc: Mylène Josserand <mylene.josserand@bootlin.com> > > Cc: Simon Horman <horms@verge.net.au> > > Cc: Magnus Damm <magnus.damm@gmail.com> > > Fixes: cad160ed0a94 ("ARM: shmobile: Convert file to use cntvoff") > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > > Ping? > > Maxime > > -- > Maxime Ripard, Bootlin (formerly Free Electrons) > Embedded Linux and Kernel engineering > https://bootlin.com
On Tue, Jun 05, 2018 at 08:49:44AM +0200, Simon Horman wrote: > On Mon, Jun 04, 2018 at 06:26:03PM +0200, Maxime Ripard wrote: > > On Mon, May 28, 2018 at 10:40:16AM +0200, Maxime Ripard wrote: > > > The secure_cntvoff_init function is only compiled if CONFIG_SMP is set to > > > true. However, that will lead to linking errors if one uses this function > > > without an ifdef CONFIG_SMP guard, which isn't ideal. > > > > > > Provide a dumb implementation when CONFIG_SMP is false so that we don't end > > > up with a compilation error on our hands. > > What are the errors that this patch fixes? There's a linking error when CONFIG_SMP is not enabled since the function will not be implemented anywhere. Maxime
Hi Maxime, On Mon, May 28, 2018 at 10:40 AM, Maxime Ripard <maxime.ripard@bootlin.com> wrote: > The secure_cntvoff_init function is only compiled if CONFIG_SMP is set to > true. However, that will lead to linking errors if one uses this function > without an ifdef CONFIG_SMP guard, which isn't ideal. > > Provide a dumb implementation when CONFIG_SMP is false so that we don't end > up with a compilation error on our hands. > > Cc: Olof Johansson <olof@lixom.net> > Cc: Mylène Josserand <mylene.josserand@bootlin.com> > Cc: Simon Horman <horms@verge.net.au> > Cc: Magnus Damm <magnus.damm@gmail.com> > Fixes: cad160ed0a94 ("ARM: shmobile: Convert file to use cntvoff") > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> NAKed-by: Geert Uytterhoeven <geert+renesas@glider.be> cfr. for Arnd's similar fix (https://patchwork.kernel.org/patch/10427931/) At least R-Car E2 also needs it for the boot CPU, cfr. commit 9ce3fa6816c2fb59 ("ARM: shmobile: rcar-gen2: Add CA7 arch_timer initialization for r8a7794"). The proper fix is to build arch/arm/common/secure_cntvoff.o unconditionally. > --- a/arch/arm/include/asm/secure_cntvoff.h > +++ b/arch/arm/include/asm/secure_cntvoff.h > @@ -3,6 +3,10 @@ > #ifndef __ASMARM_ARCH_CNTVOFF_H > #define __ASMARM_ARCH_CNTVOFF_H > > +#ifdef CONFIG_SMP > extern void secure_cntvoff_init(void); > +#else > +static inline void secure_cntvoff_init(void) {}; > +#endif > > #endif Gr{oetje,eeting}s, Geert
diff --git a/arch/arm/include/asm/secure_cntvoff.h b/arch/arm/include/asm/secure_cntvoff.h index 1f93aee1f630..ce96cd781838 100644 --- a/arch/arm/include/asm/secure_cntvoff.h +++ b/arch/arm/include/asm/secure_cntvoff.h @@ -3,6 +3,10 @@ #ifndef __ASMARM_ARCH_CNTVOFF_H #define __ASMARM_ARCH_CNTVOFF_H +#ifdef CONFIG_SMP extern void secure_cntvoff_init(void); +#else +static inline void secure_cntvoff_init(void) {}; +#endif #endif
The secure_cntvoff_init function is only compiled if CONFIG_SMP is set to true. However, that will lead to linking errors if one uses this function without an ifdef CONFIG_SMP guard, which isn't ideal. Provide a dumb implementation when CONFIG_SMP is false so that we don't end up with a compilation error on our hands. Cc: Olof Johansson <olof@lixom.net> Cc: Mylène Josserand <mylene.josserand@bootlin.com> Cc: Simon Horman <horms@verge.net.au> Cc: Magnus Damm <magnus.damm@gmail.com> Fixes: cad160ed0a94 ("ARM: shmobile: Convert file to use cntvoff") Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> --- arch/arm/include/asm/secure_cntvoff.h | 4 ++++ 1 file changed, 4 insertions(+)