public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 9/9] ARM: EXYNOS: make exynos 4210 cpuidle build without SMP
Date: Mon, 02 Mar 2015 22:29:42 +0100	[thread overview]
Message-ID: <2875270.gE4YDsjeJe@wuerfel> (raw)
In-Reply-To: <1423769746-582629-1-git-send-email-arnd@arndb.de>

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 <arnd@arndb.de>
---
 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)
-- 
2.1.0.rc2

  parent reply	other threads:[~2015-03-02 21:29 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-12 19:35 [PATCH 0/9] ARM: samsung: randconfig build fixes Arnd Bergmann
2015-02-12 19:35 ` [PATCH 1/9] ARM: s3c64xx: add I2C dependencies where needed Arnd Bergmann
2015-02-12 19:35 ` [PATCH 2/9] ARM: s3c64xx: fix building without CONFIG_PM_SLEEP Arnd Bergmann
2015-02-12 19:35 ` [PATCH 3/9] ARM: s3c64xx: fix __initdata section mismatch Arnd Bergmann
2015-02-12 19:35 ` [PATCH 4/9] ARM: s3c24xx: use SAMSUNG_WAKEMASK for s3c2416 Arnd Bergmann
2015-02-12 19:35 ` [PATCH 5/9] ARM: s3c24xx: fix building without PM_SLEEP Arnd Bergmann
2015-02-12 19:35 ` [PATCH 6/9] ARM: s3c24xx: fix header file inclusions Arnd Bergmann
2015-02-12 19:35 ` [PATCH 7/9] ARM: s3c24xx: avoid a Kconfig warning Arnd Bergmann
2015-02-18  0:21 ` [PATCH 0/9] ARM: samsung: randconfig build fixes Kukjin Kim
2015-03-02 19:50   ` Kukjin Kim
2015-03-02 21:28     ` Arnd Bergmann
2015-03-02 21:28 ` [PATCH 8/9] ARM: EXYNOS: suspend requires regulator access Arnd Bergmann
2015-03-03  7:29   ` Javier Martinez Canillas
2015-03-04 19:44   ` Krzysztof Kozłowski
2015-03-04 21:14     ` Arnd Bergmann
2015-03-02 21:29 ` Arnd Bergmann [this message]
2015-03-03 12:35   ` [PATCH 9/9] ARM: EXYNOS: make exynos 4210 cpuidle build without SMP Bartlomiej Zolnierkiewicz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2875270.gE4YDsjeJe@wuerfel \
    --to=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox