From patchwork Thu Feb 13 14:19:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 24601 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 03F59202E2 for ; Thu, 13 Feb 2014 14:24:43 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf24019023pab.7 for ; Thu, 13 Feb 2014 06:24:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:subject:message-id :references:mime-version:in-reply-to:user-agent:cc:precedence :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-disposition :content-type:content-transfer-encoding; bh=SRZBv5QZGGe6fvWvRBTqTiYYeFY2CEdDwTH5sPvRUqw=; b=Ipiicn1KzgAL4xz8bsEQhcHWW9ebLkIjInevZIGEnjbdVz3Tm8YmoD6r6c+gD2ylaJ Eyk9QJpJ9KP9ee6tfkqJN9JbcEjjd0fU0B4XIwxwkun5I507NjcVT5yev3kzVkd8QtAj 1rMLsDO/knDF9oVtWMtvekEIG1X8Mh9r/XlXy/L7D/5dKogKa7W2by1kpLBQC1/9zKay K2DwQ4bBwn1EO/CMdvYUbHGnOqo7Z/EFQ+xqLVFLLXW6TMCVYgyo0I3ylw63U2Fy/6zS P/LPJecZh6I/+numYtY3w8xLXn4EFqtS+l4Wpb+dEdWG2Jdg/DnbRXxHMYONhVfSpy9r he9g== X-Gm-Message-State: ALoCoQmzUuYlpYKEEyvnN3gz+0Ey8GDYWJ3ss9dX7csqz067/eekY/Q1X2oz/wRKs2UTyXihnEYf X-Received: by 10.66.144.170 with SMTP id sn10mr3887527pab.43.1392301483154; Thu, 13 Feb 2014 06:24:43 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.8 with SMTP id 8ls3510151qgk.51.gmail; Thu, 13 Feb 2014 06:24:43 -0800 (PST) X-Received: by 10.58.106.37 with SMTP id gr5mr43117veb.57.1392301483013; Thu, 13 Feb 2014 06:24:43 -0800 (PST) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id ny8si702724vcb.69.2014.02.13.06.24.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Feb 2014 06:24:42 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ij19so8252367vcb.34 for ; Thu, 13 Feb 2014 06:24:42 -0800 (PST) X-Received: by 10.221.36.8 with SMTP id sy8mr35333vcb.71.1392301482886; Thu, 13 Feb 2014 06:24:42 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp29666vcz; Thu, 13 Feb 2014 06:24:42 -0800 (PST) X-Received: by 10.194.186.204 with SMTP id fm12mr1593521wjc.27.1392301481870; Thu, 13 Feb 2014 06:24:41 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id de3si1571676wib.7.2014.02.13.06.24.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Feb 2014 06:24:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDxDG-0004d3-D0; Thu, 13 Feb 2014 14:24:26 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDx8O-0000CS-Js; Thu, 13 Feb 2014 14:19:24 +0000 Received: from ch1ehsobe006.messaging.microsoft.com ([216.32.181.186] helo=ch1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDx8L-0000BM-RQ for linux-arm-kernel@lists.infradead.org; Thu, 13 Feb 2014 14:19:22 +0000 Received: from mail218-ch1-R.bigfish.com (10.43.68.234) by CH1EHSOBE005.bigfish.com (10.43.70.55) with Microsoft SMTP Server id 14.1.225.22; Thu, 13 Feb 2014 14:18:59 +0000 Received: from mail218-ch1 (localhost [127.0.0.1]) by mail218-ch1-R.bigfish.com (Postfix) with ESMTP id E41CD120259; Thu, 13 Feb 2014 14:18:59 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -2 X-BigFish: VS-2(zz98dI1432Izz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h1de097hz2dh87h2a8h839h944hd25hf0ah1220h1288h12a5h12a9h12bdh137ah13b6h1441h1504h1537h153bh162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1fe8h1ff5h209eh2216h22d0h2336h2438h2461h2487h24d7h2516h2545h255eh1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail218-ch1 (localhost.localdomain [127.0.0.1]) by mail218-ch1 (MessageSwitch) id 139230113733024_30083; Thu, 13 Feb 2014 14:18:57 +0000 (UTC) Received: from CH1EHSMHS024.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.234]) by mail218-ch1.bigfish.com (Postfix) with ESMTP id ED23F4E0070; Thu, 13 Feb 2014 14:18:56 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS024.bigfish.com (10.43.70.24) with Microsoft SMTP Server (TLS) id 14.16.227.3; Thu, 13 Feb 2014 14:18:56 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.3.158.2; Thu, 13 Feb 2014 14:18:55 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.141]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s1DEIrhr005517; Thu, 13 Feb 2014 07:18:54 -0700 Date: Thu, 13 Feb 2014 22:19:46 +0800 From: Shawn Guo To: Lucas Stach Subject: Re: [PATCH] ARM: imx6: fix !CONFIG_PM and !CONFIG_CPU_IDLE build Message-ID: <20140213141944.GC20842@S2101-09.ap.freescale.net> References: <1392201948-16311-1-git-send-email-l.stach@pengutronix.de> MIME-Version: 1.0 In-Reply-To: <1392201948-16311-1-git-send-email-l.stach@pengutronix.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: sigmatel.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140213_091921_921943_6CA58899 X-CRM114-Status: GOOD ( 15.31 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.181.186 listed in list.dnswl.org] 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shawn.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Disposition: inline Hi Lucas, On Wed, Feb 12, 2014 at 11:45:48AM +0100, Lucas Stach wrote: > When building a kernel with only CONFIG_CPU_IDLE, but no > CONFIG_PM we still need the functions to set the lpm mode > and chicken bits. > > Also if both options are unset, we have to stub out the > set_lpm function, as this one is called from the clk > driver directly. > > Signed-off-by: Lucas Stach > --- > This fix depends on an earlier one by Philipp: > "ARM: imx6: Initialize low-power mode early again" > > Both should go to stable after a sensible sinking time. > --- > arch/arm/mach-imx/Makefile | 9 +++- > arch/arm/mach-imx/common.h | 11 +++-- > arch/arm/mach-imx/pm-imx6q.c | 112 ++++++++++++++++++++++--------------------- > 3 files changed, 72 insertions(+), 60 deletions(-) Since we already have so many stuff in pm-imx6q.c needed by a !CONFIG_PM build, maybe we should build pm-imx6q.c without CONFIG_PM condition, something like the following? Shawn ---8<----------- diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index befcaf5..ec41964 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -101,11 +101,9 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o -ifeq ($(CONFIG_PM),y) obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o # i.MX6SL reuses i.MX6Q code obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o -endif # i.MX5 based machines obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 59c3b9b..baf439d 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -144,13 +144,11 @@ void imx6q_set_chicken_bit(void); void imx_cpu_die(unsigned int cpu); int imx_cpu_kill(unsigned int cpu); -#ifdef CONFIG_PM void imx6q_pm_init(void); void imx6q_pm_set_ccm_base(void __iomem *base); +#ifdef CONFIG_PM void imx5_pm_init(void); #else -static inline void imx6q_pm_init(void) {} -static inline void imx6q_pm_set_ccm_base(void __iomem *base) {} static inline void imx5_pm_init(void) {} #endif