ARM: firmware: add AFTR mode support to firmware do_idle method

On some platforms (i.e. EXYNOS ones) more than one idle mode is
available and we need to distinguish them in firmware do_idle method.

Add mode parameter to do_idle firmware method and AFTR mode support
to EXYNOS do_idle implementation.

This change is a preparation for adding secure firmware support to
EXYNOS cpuidle driver.

This patch shouldn't cause any functionality changes.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/include/asm/firmware.h b/arch/arm/include/asm/firmware.h
index 5904f59b04094a2f5933123d987f45e07f3127c8..89aefe10d66b78102919d05860eb89715d01f85d 100644 (file)
--- a/arch/arm/include/asm/firmware.h
+++ b/arch/arm/include/asm/firmware.h
@@ -28,7 +28,7 @@ struct firmware_ops {
        /*
         * Enters CPU idle mode
         */
-       int (*do_idle)(void);
+       int (*do_idle)(unsigned long mode);
        /*
         * Sets boot address of specified physical CPU
         */

diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index c218200f8544f9e114215697a7b56cadc00ddd35..2d830df0f647b03ddfcab86521072a3b2a313ceb 100644 (file)
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -119,6 +119,11 @@ extern void __iomem *sysram_base_addr;
 extern void __iomem *pmu_base_addr;
 void exynos_sysram_init(void);
 
+enum {
+       FW_DO_IDLE_SLEEP,
+       FW_DO_IDLE_AFTR,
+};
+
 void exynos_firmware_init(void);
 
 extern u32 exynos_get_eint_wake_mask(void);

diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c
index f5e626d55951999ec8acb2ba98b4dd1bc015e991..e57b7c3039a28920e2c16ffe667ac483cbb2e2b5 100644 (file)
--- a/arch/arm/mach-exynos/firmware.c
+++ b/arch/arm/mach-exynos/firmware.c
@@ -28,9 +28,15 @@
 #define EXYNOS_BOOT_ADDR       0x8
 #define EXYNOS_BOOT_FLAG       0xc
 
-static int exynos_do_idle(void)
+static int exynos_do_idle(unsigned long mode)
 {
-       exynos_smc(SMC_CMD_SLEEP, 0, 0, 0);
+       switch (mode) {
+       case FW_DO_IDLE_AFTR:
+               exynos_smc(SMC_CMD_CPU0AFTR, 0, 0, 0);
+               break;
+       case FW_DO_IDLE_SLEEP:
+               exynos_smc(SMC_CMD_SLEEP, 0, 0, 0);
+       }
        return 0;
 }
 

diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c
index e3ebdce3e71f62c48099191bf18cb00892c05aca..425b6c8f0cb03eb7a65c3dda5380f2a0c03ae18c 100644 (file)
--- a/arch/arm/mach-tegra/cpuidle-tegra114.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra114.c
@@ -49,7 +49,7 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev,
        call_firmware_op(prepare_idle);
 
        /* Do suspend by ourselves if the firmware does not implement it */
-       if (call_firmware_op(do_idle) == -ENOSYS)
+       if (call_firmware_op(do_idle, 0) == -ENOSYS)
                cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);
 
        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);