From patchwork Wed Dec 21 14:52:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 132672 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F1CB9B712D for ; Thu, 22 Dec 2011 01:55:11 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RdNWr-0005IA-G2; Wed, 21 Dec 2011 14:52:25 +0000 Received: from mail.karo-electronics.de ([81.173.242.67]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RdNWa-0005GS-Ri for linux-arm-kernel@lists.infradead.org; Wed, 21 Dec 2011 14:52:10 +0000 Message-ID: <20209.62098.146087.510816@ipc1.ka-ro> Date: Wed, 21 Dec 2011 15:52:02 +0100 From: =?utf-8?Q?Lothar_Wa=C3=9Fmann?= To: Eric Miao Mime-Version: 1.0 Subject: Re: [PATCH] ARM: imx6q: build pm code only when CONFIG_PM selected In-Reply-To: <1324478303-3899-1-git-send-email-eric.miao@linaro.org> References: <1324478303-3899-1-git-send-email-eric.miao@linaro.org> X-Mailer: VM 8.0.9 under Emacs 22.2.1 (i486-pc-linux-gnu) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.5 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Shawn Guo , linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi, Eric Miao writes: [...] > diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S > index 6229efb..a59cae7 100644 > --- a/arch/arm/mach-imx/head-v7.S > +++ b/arch/arm/mach-imx/head-v7.S > @@ -71,6 +71,7 @@ ENTRY(v7_secondary_startup) > ENDPROC(v7_secondary_startup) > #endif > > +#ifdef CONFIG_PM > /* > * The following code is located into the .data section. This is to > * allow phys_l2x0_saved_regs to be accessed with a relative load > @@ -97,3 +98,4 @@ ENDPROC(v7_cpu_resume) > .globl phys_l2x0_saved_regs > phys_l2x0_saved_regs: > .long 0 > +#endif > While you are changing mach-imx/head-v7.S you could also fix a build error with 'CONFIG_CACHE_L2x0' disabled. I just found this, but sending a patch now would conflict with your patch: Lothar Waßmann diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S index 6229efb..830b5c8 100644 --- a/arch/arm/mach-imx/head-v7.S +++ b/arch/arm/mach-imx/head-v7.S @@ -80,12 +80,14 @@ ENDPROC(v7_secondary_startup) .align .macro pl310_resume +#ifdef CONFIG_CACHE_L2X0 ldr r2, phys_l2x0_saved_regs ldr r0, [r2, #L2X0_R_PHY_BASE] @ get physical base of l2x0 ldr r1, [r2, #L2X0_R_AUX_CTRL] @ get aux_ctrl value str r1, [r0, #L2X0_AUX_CTRL] @ restore aux_ctrl mov r1, #0x1 str r1, [r0, #L2X0_CTRL] @ re-enable L2 +#endif .endm ENTRY(v7_cpu_resume) @@ -94,6 +96,8 @@ ENTRY(v7_cpu_resume) b cpu_resume ENDPROC(v7_cpu_resume) +#ifdef CONFIG_CACHE_L2X0 .globl phys_l2x0_saved_regs phys_l2x0_saved_regs: .long 0 +#endif