* Code cleanup:

[karo-tx-uboot.git] / post / post.c

diff --git a/post/post.c b/post/post.c
index d1b8d1ae28bbfd2f240f2377049f9d6e52e65d27..9d62f4088815d90117936b27c1c784dc3014f1e4 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -36,8 +36,33 @@
 
 #define BOOTMODE_MAGIC 0xDEAD0000
 
+int post_init_f (void)
+{
+       DECLARE_GLOBAL_DATA_PTR;
+
+       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)
 {
+       DECLARE_GLOBAL_DATA_PTR;
        int bootmode = post_bootmode_get (0);
 
        if (bootmode == 0) {
@@ -49,6 +74,8 @@ void post_bootmode_init (void)
        }
 
        post_word_store (BOOTMODE_MAGIC | bootmode);
+       /* Reset activity record */
+       gd->post_log_word = 0;
 }
 
 int post_bootmode_get (unsigned int *last_test)
@@ -74,6 +101,36 @@ void post_bootmode_clear (void)
        post_word_store (0);
 }
 
+/* POST tests run before relocation only mark status bits .... */
+static void post_log_mark_start ( unsigned long testid )
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       gd->post_log_word |= (testid)<<16;
+}
+
+static void post_log_mark_succ ( unsigned long testid )
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       gd->post_log_word |= testid;
+}
+
+/* ... and the messages are output once we are relocated */
+void post_output_backlog ( void )
+{
+       DECLARE_GLOBAL_DATA_PTR;
+       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");
+               }
+       }
+}
+
 static void post_bootmode_test_on (unsigned int last_test)
 {
        unsigned long word = post_word_load ();
@@ -160,13 +217,21 @@ 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_flags & POST_PREREL) {
+                       if ((*test->test) (flags) == 0)
+                               post_log_mark_succ ( test->testid );
+               } else {
                if ((*test->test) (flags) != 0)
                        post_log ("FAILED\n");
                else
                        post_log ("PASSED\n");
+               }
 
                if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) {
                        post_bootmode_test_off ();
@@ -193,18 +258,21 @@ int post_run (char *name, int flags)
                                (flags & test_flags[last] & POST_ALWAYS) &&
                                (flags & test_flags[last] & POST_MEM)) {
 
-                               post_run_single (post_list + last, test_flags[last],
-                                                                flags | POST_REBOOT, last);
+                               post_run_single (post_list + last,
+                                                test_flags[last],
+                                                flags | POST_REBOOT, last);
 
                                for (i = last + 1; i < post_list_size; i++) {
-                                       post_run_single (post_list + i, test_flags[i],
-                                                                        flags, i);
+                                       post_run_single (post_list + i,
+                                                        test_flags[i],
+                                                        flags, i);
                                }
                        }
                } else {
                        for (i = 0; i < post_list_size; i++) {
-                               post_run_single (post_list + i, test_flags[i], flags,
-                                                                i);
+                               post_run_single (post_list + i,
+                                                test_flags[i],
+                                                flags, i);
                        }
                }
 
@@ -279,6 +347,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 */
@@ -320,7 +389,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 */