HBBL input support

Change-Id: I9335651edfded154bffea166c92cc3007efe0ef9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/11680
Tested-by: Jenkins Server
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>

3 files changed, 52 insertions, 37 deletions

diff --git a/sbe/image/base_loader.c b/sbe/image/base_loader.c
index fa0f42fd..3fe43fc5 100644
--- a/sbe/image/base_loader.c
+++ b/sbe/image/base_loader.c
@@ -1,33 +1,4 @@
-#include "p9_xip_image.h"
-#include "ppe42_scom.h"  // for PPE_STVD
-#include "sbe_link.H"  // for SBE_BASE_ORIGIN, SBE_SEEPROM_BASE_ORIGIN
-
-// Unconditional jump to a memory location
-#define JUMP_TO_ADDR(VAL ) \
-{ \
-asm volatile ( \
-    "mtlr  %0 \n\t" \
-    :   \
-    : "r" (VAL)); \
-asm volatile ( \
-    "blr  \n\t" \
-    :   \
-    );\
-}
-
-// PIBMEM start address
-const uint32_t g_pibMemAddr = SBE_BASE_ORIGIN;
-// SEEPROM start address
-const uint32_t g_headerAddr = SBE_SEEPROM_BASE_ORIGIN;
-// IVPR register address
-const uint32_t g_ivprLoc = 0xC0000160;
-
-// Get XIP image header
-P9XipHeader * getXipHdr()
-{
-    P9XipHeader *hdr = (P9XipHeader *)( g_headerAddr );
-    return hdr;
-}
+#include "sbeXipUtils.H"
 
 // Load section to destination address
 int32_t loadSection( P9XipSection * i_section, uint64_t *i_destAddr )
diff --git a/sbe/sbefw/sbeXipUtils.H b/sbe/sbefw/sbeXipUtils.H
new file mode 100644
index 00000000..c77b60c1
--- /dev/null
+++ b/sbe/sbefw/sbeXipUtils.H
@@ -0,0 +1,40 @@
+#ifndef SBE_XIP_UTILS_H
+#define SBE_XIP_UTILS_H
+
+#include "p9_xip_image.h"
+#include "ppe42_scom.h"  // for PPE_STVD
+#include "sbe_link.H"  // for SBE_BASE_ORIGIN, SBE_SEEPROM_BASE_ORIGIN
+
+// Unconditional jump to a memory location
+#define JUMP_TO_ADDR(VAL ) \
+{ \
+asm volatile ( \
+    "mtlr  %0 \n\t" \
+    :   \
+    : "r" (VAL)); \
+asm volatile ( \
+    "blr  \n\t" \
+    :   \
+    );\
+}
+
+// PIBMEM start address
+const uint32_t g_pibMemAddr = SBE_BASE_ORIGIN;
+// SEEPROM start address
+const uint32_t g_headerAddr = SBE_SEEPROM_BASE_ORIGIN;
+// IVPR register address
+const uint32_t g_ivprLoc = 0xC0000160;
+
+// Get XIP image header
+inline P9XipHeader * getXipHdr()
+{
+    P9XipHeader *hdr = (P9XipHeader *)( g_headerAddr );
+    return hdr;
+}
+
+// Get Section start addess
+inline uint8_t * getSectionAddr( P9XipSection * i_section )
+{
+    return ( (uint8_t *)( g_headerAddr + i_section->iv_offset));
+}
+#endif // SBE_XIP_UTILS_H
diff --git a/sbe/sbefw/sbecmdiplcontrol.C b/sbe/sbefw/sbecmdiplcontrol.C
index c06676dd..36202e4c 100644
--- a/sbe/sbefw/sbecmdiplcontrol.C
+++ b/sbe/sbefw/sbecmdiplcontrol.C
@@ -53,6 +53,7 @@
 #include "p9_sbe_instruct_start.H"
 #include "p9_sbe_load_bootloader.H"
 
+#include "sbeXipUtils.H" // For getting hbbl offset
 // Forward declaration
 using namespace fapi2;
 ReturnCode sbeExecuteIstep (uint8_t i_major, uint8_t i_minor);
@@ -500,14 +501,17 @@ ReturnCode istepWithCore( sbeIstepHwp_t i_hwp)
 
 ReturnCode istepLoadBootLoader( sbeIstepHwp_t i_hwp)
 {
-    ReturnCode rc = FAPI2_RC_SUCCESS;
-#ifndef SBE_ISTEP_STUBBED
-    // TODO via RTC 135345
-    //  Send right Ex, address and size of HB loader
+    // Get master Ex
+    uint8_t exId = 0;
     Target<TARGET_TYPE_PROC_CHIP > proc = plat_getChipTarget();
-    fapi2::Target<fapi2::TARGET_TYPE_EX > exTgt((uint64_t)7);
-    rc = p9_sbe_load_bootloader( proc, exTgt, 0, NULL );
-#endif
+    FAPI_ATTR_GET(fapi2::ATTR_MASTER_EX,proc,exId);
+    fapi2::Target<fapi2::TARGET_TYPE_EX > exTgt(exId);
+    // Get hbbl section
+    P9XipHeader *hdr = getXipHdr();
+    P9XipSection *hbblSection =  &(hdr->iv_section[P9_XIP_SECTION_HBBL]);
+
+    ReturnCode rc = p9_sbe_load_bootloader( proc, exTgt, hbblSection->iv_size, 
+                                            getSectionAddr(hbblSection) );
     return rc;
 }