From patchwork Mon Mar 2 21:29:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5917691 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6536B9F318 for ; Mon, 2 Mar 2015 21:30:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A41620225 for ; Mon, 2 Mar 2015 21:30:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7E2F20219 for ; Mon, 2 Mar 2015 21:30:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755628AbbCBV3v (ORCPT ); Mon, 2 Mar 2015 16:29:51 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:57937 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752896AbbCBV3s (ORCPT ); Mon, 2 Mar 2015 16:29:48 -0500 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0LqYLt-1Xp4Qb0RTV-00e3rk; Mon, 02 Mar 2015 22:29:44 +0100 From: Arnd Bergmann To: Kukjin Kim Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Tomasz Figa , arm@kernel.org Subject: [PATCH 9/9] ARM: EXYNOS: make exynos 4210 cpuidle build without SMP Date: Mon, 02 Mar 2015 22:29:42 +0100 Message-ID: <2875270.gE4YDsjeJe@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1423769746-582629-1-git-send-email-arnd@arndb.de> References: <1423769746-582629-1-git-send-email-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:QU7qDrQa2TSNOYJYmNLwo9rtLw1ZgEi5xDyL1uwPdqxPtwFYfCo rAd4J4X9QBFSVmjrOzE+lwHN64aK/ZsBJfja0eiTgnCC2Ni+76ct+K9CqvjB51gQt4Sx0jZ rodmwcZiC4fQG2l43ACgStWDAyaApn+41ug39gnSOgN6nOH8xJFRdlVNScVJkReaxJq/ftQ vlfdDZqOSRy4DmgxzYT2w== X-UI-Out-Filterresults: notjunk:1; Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP arch/arm/mach-exynos/pm.c: In function 'exynos_cpu0_enter_aftr': arch/arm/mach-exynos/pm.c:246:4: error: implicit declaration of function 'arch_send_wakeup_ipi_mask' [-Werror=implicit-function-declaration] arch_send_wakeup_ipi_mask(cpumask_of(1)); Signed-off-by: Arnd Bergmann --- arch/arm/mach-exynos/pm.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index e6209dadc00d..a91aefaee31d 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -187,6 +187,7 @@ static int exynos_cpu0_enter_aftr(void) { int ret = -1; +#ifdef CONFIG_SMP /* * If the other cpu is powered on, we have to power it off, because * the AFTR state won't work otherwise @@ -216,10 +217,12 @@ static int exynos_cpu0_enter_aftr(void) cpu_relax(); } } +#endif exynos_enter_aftr(); ret = 0; +#ifdef CONFIG_SMP abort: if (cpu_online(1)) { /* @@ -246,11 +249,12 @@ abort: arch_send_wakeup_ipi_mask(cpumask_of(1)); } } +#endif return ret; } -static int exynos_wfi_finisher(unsigned long flags) +static int __maybe_unused exynos_wfi_finisher(unsigned long flags) { cpu_do_idle(); @@ -260,7 +264,7 @@ static int exynos_wfi_finisher(unsigned long flags) static int exynos_cpu1_powerdown(void) { int ret = -1; - +#ifdef CONFIG_SMP /* * Idle sequence for cpu1 */ @@ -282,13 +286,20 @@ cpu1_aborted: * Notify cpu 0 that cpu 1 is awake */ atomic_set(&cpu1_wakeup, 1); - +#endif return ret; } static void exynos_pre_enter_aftr(void) { - __raw_writel(virt_to_phys(exynos_cpu_resume), cpu_boot_reg_base()); + void *reg_base; + + if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1) + reg_base = pmu_base_addr + S5P_INFORM5; + else + reg_base = sysram_base_addr; + + __raw_writel(virt_to_phys(exynos_cpu_resume), reg_base); } static void exynos_post_enter_aftr(void)