From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751774AbdILR4q (ORCPT ); Tue, 12 Sep 2017 13:56:46 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:38122 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbdILR4n (ORCPT ); Tue, 12 Sep 2017 13:56:43 -0400 X-Google-Smtp-Source: ADKCNb5QcNvG87KSyetZ/6lIegbJ7UlBRzerXIw7IHxc/Eb05uZ9rs1RTd0UwKD701RFR8zn7/UZ9Q== Subject: Re: [PATCH] [v2] soc: bcm: brcmstb: fix ARM build errors To: Arnd Bergmann , Florian Fainelli Cc: Brian Norris , Gregory Fong , bcm-kernel-feedback-list@broadcom.com, Justin Chen , Markus Mayer , Doug Berger , Gareth Powell , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20170911201324.3423067-1-arnd@arndb.de> From: Florian Fainelli Message-ID: <95917630-de47-cb0c-f7bf-5742927e11f1@gmail.com> Date: Tue, 12 Sep 2017 10:56:34 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170911201324.3423067-1-arnd@arndb.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/11/2017 01:13 PM, Arnd Bergmann wrote: > When building the new PM driver on older ARM architectures, we can > run into one of two build errors: > > drivers/soc/bcm/brcmstb/pm/pm-arm.c: In function 'brcmstb_do_pmsm_power_down': > drivers/soc/bcm/brcmstb/pm/pm-arm.c:334:2: error: implicit declaration of function 'wfi' [-Werror=implicit-function-declaration] > > drivers/soc/bcm/brcmstb/pm/pm-arm.o: In function `brcmstb_pm_s3_finish': > pm-arm.c:(.text+0x860): undefined reference to `cpu_resume' > > The first one requires at least ARMv6K, the second one requires the CPU > suspend/resume logic which is not available on some of the older CPUs, > and needs to be selected explicitly. > > This adds the extra Kconfig statements to enforce this, limiting > compilation on ARM to the STB platform that is guaranteed to be > ARMv7. We could enable compile-testing for other ARMv7 platforms, > but there seems to be little value as an allmodconfig kernel > already includes it. Thanks, can you pick that change directly and/or fold it in: 6274ca43eba1b2ebcac96f3c9b41fbc4945c0af0 ("soc: bcm: brcmstb: Add support for S2/S3/S5 suspend states (ARM)")? Thanks! > > Acked-by: Florian Fainelli > Signed-off-by: Arnd Bergmann > --- > v2: change Makefile as well > --- > drivers/soc/bcm/brcmstb/Kconfig | 3 ++- > drivers/soc/bcm/brcmstb/Makefile | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/bcm/brcmstb/Kconfig b/drivers/soc/bcm/brcmstb/Kconfig > index d05bfce82e71..d36f6e03c1a6 100644 > --- a/drivers/soc/bcm/brcmstb/Kconfig > +++ b/drivers/soc/bcm/brcmstb/Kconfig > @@ -4,6 +4,7 @@ config BRCMSTB_PM > bool "Support suspend/resume for STB platforms" > default y > depends on PM > - depends on ARM || BMIPS_GENERIC > + depends on ARCH_BRCMSTB || BMIPS_GENERIC > + select ARM_CPU_SUSPEND if ARM > > endif # SOC_BRCMSTB > diff --git a/drivers/soc/bcm/brcmstb/Makefile b/drivers/soc/bcm/brcmstb/Makefile > index ee5b4de741b8..01687c26535b 100644 > --- a/drivers/soc/bcm/brcmstb/Makefile > +++ b/drivers/soc/bcm/brcmstb/Makefile > @@ -1,2 +1,2 @@ > obj-y += common.o biuctrl.o > -obj-y += pm/ > +obj-$(CONFIG_BRCMSTB_PM) += pm/ > -- Florian