diff options
author | Brian Horton <brianh@linux.ibm.com> | 2013-09-24 15:30:47 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-10-03 11:37:15 -0500 |
commit | 2c4adbce46a0d2c88df5f01d21b2b4ce9fd96668 (patch) | |
tree | 5e74a5ffb3a739731edf17f0fe8787cf6a090295 | |
parent | ae03dc12f7eada2ff3766c3f8f3a3e761d1e8dbe (diff) | |
download | talos-hostboot-2c4adbce46a0d2c88df5f01d21b2b4ce9fd96668.tar.gz talos-hostboot-2c4adbce46a0d2c88df5f01d21b2b4ce9fd96668.zip |
Correct SRC byte in errlog.
Change-Id: I0c8dc21b0d77e98742391663bede304c483ac4d7
RTC: 86183
CQ: SW225885
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6342
Tested-by: Jenkins Server
Reviewed-by: Donald E. Dahle <dedahle@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r-- | src/include/usr/errl/hberrltypes.H | 14 | ||||
-rw-r--r-- | src/usr/errl/errlsrc.C | 56 | ||||
-rw-r--r-- | src/usr/errl/test/errluserdetailtest.H | 6 |
3 files changed, 38 insertions, 38 deletions
diff --git a/src/include/usr/errl/hberrltypes.H b/src/include/usr/errl/hberrltypes.H index 78e01dba0..3c0611366 100644 --- a/src/include/usr/errl/hberrltypes.H +++ b/src/include/usr/errl/hberrltypes.H @@ -511,20 +511,20 @@ typedef struct pelsrcsection uint8_t wordcount; // usually 9 uint16_t reserved1; // usually 0, but I put reasonCode here uint16_t srcLength; // usually 72 - // "Hex word 2" is the legacy nomenclature. p. 71. - // Low byte of this word is SRC format 0xF0. + // "Hex word 2" + // Low byte of this word is SRC format 0xE0. uint32_t word2; - // "Hex word 3" p. 71 + // "Hex word 3" uint16_t word3; uint8_t moduleId; uint8_t reserved2; - // "Hex word 4" p. 71 last progress code + // "Hex word 4" last progress code uint32_t word4; - // "Hex word 5" p. 72 error status flags, etc. + // "Hex word 5" error status flags, etc. uint32_t word5; - // "Hex word 6-7" p. 72 optional, iv_user1 + // "Hex word 6-7" optional, iv_user1 uint64_t word6; - // "Hex word 8-9" p. 72 optional, iv_user2 + // "Hex word 8-9" optional, iv_user2 uint64_t word8; char srcString[32]; } __attribute__((packed)) pelSRCSection_t; diff --git a/src/usr/errl/errlsrc.C b/src/usr/errl/errlsrc.C index 801ca2234..11e46d92b 100644 --- a/src/usr/errl/errlsrc.C +++ b/src/usr/errl/errlsrc.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/errl/errlsrc.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/errl/errlsrc.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file errlsrc.C * @@ -120,9 +120,9 @@ uint64_t ErrlSrc::flatten( void * o_pBuffer, const uint64_t i_cbBuffer ) // Place data into the flat structure. - psrc->ver = ErrlSrc::SRCVER; // 2; See p.69 - // psrc->flags = 0; // p.69 - psrc->wordcount = ErrlSrc::WORDCOUNT; // 9; See p.69 + psrc->ver = ErrlSrc::SRCVER; // 2; + // psrc->flags = 0; // + psrc->wordcount = ErrlSrc::WORDCOUNT; // 9; // TODO FSP firmware puts zero here. Cheat and put reasonCode here. // Makes for easier retrieval than teasing it out of the SRC @@ -132,11 +132,11 @@ uint64_t ErrlSrc::flatten( void * o_pBuffer, const uint64_t i_cbBuffer ) CPPASSERT( ErrlSrc::SLEN == sizeof(pelSRCSection_t)-iv_header.flatSize()); psrc->srcLength = ErrlSrc::SLEN; - // SRC format p.71 of PEL reference. - psrc->word2 = 0xF0; + // SRC format + psrc->word2 = 0x000000E0; // SRCI_HBT_FORMAT // Stash the Hostboot module id into hex word 3 - psrc->moduleId = iv_modId; // p.71 + psrc->moduleId = iv_modId; // Stash the Hostboot long long words into the hexwords of the SRC. psrc->word6 = iv_user1; // spans 6-7 diff --git a/src/usr/errl/test/errluserdetailtest.H b/src/usr/errl/test/errluserdetailtest.H index e3417861d..70b4669ca 100644 --- a/src/usr/errl/test/errluserdetailtest.H +++ b/src/usr/errl/test/errluserdetailtest.H @@ -311,7 +311,7 @@ public: } c_target = *pProc; - ErrlUserDetailsTarget(c_target).addToLog(errl); + ErrlUserDetailsTarget(c_target, "Target: pProc").addToLog(errl); // 1-shot way first - each will have HUID before register data ErrlUserDetailsLogRegister(c_target, @@ -413,7 +413,7 @@ public: DEVICE_MBOX_ADDRESS(0)).addToLog(errl); c_target = *pMembuf; - ErrlUserDetailsTarget(c_target).addToLog(errl); + ErrlUserDetailsTarget(c_target, "Target: pMembuf").addToLog(errl); // HUID then each register { @@ -424,7 +424,7 @@ public: } c_target = *pDimm; - ErrlUserDetailsTarget(c_target).addToLog(errl); + ErrlUserDetailsTarget(c_target, "Target: pDimm").addToLog(errl); // HUID then each register { |