From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6E36C2BBC7 for ; Mon, 13 Apr 2020 10:31:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8992120753 for ; Mon, 13 Apr 2020 10:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728654AbgDMKU5 (ORCPT ); Mon, 13 Apr 2020 06:20:57 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:58437 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728289AbgDMKUh (ORCPT ); Mon, 13 Apr 2020 06:20:37 -0400 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jNwC6-0001Dz-1g; Mon, 13 Apr 2020 12:19:58 +0200 Received: from rhi by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1jNwC4-0003AX-KM; Mon, 13 Apr 2020 12:19:56 +0200 Date: Mon, 13 Apr 2020 12:19:56 +0200 From: Roland Hieber To: Ahmad Fatoum Cc: Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Lucas Stach , Rouven Czerwinski , linux-arm-kernel@lists.infradead.org, Clemens Gruber , Russell King , stable@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y Message-ID: <20200413101956.47ggeq4q2hei76yz@pengutronix.de> References: <20200323081933.31497-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200323081933.31497-1-a.fatoum@pengutronix.de> User-Agent: NeoMutt/20180716 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: rhi@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: > Fixes: 512a928affd5 ("ARM: imx: build v7_cpu_resume() unconditionally") > Reported-by: Clemens Gruber > Signed-off-by: Ahmad Fatoum Tested-by: Roland Hieber 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 |