summaryrefslogtreecommitdiffstats
path: root/src/bootloader
diff options
context:
space:
mode:
authorcrgeddes <crgeddes@us.ibm.com>2017-04-26 14:57:34 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-05-02 12:44:38 -0400
commit9e4f956b73d40866a58eeea9f258d4697b2686c4 (patch)
treec905a158ad52fac58e1871834300680d1d0ed49b /src/bootloader
parent3d0fd427668ae9418f50d1432cceee3c95e794d6 (diff)
downloadtalos-hostboot-9e4f956b73d40866a58eeea9f258d4697b2686c4.tar.gz
talos-hostboot-9e4f956b73d40866a58eeea9f258d4697b2686c4.zip
Expand hostboot progress indicator in core scratch 3 reg
Previously this register only had 2 values. "running" in ascii and 0 This commit adds 3 more possible states. Now 0 represents that HB passed off control to the hypervisor. "shutdown" represents that HB TI'ed. "bootload" says we are in the bootloader. "starthbb" means the bootloader has started the base image. "running" means hostboot is up and running. Change-Id: I11e7ef3dbb559a221343070b2c1b15f67853710b RTC: 171742 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39730 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Martin Gloff <mgloff@us.ibm.com> Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/bootloader')
-rw-r--r--src/bootloader/bootloader.C11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/bootloader/bootloader.C b/src/bootloader/bootloader.C
index 097fc0549..13e58b8b9 100644
--- a/src/bootloader/bootloader.C
+++ b/src/bootloader/bootloader.C
@@ -238,6 +238,11 @@ namespace Bootloader{
bootloader_trace_index = 0;
BOOTLOADER_TRACE(BTLDR_TRC_MAIN_START);
+ //Set core scratch 3 to say bootloader is active
+ //"bootload" = 0x626F6F746C6F6164 in ascii
+ uint64_t hostboot_string = 0x626F6F746C6F6164;
+ writeScratchReg(MMIO_SCRATCH_HOSTBOOT_ACTIVE, hostboot_string);
+
// @TODO RTC:138268 Support multiple sides of PNOR in bootloader
//pnorEnd is the end of flash, which is base of lpc, plus
@@ -332,6 +337,12 @@ namespace Bootloader{
}
BOOTLOADER_TRACE(BTLDR_TRC_MAIN_COPY_HBB_DONE);
+ //Set core scratch 3 to say hbb image is starting
+ //"starthbb" = 0x7374617274686262 in ascii
+ hostboot_string = 0x7374617274686262;
+ writeScratchReg(MMIO_SCRATCH_HOSTBOOT_ACTIVE,
+ hostboot_string);
+
// Start executing HBB
enterHBB(HBB_HRMOR, HBB_RUNNING_OFFSET);
}
OpenPOWER on IntegriCloud