bootstage: Record the time taken to set up driver model

[people/ms/u-boot.git] / include / bootstage.h

diff --git a/include/bootstage.h b/include/bootstage.h
index 87bf906b263e09a8a25527f7238cbb6352de953d..9c7b515a743e15051c179cde05cfd1de3ebd6d1b 100644 (file)
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -2,6 +2,7 @@
  * This file implements recording of each stage of the boot process. It is
  * intended to implement timing of each stage, reporting this information
  * to the user and passing it to the OS for logging / further analysis.
+ * Note that it requires timer_get_boot_us() to be defined by the board
  *
  * Copyright (c) 2011 The Chromium OS Authors.
  *
@@ -11,7 +12,7 @@
 #ifndef _BOOTSTAGE_H
 #define _BOOTSTAGE_H
 
-/* The number of boot stage records available for the user */
+/* Define this for host tools */
 #ifndef CONFIG_BOOTSTAGE_USER_COUNT
 #define CONFIG_BOOTSTAGE_USER_COUNT    20
 #endif
@@ -86,9 +87,9 @@ enum bootstage_id {
        BOOTSTAGE_ID_POST_FAIL_R,       /* Post failure reported after reloc */
 
        /*
-        * This set is reported ony by x86, and the meaning is different. In
+        * This set is reported only by x86, and the meaning is different. In
         * this case we are reporting completion of a particular stage.
-        * This should probably change in he x86 code (which doesn't report
+        * This should probably change in the x86 code (which doesn't report
         * errors in any case), but discussion this can perhaps wait until we
         * have a generic board implementation.
         */
@@ -159,12 +160,16 @@ enum bootstage_id {
        /* Next 10 IDs used by BOOTSTAGE_SUB_... */
        BOOTSTAGE_ID_FIT_RD_START = 120,        /* Ramdisk stages */
 
+       /* Next 10 IDs used by BOOTSTAGE_SUB_... */
+       BOOTSTAGE_ID_FIT_SETUP_START = 130,     /* x86 setup stages */
+
        BOOTSTAGE_ID_IDE_FIT_READ = 140,
        BOOTSTAGE_ID_IDE_FIT_READ_OK,
 
        BOOTSTAGE_ID_NAND_FIT_READ = 150,
        BOOTSTAGE_ID_NAND_FIT_READ_OK,
 
+       BOOTSTAGE_ID_FIT_LOADABLE_START = 160,  /* for Loadable Images */
        /*
         * These boot stages are new, higher level, and not directly related
         * to the old boot progress numbers. They are useful for recording
@@ -191,6 +196,12 @@ enum bootstage_id {
        BOOTSTAGE_ID_MAIN_CPU_READY,
 
        BOOTSTAGE_ID_ACCUM_LCD,
+       BOOTSTAGE_ID_ACCUM_SCSI,
+       BOOTSTAGE_ID_ACCUM_SPI,
+       BOOTSTAGE_ID_ACCUM_DECOMP,
+       BOOTSTAGE_ID_FPGA_INIT,
+       BOOTSTATE_ID_ACCUM_DM_F,
+       BOOTSTATE_ID_ACCUM_DM_R,
 
        /* a few spare for the user, from here */
        BOOTSTAGE_ID_USER,
@@ -201,20 +212,20 @@ enum bootstage_id {
 /*
  * Return the time since boot in microseconds, This is needed for bootstage
  * and should be defined in CPU- or board-specific code. If undefined then
- * millisecond resolution will be used (the standard get_timer()).
+ * you will get a link error.
  */
 ulong timer_get_boot_us(void);
 
-#if !defined(CONFIG_SPL_BUILD) && !defined(USE_HOSTCC)
-/*
+#if defined(USE_HOSTCC)
+#define show_boot_progress(val) do {} while (0)
+#else
+/**
  * Board code can implement show_boot_progress() if needed.
  *
  * @param val  Progress state (enum bootstage_id), or -id if an error
  *             has occurred.
  */
 void show_boot_progress(int val);
-#else
-#define show_boot_progress(val) do {} while (0)
 #endif
 
 #if defined(CONFIG_BOOTSTAGE) && !defined(CONFIG_SPL_BUILD) && \
@@ -226,7 +237,7 @@ void show_boot_progress(int val);
  *
  * Call this after relocation has happened and after malloc has been initted.
  * We need to copy any pointers in bootstage records that were added pre-
- * relocation, since memory can be overritten later.
+ * relocation, since memory can be overwritten later.
  * @return Always returns 0, to indicate success
  */
 int bootstage_relocate(void);
@@ -242,7 +253,7 @@ int bootstage_relocate(void);
 ulong bootstage_add_record(enum bootstage_id id, const char *name,
                           int flags, ulong mark);
 
-/*
+/**
  * Mark a time stamp for the current boot stage.
  */
 ulong bootstage_mark(enum bootstage_id id);
@@ -301,7 +312,7 @@ void bootstage_report(void);
  */
 int bootstage_fdt_add_report(void);
 
-/*
+/**
  * Stash bootstage data into memory
  *
  * @param base Base address of memory buffer
@@ -322,6 +333,21 @@ int bootstage_stash(void *base, int size);
  */
 int bootstage_unstash(void *base, int size);
 
+/**
+ * bootstage_get_size() - Get the size of the bootstage data
+ *
+ * @return size of boostage data in bytes
+ */
+int bootstage_get_size(void);
+
+/**
+ * bootstage_init() - Prepare bootstage for use
+ *
+ * @first: true if this is the first time bootstage is set up. This causes it
+ *     to add a 'reset' record with a time of 0.
+ */
+int bootstage_init(bool first);
+
 #else
 static inline ulong bootstage_add_record(enum bootstage_id id,
                const char *name, int flags, ulong mark)
@@ -382,6 +408,16 @@ static inline int bootstage_unstash(void *base, int size)
 {
        return 0;       /* Pretend to succeed */
 }
+
+static inline int bootstage_get_size(void)
+{
+       return 0;
+}
+
+static inline int bootstage_init(bool first)
+{
+       return 0;
+}
 #endif /* CONFIG_BOOTSTAGE */
 
 /* Helper macro for adding a bootstage to a line of code */