Fix tracing for Bootloader hangs if it can't find first TOC

Limit how many traces are done by recovery loop that walks back
through PNOR to find a valid TOC.
Use page aligned MMIO addresses.

Change-Id: Icdd41fe36fc597769af57d54049c3e457b790594
RTC: 175243
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41398
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 18 insertions, 2 deletions

diff --git a/src/include/bootloader/bootloader_data.H b/src/include/bootloader/bootloader_data.H
index a97120ca0..345de9e26 100644
--- a/src/include/bootloader/bootloader_data.H
+++ b/src/include/bootloader/bootloader_data.H
@@ -53,7 +53,23 @@ namespace Bootloader{
         // @brief Index for Bootloader Trace entries
         // One-byte index for next entry to use in bootloader_trace.
         uint8_t bl_trace_index;
-        uint8_t bl_reserved1[15];
+        uint8_t bl_reserved1[1];
+
+        // @name bl_trace_index_saved
+        // @brief Saved index for Bootloader Trace entries
+        // One-byte index for a saved bootloader_trace entry.
+        uint8_t bl_trace_index_saved;
+        uint8_t bl_reserved2[1];
+
+        // @name bl_pnor_loop_count
+        // @brief Bootloader loop counter
+        // Counter for loop that walks PNOR to find a valid TOC.
+        uint32_t bl_pnor_loop_count;
+
+        // @name bl_first_pnor_mmio
+        // @brief Address used by first PNOR MMIO
+        // Address used on first attempt to read TOC from PNOR.
+        uint64_t bl_first_pnor_mmio;
 
         // Instance of the TI Data Area
         HB_TI_DataArea bl_TIDataArea;
@@ -63,7 +79,7 @@ namespace Bootloader{
 
         // Bool indicating if the secureROM is valid. Toggles verification.
         bool secureRomValid;
-        uint8_t bl_reserved2[15];
+        uint8_t bl_reserved3[15];
 
         // Object that will be stored where the SBE HB structure indicates
         BlToHbData blToHbData;