arm64: configs: add missing usb config in rockchip linux

[firefly-linux-kernel-4.4.55.git] / kernel / power / suspend_test.c

diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c
index 269b097e78eaa03d590b7c930badeca3015ac75f..084452e34a125ff24da375e6dce25c1224b46310 100644 (file)
--- a/kernel/power/suspend_test.c
+++ b/kernel/power/suspend_test.c
@@ -22,6 +22,8 @@
 #define TEST_SUSPEND_SECONDS   10
 
 static unsigned long suspend_test_start_time;
+static u32 test_repeat_count_max = 1;
+static u32 test_repeat_count_current;
 
 void suspend_test_start(void)
 {
@@ -74,6 +76,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
        int                     status;
 
        /* this may fail if the RTC hasn't been initialized */
+repeat:
        status = rtc_read_time(rtc, &alm.time);
        if (status < 0) {
                printk(err_readtime, dev_name(&rtc->dev), status);
@@ -92,18 +95,29 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
        }
 
        if (state == PM_SUSPEND_MEM) {
-               printk(info_test, pm_states[state].label);
+               printk(info_test, pm_states[state]);
                status = pm_suspend(state);
                if (status == -ENODEV)
                        state = PM_SUSPEND_STANDBY;
        }
        if (state == PM_SUSPEND_STANDBY) {
-               printk(info_test, pm_states[state].label);
+               printk(info_test, pm_states[state]);
                status = pm_suspend(state);
+               if (status < 0)
+                       state = PM_SUSPEND_FREEZE;
        }
+       if (state == PM_SUSPEND_FREEZE) {
+               printk(info_test, pm_states[state]);
+               status = pm_suspend(state);
+       }
+
        if (status < 0)
                printk(err_suspend, status);
 
+       test_repeat_count_current++;
+       if (test_repeat_count_current < test_repeat_count_max)
+               goto repeat;
+
        /* Some platforms can't detect that the alarm triggered the
         * wakeup, or (accordingly) disable it after it afterwards.
         * It's supposed to give oneshot behavior; cope.
@@ -129,24 +143,36 @@ static int __init has_wakealarm(struct device *dev, const void *data)
  * at startup time.  They're normally disabled, for faster boot and because
  * we can't know which states really work on this particular system.
  */
-static suspend_state_t test_state __initdata = PM_SUSPEND_ON;
+static const char *test_state_label __initdata;
 
 static char warn_bad_state[] __initdata =
        KERN_WARNING "PM: can't test '%s' suspend state\n";
 
 static int __init setup_test_suspend(char *value)
 {
-       suspend_state_t i;
+       int i;
+       char *repeat;
+       char *suspend_type;
 
-       /* "=mem" ==> "mem" */
+       /* example : "=mem[,N]" ==> "mem[,N]" */
        value++;
-       for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++)
-               if (!strcmp(pm_states[i].label, value)) {
-                       test_state = pm_states[i].state;
+       suspend_type = strsep(&value, ",");
+       if (!suspend_type)
+               return 0;
+
+       repeat = strsep(&value, ",");
+       if (repeat) {
+               if (kstrtou32(repeat, 0, &test_repeat_count_max))
+                       return 0;
+       }
+
+       for (i = 0; pm_labels[i]; i++)
+               if (!strcmp(pm_labels[i], suspend_type)) {
+                       test_state_label = pm_labels[i];
                        return 0;
                }
 
-       printk(warn_bad_state, value);
+       printk(warn_bad_state, suspend_type);
        return 0;
 }
 __setup("test_suspend", setup_test_suspend);
@@ -158,13 +184,21 @@ static int __init test_suspend(void)
 
        struct rtc_device       *rtc = NULL;
        struct device           *dev;
+       suspend_state_t test_state;
 
        /* PM is initialized by now; is that state testable? */
-       if (test_state == PM_SUSPEND_ON)
-               goto done;
-       if (!pm_states[test_state].state) {
-               printk(warn_bad_state, pm_states[test_state].label);
-               goto done;
+       if (!test_state_label)
+               return 0;
+
+       for (test_state = PM_SUSPEND_MIN; test_state < PM_SUSPEND_MAX; test_state++) {
+               const char *state_label = pm_states[test_state];
+
+               if (state_label && !strcmp(test_state_label, state_label))
+                       break;
+       }
+       if (test_state == PM_SUSPEND_MAX) {
+               printk(warn_bad_state, test_state_label);
+               return 0;
        }
 
        /* RTCs have initialized by now too ... can we use one? */
@@ -173,13 +207,12 @@ static int __init test_suspend(void)
                rtc = rtc_class_open(dev_name(dev));
        if (!rtc) {
                printk(warn_no_rtc);
-               goto done;
+               return 0;
        }
 
        /* go for it */
        test_wakealarm(rtc, test_state);
        rtc_class_close(rtc);
-done:
        return 0;
 }
 late_initcall(test_suspend);