| Message ID | 20171206141517.670032-1-arnd@arndb.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds | expand |
* Arnd Bergmann <arnd@arndb.de> [171206 14:18]: > In configurations without CONFIG_OMAP3 but with secure RAM support, > we now run into a link failure: > > arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram': > omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context' > > The omap3_save_secure_ram() function is only called from the OMAP34xx > power management code, so we can simply hide that function in the > appropriate #ifdef. > > Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks for fixing it, want to apply directly to ARM SoC fixes where d09220a887f7 is now? If so: Acked-by: Tony Lindgren <tony@atomide.com> Regards, Tony > --- > arch/arm/mach-omap2/omap-secure.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c > index f9303dc631e4..7be95cd8136d 100644 > --- a/arch/arm/mach-omap2/omap-secure.c > +++ b/arch/arm/mach-omap2/omap-secure.c > @@ -72,6 +72,7 @@ phys_addr_t omap_secure_ram_mempool_base(void) > return omap_secure_memblock_base; > } > > +#ifdef CONFIG_ARCH_OMAP3 > u32 omap3_save_secure_ram(void __iomem *addr, int size) > { > u32 ret; > @@ -90,6 +91,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size) > > return ret; > } > +#endif > > /** > * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls > -- > 2.9.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Arnd On 12/06/2017 09:57 AM, Tony Lindgren wrote: > * Arnd Bergmann <arnd@arndb.de> [171206 14:18]: >> In configurations without CONFIG_OMAP3 but with secure RAM support, >> we now run into a link failure: >> >> arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram': >> omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context' >> >> The omap3_save_secure_ram() function is only called from the OMAP34xx >> power management code, so we can simply hide that function in the >> appropriate #ifdef. >> >> Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Thanks for fixing it, want to apply directly to ARM SoC fixes > where d09220a887f7 is now? If so: > > Acked-by: Tony Lindgren <tony@atomide.com> Found the same issue in our builds. Compile tested the patch against different TI defconfig configurations. Tested-by: Dan Murphy <dmurphy@ti.com> Dan > > Regards, > > Tony > > >> --- >> arch/arm/mach-omap2/omap-secure.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c >> index f9303dc631e4..7be95cd8136d 100644 >> --- a/arch/arm/mach-omap2/omap-secure.c >> +++ b/arch/arm/mach-omap2/omap-secure.c >> @@ -72,6 +72,7 @@ phys_addr_t omap_secure_ram_mempool_base(void) >> return omap_secure_memblock_base; >> } >> >> +#ifdef CONFIG_ARCH_OMAP3 >> u32 omap3_save_secure_ram(void __iomem *addr, int size) >> { >> u32 ret; >> @@ -90,6 +91,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size) >> >> return ret; >> } >> +#endif >> >> /** >> * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls >> -- >> 2.9.0 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- ------------------ Dan Murphy -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Dec 6, 2017 at 5:29 PM, Dan Murphy <dmurphy@ti.com> wrote: > Arnd > > On 12/06/2017 09:57 AM, Tony Lindgren wrote: >> * Arnd Bergmann <arnd@arndb.de> [171206 14:18]: >>> In configurations without CONFIG_OMAP3 but with secure RAM support, >>> we now run into a link failure: >>> >>> arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram': >>> omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context' >>> >>> The omap3_save_secure_ram() function is only called from the OMAP34xx >>> power management code, so we can simply hide that function in the >>> appropriate #ifdef. >>> >>> Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context") >>> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> >> Thanks for fixing it, want to apply directly to ARM SoC fixes >> where d09220a887f7 is now? If so: >> >> Acked-by: Tony Lindgren <tony@atomide.com> > > Found the same issue in our builds. > Compile tested the patch against different TI defconfig configurations. > > Tested-by: Dan Murphy <dmurphy@ti.com> Thanks! Unfortunately, I found another build problem with CONFIG_PM=n, sent an updated patch now, and will apply it to the fixes branch tomorrow keeping both of your Acked-by/Tested-by tags, unless I hear any objections or run into a third problem. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c index f9303dc631e4..7be95cd8136d 100644 --- a/arch/arm/mach-omap2/omap-secure.c +++ b/arch/arm/mach-omap2/omap-secure.c @@ -72,6 +72,7 @@ phys_addr_t omap_secure_ram_mempool_base(void) return omap_secure_memblock_base; } +#ifdef CONFIG_ARCH_OMAP3 u32 omap3_save_secure_ram(void __iomem *addr, int size) { u32 ret; @@ -90,6 +91,7 @@ u32 omap3_save_secure_ram(void __iomem *addr, int size) return ret; } +#endif /** * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls
In configurations without CONFIG_OMAP3 but with secure RAM support, we now run into a link failure: arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram': omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context' The omap3_save_secure_ram() function is only called from the OMAP34xx power management code, so we can simply hide that function in the appropriate #ifdef. Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-omap2/omap-secure.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html