lmb: Rename _lmb_alloc_addr() to lmb_alloc_addr_flags()

[J-u-boot.git] / include / bootstage.h

diff --git a/include/bootstage.h b/include/bootstage.h
index 00c85fb86aa2841b4e5c4664c1ecf01f343beac1..3300ca0248a3206467551e5f59ad96c46a64745f 100644 (file)
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -11,6 +11,11 @@
 #ifndef _BOOTSTAGE_H
 #define _BOOTSTAGE_H
 
 #ifndef _BOOTSTAGE_H
 #define _BOOTSTAGE_H
 

+#include <linux/types.h>
+#ifdef USE_HOSTCC
+#include <linux/kconfig.h>
+#endif
+

 /* Flags for each bootstage record */
 enum bootstage_flags {
        BOOTSTAGEF_ERROR        = 1 << 0,       /* Error record */
 /* Flags for each bootstage record */
 enum bootstage_flags {
        BOOTSTAGEF_ERROR        = 1 << 0,       /* Error record */


@@ -144,7 +149,6 @@ enum bootstage_id {
 
        BOOTSTAGE_ID_FIT_CONFIG = 110,
        BOOTSTAGE_ID_FIT_TYPE,
 
        BOOTSTAGE_ID_FIT_CONFIG = 110,
        BOOTSTAGE_ID_FIT_TYPE,

-       BOOTSTAGE_ID_FIT_KERNEL_INFO,

 
        BOOTSTAGE_ID_FIT_COMPRESSION,
        BOOTSTAGE_ID_FIT_OS,
 
        BOOTSTAGE_ID_FIT_COMPRESSION,
        BOOTSTAGE_ID_FIT_OS,


@@ -164,6 +168,8 @@ enum bootstage_id {
        BOOTSTAGE_ID_NAND_FIT_READ_OK,
 
        BOOTSTAGE_ID_FIT_LOADABLE_START = 160,  /* for Loadable Images */
        BOOTSTAGE_ID_NAND_FIT_READ_OK,
 
        BOOTSTAGE_ID_FIT_LOADABLE_START = 160,  /* for Loadable Images */

+
+       BOOTSTAGE_ID_FIT_SPL_START = 170,       /* for SPL Images */

        /*
         * These boot stages are new, higher level, and not directly related
         * to the old boot progress numbers. They are useful for recording
        /*
         * These boot stages are new, higher level, and not directly related
         * to the old boot progress numbers. They are useful for recording


@@ -174,6 +180,8 @@ enum bootstage_id {
        BOOTSTAGE_ID_END_TPL,
        BOOTSTAGE_ID_START_SPL,
        BOOTSTAGE_ID_END_SPL,
        BOOTSTAGE_ID_END_TPL,
        BOOTSTAGE_ID_START_SPL,
        BOOTSTAGE_ID_END_SPL,

+       BOOTSTAGE_ID_START_VPL,
+       BOOTSTAGE_ID_END_VPL,

        BOOTSTAGE_ID_START_UBOOT_F,
        BOOTSTAGE_ID_START_UBOOT_R,
        BOOTSTAGE_ID_USB_START,
        BOOTSTAGE_ID_START_UBOOT_F,
        BOOTSTAGE_ID_START_UBOOT_R,
        BOOTSTAGE_ID_USB_START,


@@ -218,7 +226,7 @@ enum bootstage_id {
  */
 ulong timer_get_boot_us(void);
 
  */
 ulong timer_get_boot_us(void);
 

-#if defined(USE_HOSTCC)
+#if defined(USE_HOSTCC) || !CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)

 #define show_boot_progress(val) do {} while (0)
 #else
 /**
 #define show_boot_progress(val) do {} while (0)
 #else
 /**


@@ -238,6 +246,8 @@ void show_boot_progress(int val);
 
 #ifdef ENABLE_BOOTSTAGE
 
 
 #ifdef ENABLE_BOOTSTAGE
 

+#include <mapmem.h>
+

 /* This is the full bootstage implementation */
 
 /**
 /* This is the full bootstage implementation */
 
 /**


@@ -246,9 +256,9 @@ 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 overwritten later.
  * 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 overwritten later.

- * @return Always returns 0, to indicate success
+ * Return: Always returns 0, to indicate success

  */
  */

-int bootstage_relocate(void);
+int bootstage_relocate(void *to);

 
 /**
  * Add a new bootstage record
 
 /**
  * Add a new bootstage record


@@ -264,12 +274,27 @@ ulong bootstage_add_record(enum bootstage_id id, const char *name,
 /**
  * Mark a time stamp for the current boot stage.
  */
 /**
  * Mark a time stamp for the current boot stage.
  */

-ulong bootstage_mark(enum bootstage_id id);
-
-ulong bootstage_error(enum bootstage_id id);
+#define bootstage_mark(id)     bootstage_mark_name(id, __func__)
+#define bootstage_error(id)    bootstage_error_name(id, __func__)

 
 

+/**
+ * bootstage_mark_name - record bootstage with passing id and name
+ * @id: Bootstage id to record this timestamp against
+ * @name: Textual name to display for this id in the report
+ *
+ * Return: recorded time stamp
+ */

 ulong bootstage_mark_name(enum bootstage_id id, const char *name);
 
 ulong bootstage_mark_name(enum bootstage_id id, const char *name);
 

+/**
+ * bootstage_error_name - record bootstage error with passing id and name
+ * @id: Bootstage id to record this timestamp against
+ * @name: Textual name to display for this id in the report
+ *
+ * Return: recorded time stamp
+ */
+ulong bootstage_error_name(enum bootstage_id id, const char *name);
+

 /**
  * Mark a time stamp in the given function and line number
  *
 /**
  * Mark a time stamp in the given function and line number
  *


@@ -278,7 +303,7 @@ ulong bootstage_mark_name(enum bootstage_id id, const char *name);
  * @param file         Filename to record (NULL if none)
  * @param func         Function name to record
  * @param linenum      Line number to record
  * @param file         Filename to record (NULL if none)
  * @param func         Function name to record
  * @param linenum      Line number to record

- * @return recorded time stamp
+ * Return: recorded time stamp

  */
 ulong bootstage_mark_code(const char *file, const char *func,
                          int linenum);
  */
 ulong bootstage_mark_code(const char *file, const char *func,
                          int linenum);


@@ -292,7 +317,7 @@ ulong bootstage_mark_code(const char *file, const char *func,
  *
  * @param id   Bootstage id to record this timestamp against
  * @param name Textual name to display for this id in the report (maybe NULL)
  *
  * @param id   Bootstage id to record this timestamp against
  * @param name Textual name to display for this id in the report (maybe NULL)

- * @return start timestamp in microseconds
+ * Return: start timestamp in microseconds

  */
 uint32_t bootstage_start(enum bootstage_id id, const char *name);
 
  */
 uint32_t bootstage_start(enum bootstage_id id, const char *name);
 


@@ -304,7 +329,7 @@ uint32_t bootstage_start(enum bootstage_id id, const char *name);
  * as many times as you like.
  *
  * @param id   Bootstage id to record this timestamp against
  * as many times as you like.
  *
  * @param id   Bootstage id to record this timestamp against

- * @return time spent in this iteration of the activity (i.e. the time now
+ * Return: time spent in this iteration of the activity (i.e. the time now

  *             less the start time recorded in the last bootstage_start() call
  *             with this id.
  */
  *             less the start time recorded in the last bootstage_start() call
  *             with this id.
  */


@@ -316,7 +341,7 @@ void bootstage_report(void);
 /**
  * Add bootstage information to the device tree
  *
 /**
  * Add bootstage information to the device tree
  *

- * @return 0 if ok, -ve on error
+ * Return: 0 if ok, -ve on error

  */
 int bootstage_fdt_add_report(void);
 
  */
 int bootstage_fdt_add_report(void);
 


@@ -325,7 +350,7 @@ int bootstage_fdt_add_report(void);
  *
  * @param base Base address of memory buffer
  * @param size Size of memory buffer
  *
  * @param base Base address of memory buffer
  * @param size Size of memory buffer

- * @return 0 if stashed ok, -1 if out of space
+ * Return: 0 if stashed ok, -1 if out of space

  */
 int bootstage_stash(void *base, int size);
 
  */
 int bootstage_stash(void *base, int size);
 


@@ -337,7 +362,7 @@ int bootstage_stash(void *base, int size);
  *
  * @param base Base address of memory buffer
  * @param size Size of memory buffer (-1 if unknown)
  *
  * @param base Base address of memory buffer
  * @param size Size of memory buffer (-1 if unknown)

- * @return 0 if unstashed ok, -ENOENT if bootstage info not found, -ENOSPC if
+ * Return: 0 if unstashed ok, -ENOENT if bootstage info not found, -ENOSPC if

  *     there is not space for read the stashed data, or other error if
  *     something else went wrong
  */
  *     there is not space for read the stashed data, or other error if
  *     something else went wrong
  */


@@ -346,9 +371,10 @@ int bootstage_unstash(const void *base, int size);
 /**
  * bootstage_get_size() - Get the size of the bootstage data
  *
 /**
  * bootstage_get_size() - Get the size of the bootstage data
  *

- * @return size of boostage data in bytes
+ * @add_strings: true to add the size of attached strings (for stashing)
+ * Return: size of boostage data in bytes

  */
  */

-int bootstage_get_size(void);
+int bootstage_get_size(bool add_strings);

 
 /**
  * bootstage_init() - Prepare bootstage for use
 
 /**
  * bootstage_init() - Prepare bootstage for use


@@ -370,7 +396,7 @@ static inline ulong bootstage_add_record(enum bootstage_id id,
  * and won't even do that unless CONFIG_SHOW_BOOT_PROGRESS is defined
  */
 
  * and won't even do that unless CONFIG_SHOW_BOOT_PROGRESS is defined
  */
 

-static inline int bootstage_relocate(void)
+static inline int bootstage_relocate(void *to)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -419,7 +445,7 @@ static inline int bootstage_unstash(const void *base, int size)
        return 0;       /* Pretend to succeed */
 }
 
        return 0;       /* Pretend to succeed */
 }
 

-static inline int bootstage_get_size(void)
+static inline int bootstage_get_size(bool add_strings)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -431,6 +457,26 @@ static inline int bootstage_init(bool first)
 
 #endif /* ENABLE_BOOTSTAGE */
 
 
 #endif /* ENABLE_BOOTSTAGE */
 

+/* helpers for SPL */
+int _bootstage_stash_default(void);
+int _bootstage_unstash_default(void);
+
+static inline int bootstage_stash_default(void)
+{
+       if (CONFIG_IS_ENABLED(BOOTSTAGE) && IS_ENABLED(CONFIG_BOOTSTAGE_STASH))
+               return _bootstage_stash_default();
+
+       return 0;
+}
+
+static inline int bootstage_unstash_default(void)
+{
+       if (CONFIG_IS_ENABLED(BOOTSTAGE) && IS_ENABLED(CONFIG_BOOTSTAGE_STASH))
+               return _bootstage_unstash_default();
+
+       return 0;
+}
+

 /* Helper macro for adding a bootstage to a line of code */
 #define BOOTSTAGE_MARKER()     \
                bootstage_mark_code(__FILE__, __func__, __LINE__)
 /* Helper macro for adding a bootstage to a line of code */
 #define BOOTSTAGE_MARKER()     \
                bootstage_mark_code(__FILE__, __func__, __LINE__)