[coreboot-gerrit] Patch set updated for coreboot: afb4eae storm: print uber-sbl information

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9843

-gerrit

commit afb4eaef09f357c7db5bf33a09690b5038545320
Author: Vadim Bendebury <vbendeb at chromium.org>
Date:   Mon Feb 23 18:38:57 2015 -0800

    storm: print uber-sbl information
    
    Process information reported by uber-sbl: print out its version and
    RPM and KRAIT log contents.
    
    BRANCH=storm
    BUG=chrome-os-partner:30623
    TEST=rebooted a storm device, checked out /sys/firmware/log after
         booting up Chrome OS:
      localhost ~ # head -29 /sys/firmware/log | tail -15
      Uber-sbl version: @vbendeb-AAABANAZA
        Section 0 log:
          0    :00:SBL1, Start
          0    :00:SBL-RO Krait
          2623 :00:SBL-RO Krait
          0    :00:BB
          4666 :00:BB
          0    :00:sbl1_hw_init, Start
          6130 :00:sbl1_hw_init, Delta
          0    :00:SBL1, End
          15372:00:SBL1, Delta
        Section 1 log:
          0    :00:SBL-RO Krait, Start
          0    :00:SBL-RO Krait, End
          336  :00:SBL-RO Krait, Delta
      localhost ~ #
    
    Change-Id: I524dbb49f676046a43bfba26b31b2834c8d2769c
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: dcabca6eb87dcead0c9c33749ed76ac939d843c1
    Original-Change-Id: Ic037f936ff2d09b0346fb5239094e7928dfd7620
    Original-Signed-off-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/252830
    Original-Reviewed-by: Varadarajan Narayanan <varada at qti.qualcomm.com>
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Commit-Queue: Vadim Bendebury <vbendeb at gmail.com>
---
 src/mainboard/google/storm/bootblock.c | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/mainboard/google/storm/bootblock.c b/src/mainboard/google/storm/bootblock.c
index cdc870a..8313501 100644
--- a/src/mainboard/google/storm/bootblock.c
+++ b/src/mainboard/google/storm/bootblock.c
@@ -11,9 +11,51 @@
  */
 
 #include <bootblock_common.h>
+#include <console/console.h>
+#include <symbols.h>
+
 #include "mmu.h"
+#include <soc/usbl_if.h>
+
+static void dump_usbl_report(int section, sbl_ro_info *info)
+{
+	int i, num_log_entries;
+
+	num_log_entries = info->num_log_entries;
+	if (!num_log_entries)
+		return;
+
+	printk(BIOS_INFO, "  Section %d log:\n", section);
+	for (i = 0; i < num_log_entries; i++)
+		printk(BIOS_INFO, "    %-5d:%2.2x:%.*s\n",
+		       info->log[i].time_stamp,
+		       info->log[i].type,
+		       sizeof(info->log[i].msg),
+		       info->log[i].msg);
+}
 
 void bootblock_mainboard_init(void)
 {
+	int i;
+
 	setup_mmu(DRAM_NOT_INITIALIZED);
+
+	if (((uintptr_t)maskrom_param < (uintptr_t)&_sram) ||
+	    ((uintptr_t)maskrom_param > (uintptr_t)&_esram)) {
+		printk(BIOS_INFO, "No uber-sbl parameter detected\n");
+		return;
+	}
+
+	/* Is maskrom parameter address set to a sensible value? */
+	if ((maskrom_param->start_magic != UBER_SBL_SHARED_INFO_START_MAGIC) ||
+	    (maskrom_param->end_magic != UBER_SBL_SHARED_INFO_END_MAGIC)) {
+
+		printk(BIOS_INFO, "Uber-sbl: invalid magic!\n");
+	} else {
+		printk(BIOS_INFO, "Uber-sbl version: %s\n",
+		       maskrom_param->version);
+
+		for (i = 0; i < maskrom_param->num; i++)
+			dump_usbl_report(i, &maskrom_param->info[i]);
+	}
 }