diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2018-04-26 10:56:56 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-05-07 16:13:33 -0400 |
| commit | 6634b6fca3df25e48a489ee45f09ba40e67b99f0 (patch) | |
| tree | 519e3a90734e5b09c0225923b9112f501f349c74 | |
| parent | dd25ed1a207c0bcc7f0b36733f6e5a0fcca31f38 (diff) | |
| download | talos-hostboot-6634b6fca3df25e48a489ee45f09ba40e67b99f0.tar.gz talos-hostboot-6634b6fca3df25e48a489ee45f09ba40e67b99f0.zip | |
Better debug for weird PIR issues
Ran into a case where Hostboot was getting booted with the wrong
fabricid for the node it was on. In the process I realized it
was hard to tell what was going on.
Added printk output to show the PIR of the boot core.
Modified how force-hrmor option is consumed in ecmd-debug-framework
so that you can force unnatural lookups.
Change-Id: I77fc614889aa3cedcc8ccd39cac9ebc36f239b56
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57910
Tested-by: Jenkins Server <pfd-jenkins+hostboot@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>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rwxr-xr-x | src/build/debug/ecmd-debug-framework.pl | 13 | ||||
| -rw-r--r-- | src/kernel/kernel.C | 7 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/build/debug/ecmd-debug-framework.pl b/src/build/debug/ecmd-debug-framework.pl index 6514f5b0f..15439c66a 100755 --- a/src/build/debug/ecmd-debug-framework.pl +++ b/src/build/debug/ecmd-debug-framework.pl @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2013,2017 +# Contributors Listed Below - COPYRIGHT 2013,2018 # [+] International Business Machines Corp. # # @@ -45,7 +45,7 @@ my $toolOptions = ""; my $cfgHelp = 0; my $cfgMan = 0; my $toolHelp = 0; -my $forceHRMOR = DEFAULT_HRMOR; +my $forceHRMOR = 0; my $node = 0; # -nX parm to ecmd my $proc = 0; # -pX parm to ecmd my $memMode = "check"; @@ -148,7 +148,14 @@ sub getEnv # sub getHRMOR { - return $forceHRMOR + ($node * PER_NODE_OFFSET); + if( $forceHRMOR != 0 ) + { + return $forceHRMOR; + } + else + { + return DEFAULT_HRMOR + ($node * PER_NODE_OFFSET); + } } # @sub readData diff --git a/src/kernel/kernel.C b/src/kernel/kernel.C index 970813ec8..e78dca726 100644 --- a/src/kernel/kernel.C +++ b/src/kernel/kernel.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2010,2017 */ +/* Contributors Listed Below - COPYRIGHT 2010,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -102,8 +102,9 @@ extern "C" int main() { printk("Booting %s kernel...\n\n", "Hostboot"); - printk("CPU=%s\n", - ProcessorCoreTypeStrings[CpuID::getCpuType()]); + printk("CPU=%s PIR=%ld\n", + ProcessorCoreTypeStrings[CpuID::getCpuType()], + static_cast<uint64_t>(getPIR())); MAGIC_INST_PRINT_ISTEP(6,2); // Erase task-pointer so that TaskManager::getCurrentTask() returns NULL. |
