soc: qcom: boot_stats: Adding new KPI markers and renaming the existing.

Adding early_domain and SHA/RSA compute time KPI markers.
Renaming few other markers to be more indicative.

Change-Id: I55c99ae0c65f0162ef56b2e59e10d1d92ec76a58
Signed-off-by: Meghana Ashok <meghanaa@codeaurora.org>

2 files changed, 21 insertions, 11 deletions

diff --git a/drivers/soc/qcom/boot_marker.c b/drivers/soc/qcom/boot_marker.c
index 47ebd2a8b958..b3a6c9f8d054 100644
--- a/drivers/soc/qcom/boot_marker.c
+++ b/drivers/soc/qcom/boot_marker.c
@@ -28,7 +28,7 @@
 #include <soc/qcom/boot_stats.h>
 
 #define MAX_STRING_LEN 256
-#define BOOT_MARKER_MAX_LEN 21
+#define BOOT_MARKER_MAX_LEN 40
 static struct dentry *dent_bkpi, *dent_bkpi_status;
 static struct boot_marker boot_marker_list;
 
@@ -44,7 +44,7 @@ static void _create_boot_marker(const char *name,
 {
 	struct boot_marker *new_boot_marker;
 
-	pr_debug("%-22s:%llu.%03llu seconds\n", name,
+	pr_debug("%-41s:%llu.%03llu seconds\n", name,
 		timer_value/TIMER_KHZ,
 		((timer_value % TIMER_KHZ)
 		* 1000) / TIMER_KHZ);
@@ -64,14 +64,18 @@ static void _create_boot_marker(const char *name,
 
 static void set_bootloader_stats(void)
 {
-	_create_boot_marker("Lk Start - ",
-			readl_relaxed(&boot_stats->bootloader_start));
-	_create_boot_marker("Lk End - ",
-			readl_relaxed(&boot_stats->bootloader_end));
-	_create_boot_marker("Lk Display - ",
-			readl_relaxed(&boot_stats->bootloader_display));
-	_create_boot_marker("Lk Load Kernel - ",
-			readl_relaxed(&boot_stats->bootloader_load_kernel));
+	_create_boot_marker("M - APPSBL Start - ",
+		readl_relaxed(&boot_stats->bootloader_start));
+	_create_boot_marker("M - APPSBL Display Init - ",
+		readl_relaxed(&boot_stats->bootloader_display));
+	_create_boot_marker("M - APPSBL Early-Domain Start - ",
+		readl_relaxed(&boot_stats->bootloader_early_domain_start));
+	_create_boot_marker("D - APPSBL Kernel Load Time - ",
+		readl_relaxed(&boot_stats->bootloader_load_kernel));
+	_create_boot_marker("D - APPSBL Kernel Auth Time - ",
+		readl_relaxed(&boot_stats->bootloader_checksum));
+	_create_boot_marker("M - APPSBL End - ",
+		readl_relaxed(&boot_stats->bootloader_end));
 }
 
 void place_marker(const char *name)
@@ -95,7 +99,7 @@ static ssize_t bootkpi_reader(struct file *fp, char __user *user_buffer,
 	mutex_lock(&boot_marker_list.lock);
 	list_for_each_entry(marker, &boot_marker_list.list, list) {
 		temp += scnprintf(buf + temp, PAGE_SIZE - temp,
-			"%-22s:%llu.%03llu seconds\n",
+			"%-41s:%llu.%03llu seconds\n",
 			marker->marker_name,
 			marker->timer_value/TIMER_KHZ,
 			(((marker->timer_value % TIMER_KHZ)
diff --git a/include/soc/qcom/boot_stats.h b/include/soc/qcom/boot_stats.h
index af56da3167f0..b76d5676b555 100644
--- a/include/soc/qcom/boot_stats.h
+++ b/include/soc/qcom/boot_stats.h
@@ -20,6 +20,12 @@ struct boot_stats {
 	uint32_t bootloader_end;
 	uint32_t bootloader_display;
 	uint32_t bootloader_load_kernel;
+	uint32_t load_kernel_start;
+	uint32_t load_kernel_end;
+#ifdef CONFIG_MSM_BOOT_TIME_MARKER
+	uint32_t bootloader_early_domain_start;
+	uint32_t bootloader_checksum;
+#endif
 };
 
 int boot_stats_init(void);