ARM: rockchip: support arch32 psci suspend

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-rockchip / rockchip_pm.c

diff --git a/arch/arm/mach-rockchip/rockchip_pm.c b/arch/arm/mach-rockchip/rockchip_pm.c
index 74ac848c2c649bf4e8eccb3cec5ca73aa5931df4..2ac0c61c44b294a100ecbad7f01b7b105c323cad 100755 (executable)
--- a/arch/arm/mach-rockchip/rockchip_pm.c
+++ b/arch/arm/mach-rockchip/rockchip_pm.c
@@ -7,7 +7,7 @@
 #include <linux/delay.h>
 #include <linux/moduleparam.h>
 #include <linux/rockchip/common.h>
-
+#include <asm/psci.h>
 #include <asm/io.h>
 #include "pm.h"
 
@@ -26,7 +26,7 @@ void  rkpm_ddr_regs_dump(void __iomem * base_addr,u32 start_offset,u32 end_offse
         //u32 line=0;
 
         rkpm_ddr_printascii("start from:");     
-        rkpm_ddr_printhex((u32)(base_addr +start_offset));       
+       rkpm_ddr_printhex((unsigned long)base_addr + start_offset);
         rkpm_ddr_printch('\n');
                    
         
@@ -402,6 +402,20 @@ void  rkpm_ddr_printhex(unsigned int hex)
                hex <<= 4;
        }
 }
+
+#ifdef CONFIG_ARM_PSCI
+static bool psci_suspend_available(void)
+{
+       return (psci_ops.cpu_suspend != NULL);
+}
+#else
+static inline bool psci_suspend_available(void)
+{
+       return false;
+}
+#endif
+
+#ifdef CONFIG_ARM
 void rk_sram_suspend(void)
 {
        RKPM_DDR_FUN(regs_pread);
@@ -409,9 +423,17 @@ void rk_sram_suspend(void)
        call_with_stack(p_suspend_pie_cb
                , &rkpm_jdg_sram_ctrbits, rockchip_sram_stack);
 }
+
 static int rk_lpmode_enter(unsigned long arg)
 {
+#ifdef CONFIG_ARM_PSCI
+       const struct psci_power_state ps = {
+               .type = PSCI_POWER_STATE_TYPE_POWER_DOWN,
+       };
 
+       if (psci_suspend_available())
+               return psci_ops.cpu_suspend(ps, virt_to_phys(cpu_resume));
+#endif
         //RKPM_DDR_PFUN(slp_setting(rkpm_jdg_sram_ctrbits),slp_setting); 
     
         RKPM_DDR_FUN(slp_setting); 
@@ -437,13 +459,21 @@ static int rk_lpmode_enter(unsigned long arg)
 }
 
 int cpu_suspend(unsigned long arg, int (*fn)(unsigned long));
+#endif /* CONFIG_ARM */
+
 static int rkpm_enter(suspend_state_t state)
 {
        //static u32 test_count=0;
         // printk(KERN_DEBUG"pm: ");
         printk("%s:\n",__FUNCTION__);
         //printk("pm test times=%d\n",++test_count);
-       
+
+#ifdef CONFIG_ARM_PSCI
+       if (psci_suspend_available()) {
+               cpu_suspend(0, rk_lpmode_enter);
+               return 0;
+       }
+#endif
         RKPM_DDR_FUN(prepare);   
         
         rkpm_ctrbits_prepare();
@@ -477,6 +507,7 @@ static int rkpm_enter(suspend_state_t state)
 
         rkpm_ddr_printch('5');
 
+#ifdef CONFIG_ARM
         if(rkpm_chk_jdg_ctrbits(RKPM_CTRBITS_SOC_DLPMD))
         {   
             if(cpu_suspend(0,rk_lpmode_enter)==0)
@@ -496,6 +527,10 @@ static int rkpm_enter(suspend_state_t state)
             dsb();
             wfi();
         }
+#else
+       flush_cache_all();
+       cpu_suspend(1);
+#endif
 
         rkpm_ddr_printch('5');
 
@@ -568,6 +603,15 @@ void __init rockchip_suspend_init(void)
     return;
 }
 
+#ifndef CONFIG_ARM
+static int __init rockchip_init_suspend(void)
+{
+       suspend_set_ops(&rockchip_suspend_ops);
+       return 0;
+}
+late_initcall_sync(rockchip_init_suspend);
+#endif /* CONFIG_ARM */
+
 static enum rockchip_pm_policy pm_policy;
 static BLOCKING_NOTIFIER_HEAD(policy_notifier_list);