Messages in this thread | | | Date | Mon, 13 Apr 2020 12:19:56 +0200 | From | Roland Hieber <> | Subject | Re: [PATCH] ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y |
| |
On Mon, Mar 23, 2020 at 09:19:33AM +0100, Ahmad Fatoum wrote: > 512a928affd5 ("ARM: imx: build v7_cpu_resume() unconditionally") > introduced an unintended linker error for i.MX6 configurations that have > ARM_CPU_SUSPEND=n which can happen if neither CONFIG_PM, CONFIG_CPU_IDLE, > nor ARM_PSCI_FW are selected. > > Fix this by having v7_cpu_resume() compiled only when cpu_resume() it > calls is available as well. > > The C declaration for the function remains unguarded to avoid future code > inadvertently using a stub and introducing a regression to the bug the > original commit fixed. > > Cc: <stable@vger.kernel.org> > Fixes: 512a928affd5 ("ARM: imx: build v7_cpu_resume() unconditionally") > Reported-by: Clemens Gruber <clemens.gruber@pqgruber.com> > Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Tested-by: Roland Hieber <rhi@pengutronix.de>
What's the status here? master is still broken on most of my builds, and there were no other comments at all :-(
- Roland
> --- > arch/arm/mach-imx/Makefile | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > index 03506ce46149..e7364e6c8c6b 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -91,8 +91,10 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a > obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o > obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o > endif > +ifeq ($(CONFIG_ARM_CPU_SUSPEND),y) > AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a > obj-$(CONFIG_SOC_IMX6) += resume-imx6.o > +endif > obj-$(CONFIG_SOC_IMX6) += pm-imx6.o > > obj-$(CONFIG_SOC_IMX1) += mach-imx1.o > -- > 2.25.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
-- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
| |