Project import generated by Copybara.
GitOrigin-RevId: 3253e868d3c66301a17dc6ad57b214fce9e75bce
diff --git a/include/bootstage.h b/include/bootstage.h
index c9408e7..df13ab2 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -1,16 +1,21 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
/*
* 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.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _BOOTSTAGE_H
#define _BOOTSTAGE_H
+/* The number of boot stage records available for the user */
+#ifndef CONFIG_BOOTSTAGE_USER_COUNT
+#define CONFIG_BOOTSTAGE_USER_COUNT 20
+#endif
+
/* Flags for each bootstage record */
enum bootstage_flags {
BOOTSTAGEF_ERROR = 1 << 0, /* Error record */
@@ -81,9 +86,9 @@
BOOTSTAGE_ID_POST_FAIL_R, /* Post failure reported after reloc */
/*
- * This set is reported only by x86, and the meaning is different. In
+ * This set is reported ony by x86, and the meaning is different. In
* this case we are reporting completion of a particular stage.
- * This should probably change in the x86 code (which doesn't report
+ * This should probably change in he x86 code (which doesn't report
* errors in any case), but discussion this can perhaps wait until we
* have a generic board implementation.
*/
@@ -163,7 +168,6 @@
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
@@ -171,7 +175,6 @@
*/
BOOTSTAGE_ID_AWAKE,
BOOTSTAGE_ID_START_SPL,
- BOOTSTAGE_ID_END_SPL,
BOOTSTAGE_ID_START_UBOOT_F,
BOOTSTAGE_ID_START_UBOOT_R,
BOOTSTAGE_ID_USB_START,
@@ -191,47 +194,34 @@
BOOTSTAGE_ID_MAIN_CPU_READY,
BOOTSTAGE_ID_ACCUM_LCD,
- BOOTSTAGE_ID_ACCUM_SCSI,
- BOOTSTAGE_ID_ACCUM_SPI,
- BOOTSTAGE_ID_ACCUM_DECOMP,
- BOOTSTAGE_ID_ACCUM_OF_LIVE,
- BOOTSTAGE_ID_FPGA_INIT,
- BOOTSTATE_ID_ACCUM_DM_SPL,
- BOOTSTATE_ID_ACCUM_DM_F,
- BOOTSTATE_ID_ACCUM_DM_R,
/* a few spare for the user, from here */
BOOTSTAGE_ID_USER,
+ BOOTSTAGE_ID_COUNT = BOOTSTAGE_ID_USER + CONFIG_BOOTSTAGE_USER_COUNT,
BOOTSTAGE_ID_ALLOC,
};
/*
* 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
- * you will get a link error.
+ * millisecond resolution will be used (the standard get_timer()).
*/
ulong timer_get_boot_us(void);
-#if defined(USE_HOSTCC)
-#define show_boot_progress(val) do {} while (0)
-#else
-/**
+#if !defined(CONFIG_SPL_BUILD) && !defined(USE_HOSTCC)
+/*
* 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(USE_HOSTCC)
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
-#define ENABLE_BOOTSTAGE
-#endif
-#endif
-
-#ifdef ENABLE_BOOTSTAGE
-
+#if defined(CONFIG_BOOTSTAGE) && !defined(CONFIG_SPL_BUILD) && \
+ !defined(USE_HOSTCC)
/* This is the full bootstage implementation */
/**
@@ -239,7 +229,7 @@
*
* 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.
+ * relocation, since memory can be overritten later.
* @return Always returns 0, to indicate success
*/
int bootstage_relocate(void);
@@ -255,7 +245,7 @@
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);
@@ -314,7 +304,7 @@
*/
int bootstage_fdt_add_report(void);
-/**
+/*
* Stash bootstage data into memory
*
* @param base Base address of memory buffer
@@ -331,26 +321,9 @@
*
* @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
- * there is not space for read the stacked data, or other error if
- * something else went wrong
+ * @return 0 if unstashed ok, -1 if bootstage info not found, or out of space
*/
-int bootstage_unstash(const 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);
+int bootstage_unstash(void *base, int size);
#else
static inline ulong bootstage_add_record(enum bootstage_id id,
@@ -408,22 +381,11 @@
return 0; /* Pretend to succeed */
}
-static inline int bootstage_unstash(const void *base, int size)
+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 /* ENABLE_BOOTSTAGE */
+#endif /* CONFIG_BOOTSTAGE */
/* Helper macro for adding a bootstage to a line of code */
#define BOOTSTAGE_MARKER() \
