Merge branch 'i2c'

[u-boot] / post / post.c

diff --git a/post/post.c b/post/post.c
index f87636cb44cd86820d47061791cc16dc1a7b64c5..e1066da6bd1e9b5ec7237e7f3e2eeb2f7346e2d8 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -32,23 +32,60 @@
 
 #ifdef CONFIG_POST
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define POST_MAX_NUMBER                32
 
 #define BOOTMODE_MAGIC 0xDEAD0000
 
+int post_init_f (void)
+{
+       int res = 0;
+       unsigned int i;
+
+       for (i = 0; i < post_list_size; i++) {
+               struct post_test *test = post_list + i;
+
+               if (test->init_f && test->init_f()) {
+                       res = -1;
+               }
+       }
+
+       gd->post_init_f_time = post_time_ms(0);
+       if (!gd->post_init_f_time)
+       {
+               printf("post/post.c: post_time_ms seems not to be implemented\n");
+       }
+
+       return res;
+}
+
 void post_bootmode_init (void)
 {
        int bootmode = post_bootmode_get (0);
-
-       if (bootmode == 0) {
-               bootmode = POST_POWERON;
-       } else if (bootmode == POST_POWERON) {
-               bootmode = POST_POWERNORMAL;
+       int newword;
+
+       if (post_hotkeys_pressed() && !(bootmode & POST_POWERTEST)) {
+               newword = BOOTMODE_MAGIC | POST_SLOWTEST;
+       } else if (bootmode == 0) {
+               newword = BOOTMODE_MAGIC | POST_POWERON;
+       } else if (bootmode == POST_POWERON || bootmode == POST_SLOWTEST) {
+               newword = BOOTMODE_MAGIC | POST_NORMAL;
        } else {
-               return;
+               /* Use old value */
+               newword = post_word_load () & ~POST_COLDBOOT;
+       }
+
+       if (bootmode == 0)
+       {
+               /* We are booting after power-on */
+               newword |= POST_COLDBOOT;
        }
 
-       post_word_store (BOOTMODE_MAGIC | bootmode);
+       post_word_store (newword);
+
+       /* Reset activity record */
+       gd->post_log_word = 0;
 }
 
 int post_bootmode_get (unsigned int *last_test)
@@ -60,7 +97,7 @@ int post_bootmode_get (unsigned int *last_test)
                return 0;
        }
 
-       bootmode = word & 0xFF;
+       bootmode = word & 0x7F;
 
        if (last_test && (bootmode & POST_POWERTEST)) {
                *last_test = (word >> 8) & 0xFF;
@@ -69,9 +106,35 @@ int post_bootmode_get (unsigned int *last_test)
        return bootmode;
 }
 
-void post_bootmode_clear (void)
+/* POST tests run before relocation only mark status bits .... */
+static void post_log_mark_start ( unsigned long testid )
+{
+       gd->post_log_word |= (testid)<<16;
+}
+
+static void post_log_mark_succ ( unsigned long testid )
 {
-       post_word_store (0);
+       gd->post_log_word |= testid;
+}
+
+/* ... and the messages are output once we are relocated */
+void post_output_backlog ( void )
+{
+       int j;
+
+       for (j = 0; j < post_list_size; j++) {
+               if (gd->post_log_word & (post_list[j].testid<<16)) {
+                       post_log ("POST %s ", post_list[j].cmd);
+                       if (gd->post_log_word & post_list[j].testid)
+                               post_log ("PASSED\n");
+                       else {
+                               post_log ("FAILED\n");
+#ifdef CONFIG_SHOW_BOOT_PROGRESS
+                               show_boot_progress(-31);
+#endif
+                       }
+               }
+       }
 }
 
 static void post_bootmode_test_on (unsigned int last_test)
@@ -96,8 +159,8 @@ static void post_bootmode_test_off (void)
 
 static void post_get_flags (int *test_flags)
 {
-       int flag[] = { POST_POWERON, POST_POWERNORMAL, POST_POWERFAIL };
-       char *var[] = { "post_poweron", "post_normal", "post_shutdown" };
+       int  flag[] = {  POST_POWERON,   POST_NORMAL,   POST_SLOWTEST };
+       char *var[] = { "post_poweron", "post_normal", "post_slowtest" };
        int varnum = sizeof (var) / sizeof (var[0]);
        char list[128];                 /* long enough for POST list */
        char *name;
@@ -146,6 +209,12 @@ static void post_get_flags (int *test_flags)
                        name = s + 1;
                }
        }
+
+       for (j = 0; j < post_list_size; j++) {
+               if (test_flags[j] & POST_POWERON) {
+                       test_flags[j] |= POST_SLOWTEST;
+               }
+       }
 }
 
 static int post_run_single (struct post_test *test,
@@ -160,13 +229,25 @@ static int post_run_single (struct post_test *test,
                                post_bootmode_test_on (i);
                        }
 
+                       if (test_flags & POST_PREREL)
+                               post_log_mark_start ( test->testid );
+                       else
                        post_log ("POST %s ", test->cmd);
                }
 
-               if ((*test->test) (flags) != 0)
+               if (test_flags & POST_PREREL) {
+                       if ((*test->test) (flags) == 0)
+                               post_log_mark_succ ( test->testid );
+               } else {
+               if ((*test->test) (flags) != 0) {
                        post_log ("FAILED\n");
+#ifdef CONFIG_SHOW_BOOT_PROGRESS
+                       show_boot_progress(-32);
+#endif
+               }
                else
                        post_log ("PASSED\n");
+               }
 
                if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) {
                        post_bootmode_test_off ();
@@ -282,6 +363,7 @@ int post_log (char *format, ...)
        va_end (args);
 
 #ifdef CONFIG_LOGBUFFER
+       /* Send to the logbuffer */
        logbuff_log (printbuffer);
 #else
        /* Send to the stdout file */
@@ -293,8 +375,6 @@ int post_log (char *format, ...)
 
 void post_reloc (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        unsigned int i;
 
        /*
@@ -323,7 +403,35 @@ void post_reloc (void)
                        addr = (ulong) (test->test) + gd->reloc_off;
                        test->test = (int (*)(int flags)) addr;
                }
+
+               if (test->init_f) {
+                       addr = (ulong) (test->init_f) + gd->reloc_off;
+                       test->init_f = (int (*)(void)) addr;
+               }
+
+               if (test->reloc) {
+                       addr = (ulong) (test->reloc) + gd->reloc_off;
+                       test->reloc = (void (*)(void)) addr;
+
+                       test->reloc();
+               }
        }
 }
 
+
+/*
+ * Some tests (e.g. SYSMON) need the time when post_init_f started,
+ * but we cannot use get_timer() at this point.
+ *
+ * On PowerPC we implement it using the timebase register.
+ */
+unsigned long post_time_ms (unsigned long base)
+{
+#ifdef CONFIG_PPC
+       return (unsigned long)get_ticks () / (get_tbclk () / CFG_HZ) - base;
+#else
+       return 0; /* Not implemented yet */
+#endif
+}
+
 #endif /* CONFIG_POST */