Skip to content

Commit 70a6574

Browse files
Ilya Smirnovploetzma
Ilya Smirnov
authored and
ploetzma
committed
Clean up of devdesc in hostboot code
Change-Id: I252b9bffe2ff66d700c82f090b2d3bb21c1e570f RTC:118001 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40558 Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@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: Matthew A. Ploetz <maploetz@us.ibm.com>
1 parent 9b5ffd0 commit 70a6574

File tree

8 files changed

+52
-19
lines changed

8 files changed

+52
-19
lines changed

‎src/usr/fsi/fsipres.C

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2011,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2011,2017 */
99
/* [+] Google Inc. */
1010
/* [+] International Business Machines Corp. */
1111
/* */
@@ -82,6 +82,8 @@ errlHndl_t procPresenceDetect(DeviceFW::OperationType i_opType,
8282
* @reasoncode FSI::RC_INVALID_LENGTH
8383
* @userdata1 Data Length
8484
* @devdesc presenceDetect> Invalid data length (!= 1 bytes)
85+
* @custdesc FSI buffer length is not 1 byte when finding
86+
* processor
8587
*/
8688
l_errl =
8789
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -163,6 +165,7 @@ errlHndl_t procPresenceDetect(DeviceFW::OperationType i_opType,
163165
* @userdata2[0:31] FSI Presence
164166
* @userdata2[32:63] MVPD Presence
165167
* @devdesc presenceDetect> FSI and MVPD do not agree
168+
* @custdesc FSI and MVPD do not agree
166169
*/
167170
l_errl =
168171
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -254,6 +257,8 @@ errlHndl_t membPresenceDetect(DeviceFW::OperationType i_opType,
254257
* @reasoncode FSI::RC_INVALID_LENGTH
255258
* @userdata1 Data Length
256259
* @devdesc presenceDetect> Invalid data length (!= 1 bytes)
260+
* @custdesc FSI buffer length is not 1 byte when finding
261+
* a memory buffer chip
257262
*/
258263
l_errl =
259264
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -325,6 +330,7 @@ errlHndl_t membPresenceDetect(DeviceFW::OperationType i_opType,
325330
* @userdata2[0:31] FSI Presence
326331
* @userdata2[32:63] VPD Presence
327332
* @devdesc presenceDetect> FSI and CVPD do not agree
333+
* @custdesc FSI and CVPD do not agree
328334
*/
329335
l_errl =
330336
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,

‎src/usr/hwas/hwasPlat.C

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ errlHndl_t platReadIDEC(const TargetHandle_t &i_target)
116116
* @userdata1 Target HUID
117117
* @userdata2 <unused>
118118
* @devdesc platReadIDEC> Invalid chipid from hardware (all FFs)
119+
* @custdesc Invalid chipid from hardware (all FFs)
119120
*/
120121
errl = new ERRORLOG::ErrlEntry(
121122
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -323,6 +324,7 @@ errlHndl_t platReadLx(const TargetHandle_t &i_mca,
323324
* @userdata1 0
324325
* @userdata2 0
325326
* @devdesc platReadLx> Bad MCA target
327+
* @custdesc Bad MCA target
326328
*/
327329
errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
328330
HWAS::MOD_PLAT_READLX,
@@ -355,6 +357,7 @@ errlHndl_t platReadLx(const TargetHandle_t &i_mca,
355357
* @userdata1 Target MCA HUID
356358
* @userdata2 Value of x for Lx keyword
357359
* @devdesc platReadLx> Invalid Lx keyword
360+
* @custdesc Invalid Lx keyword
358361
*/
359362
errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
360363
HWAS::MOD_PLAT_READLX,

‎src/usr/lpc/lpcdd.C

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,7 @@ errlHndl_t LpcDD::hwReset( ResetLevels i_resetLevel )
592592
* @userdata2 <unused>
593593
* @devdesc LpcDD::hwReset> Unsupported Reset Level
594594
* requested
595+
* @custdesc Unsupported Reset Level requested
595596
*/
596597
l_err = new ERRORLOG::ErrlEntry(
597598
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1007,6 +1008,7 @@ errlHndl_t LpcDD::checkForOpbErrors( ResetLevels &o_resetLevel )
10071008
* @userdata2 Reset Level
10081009
* @devdesc LpcDD::checkForOpbErrors> Error(s) found in OPB
10091010
* and/or LPCHC Status Register
1011+
* @custdesc Error(s) found in OPB and/or LPCHC Status Register
10101012
*/
10111013
l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
10121014
LPC::MOD_LPCDD_CHECKFOROPBERRORS,

‎src/usr/pnor/pnor_common.C

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ errlHndl_t PNOR::parseTOC( uint8_t* i_tocBuffer,SectionData_t * o_TOC)
153153
* @userdata2 Error code
154154
* @devdesc Expected buffer to have contents of TOC,
155155
* instead was NULL
156-
* @custdesc A problem occurred while reading PNOR
157-
* partition table
156+
* @custdesc A problem occurred while reading
157+
* Processor NOR flash partition table
158158
*/
159159
l_errhdl = new ERRORLOG::ErrlEntry(
160160
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -183,8 +183,8 @@ errlHndl_t PNOR::parseTOC( uint8_t* i_tocBuffer,SectionData_t * o_TOC)
183183
* @userdata1 Address of toc buffer
184184
* @userdata2 Error Code
185185
* @devdesc Hdr of TOC of PNOR failed checksum
186-
* @custdesc A problem occurred while reading PNOR
187-
* partition table
186+
* @custdesc A problem occurred while reading
187+
* Processor NOR flash partition table
188188
*/
189189
l_errhdl = new ERRORLOG::ErrlEntry(
190190
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -211,8 +211,8 @@ errlHndl_t PNOR::parseTOC( uint8_t* i_tocBuffer,SectionData_t * o_TOC)
211211
* @userdata1 Address of toc buffer
212212
* @userdata2 Error Code
213213
* @devdesc Hdr of TOC of PNOR failed series of tests
214-
* @custdesc A problem occurred while reading PNOR
215-
* partition table
214+
* @custdesc A problem occurred while reading
215+
* Processor NOR flash partition table
216216
*/
217217
l_errhdl = new ERRORLOG::ErrlEntry(
218218
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -251,8 +251,8 @@ errlHndl_t PNOR::parseTOC( uint8_t* i_tocBuffer,SectionData_t * o_TOC)
251251
* @userdata1 Address of toc buffer
252252
* @userdata2 Error Code
253253
* @devdesc Error while parsing pnor TOC entries
254-
* @custdesc A problem occurred while reading PNOR
255-
* partition table
254+
* @custdesc A problem occurred while reading
255+
* Processor NOR flash partition table
256256
*/
257257
l_errhdl = new ERRORLOG::ErrlEntry(
258258
ERRORLOG::ERRL_SEV_UNRECOVERABLE,

‎src/usr/pnor/pnorrp.C

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ errlHndl_t PNOR::flush( PNOR::SectionId i_section)
130130
* @userdata1 section Id
131131
* @userdata2 RC
132132
* @devdesc mm_remove_pages failed
133+
* @custdesc Failed to remove pages
133134
*/
134135
l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
135136
PNOR::MOD_PNORRP_FLUSH,
@@ -445,6 +446,7 @@ errlHndl_t PnorRP::getSideInfo( PNOR::SideId i_side,
445446
* @userdata1 Requested SIDE
446447
* @userdata2 0
447448
* @devdesc PnorRP::getSideInfo> Side not supported
449+
* @custdesc Processor NOR flash: Side not supported
448450
*/
449451
l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
450452
PNOR::MOD_PNORRP_GETSIDEINFO,
@@ -481,7 +483,8 @@ errlHndl_t PnorRP::getSectionInfo( PNOR::SectionId i_section,
481483
* @userdata1 Requested Section
482484
* @userdata2 Startup RC
483485
* @devdesc PnorRP::getSectionInfo> RP not properly initialized
484-
* @custdesc A problem occurred while accessing the boot flash.
486+
* @custdesc Processor NOR flash:
487+
* A problem occurred while accessing the boot flash.
485488
*/
486489
l_errhdl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
487490
PNOR::MOD_PNORRP_GETSECTIONINFO,
@@ -1063,6 +1066,8 @@ errlHndl_t PnorRP::setSideInfo ()
10631066
* @userdata2[00:31] primary toc
10641067
* @userdata2[32:63] backup toc
10651068
* @devdesc PnorRP::setSideInfo> No valid TOCs found
1069+
* @custdesc No valid Table of Contents (TOC) found
1070+
* for Processor NOR flash
10661071
*/
10671072
l_err = new ERRORLOG::ErrlEntry(
10681073
ERRORLOG::ERRL_SEV_INFORMATIONAL,
@@ -1773,9 +1778,9 @@ errlHndl_t PnorRP::setVirtAddrs(void)
17731778
* @userdata1 PNOR section id
17741779
* @userdata2 PNOR section vaddr
17751780
* @devdesc Could not set permissions of the
1776-
* given PNOR section to WRITABLE
1781+
* given PNOR section to WRITABLE
17771782
* @custdesc A problem occurred while reading
1778-
* PNOR partition table
1783+
* Processor NOR flash partition table
17791784
*/
17801785
l_errhdl = new ERRORLOG::ErrlEntry(
17811786
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -1806,10 +1811,10 @@ errlHndl_t PnorRP::setVirtAddrs(void)
18061811
* @userdata1 PNOR section id
18071812
* @userdata2 PNOR section vaddr
18081813
* @devdesc Could not set permissions of the
1809-
* given PNOR section to
1810-
* WRITABLE/WRITE_TRACKED
1814+
* given PNOR section to
1815+
* WRITABLE/WRITE_TRACKED
18111816
* @custdesc A problem occurred while reading
1812-
* PNOR partition table
1817+
* Processor NOR flash partition table
18131818
*/
18141819
l_errhdl = new ERRORLOG::ErrlEntry(
18151820
ERRORLOG::ERRL_SEV_UNRECOVERABLE,

‎src/usr/pnor/pnorvalid.C

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,9 @@ errlHndl_t validateAltMaster( void )
246246
* @userdata2 <unused>
247247
* @devdesc PNOR::validateAltMaster> Fail verifying FFS
248248
* Header on Master Candidate PNOR TOC0
249+
* @custdesc Fail verifying Flash File System (FFS) Header
250+
* on Master Candidate Processor NOR flash Table
251+
* of Contents 0 (TOC)
249252
*/
250253
l_err = new ERRORLOG::ErrlEntry(
251254
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
@@ -375,6 +378,8 @@ errlHndl_t validateMagic(PnorDD* i_pnordd,
375378
* @userdata2 <unused>
376379
* @devdesc PNOR::validateMagic> Fail verifying FFS Magic
377380
* Number in Header on Master
381+
* @custdesc Fail verifying Flash File System (FFS) Magic
382+
* Number in Header on Master
378383
*/
379384
l_err = new ERRORLOG::ErrlEntry(
380385
ERRORLOG::ERRL_SEV_UNRECOVERABLE,

‎src/usr/sbe/sbe_update.C

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2355,6 +2355,8 @@ namespace SBE
23552355
* @userdata2[32:63] Size - ECC
23562356
* @devdesc ECC or Data Miscompare Fail Reading Back
23572357
* SBE Version Information
2358+
* @custdesc ECC or Data Miscompare Fail Reading Back
2359+
* Self Boot Engine (SBE) Version Information
23582360
*/
23592361
err = new ErrlEntry(ERRL_SEV_PREDICTIVE,
23602362
SBE_UPDATE_SEEPROMS,
@@ -3531,6 +3533,8 @@ namespace SBE
35313533
* @userdata2[32:63] Original SEEPROM 1 CRC
35323534
* @devdesc Successful Update of SBE SEEPROM
35333535
* SBE Version Information
3536+
* @custdesc Successful Update of Self Boot Engine
3537+
* (SBE) SEEPROM SBE Version Information
35343538
*/
35353539
err_info = new ErrlEntry(ERRL_SEV_INFORMATIONAL,
35363540
SBE_PERFORM_UPDATE_ACTIONS,
@@ -4230,6 +4234,8 @@ namespace SBE
42304234
* @userdata2 Master Target Loop Index
42314235
* @devdesc SBE Image Version Miscompare with
42324236
* Master Target
4237+
* @custdesc Self Boot Engine (SBE) Image Version
4238+
* Miscompare with Master Target
42334239
*/
42344240
err = new ErrlEntry(ERRL_SEV_PREDICTIVE,
42354241
SBE_MASTER_VERSION_COMPARE,
@@ -4387,6 +4393,8 @@ namespace SBE
43874393
* @userdata1 Master Target HUID
43884394
* @userdata2 Comparison Target HUID
43894395
* @devdesc SBE Version Miscompare with Master Target
4396+
* @custdesc Self Boot Engine (SBE) Version Miscompare
4397+
* with Master Target
43904398
*/
43914399
err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
43924400
SBE_MASTER_VERSION_COMPARE,

‎src/usr/targeting/attrPlatOverride.C

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ errlHndl_t getAttrOverrides(PNOR::SectionInfo_t &i_sectionInfo,
102102
* @userdata2 Size of AttrOverrideSection
103103
* @devdesc AttrOverrideSection too big to fit in remaining
104104
* chunck of pnor section
105-
* @custdesc Invalid configuration data in firmware pnor
105+
* @custdesc Invalid configuration data in firmware Processor
106+
* NOR flash
106107
*/
107108
l_err =
108109
new ERRORLOG::ErrlEntry
@@ -131,7 +132,8 @@ errlHndl_t getAttrOverrides(PNOR::SectionInfo_t &i_sectionInfo,
131132
* @userdata2 Size of Serialized attribute override
132133
* @devdesc Serialized attribute override chunk too big to
133134
* fit in remaining chunck of pnor section
134-
* @custdesc Invalid configuration data in firmware pnor
135+
* @custdesc Invalid configuration data in firmware Processor
136+
* NOR flash
135137
*/
136138
l_err =
137139
new ERRORLOG::ErrlEntry
@@ -159,7 +161,8 @@ errlHndl_t getAttrOverrides(PNOR::SectionInfo_t &i_sectionInfo,
159161
* @userdata2 Chunk location with no tank layer
160162
* @devdesc No tank layer was specified for attribute
161163
* override.
162-
* @custdesc Invalid configuration data in firmware pnor
164+
* @custdesc Invalid configuration data in firmware Processor
165+
* NOR flash
163166
*/
164167
l_err =
165168
new ERRORLOG::ErrlEntry
@@ -191,7 +194,8 @@ errlHndl_t getAttrOverrides(PNOR::SectionInfo_t &i_sectionInfo,
191194
* @devdesc Attribute override is in the wrong pnor section
192195
* needs to be moved to the section associated
193196
* with its attribute tank layer
194-
* @custdesc Invalid configuration data in firmware pnor
197+
* @custdesc Invalid configuration data in firmware Processor
198+
* NOR flash
195199
*/
196200
l_err =
197201
new ERRORLOG::ErrlEntry

0 commit comments

Comments
 (0)