diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2013-05-08 13:43:26 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-05-15 09:34:02 -0500 |
| commit | b0fc4d4e4bd6d78040b96674a2fe65fc306ea995 (patch) | |
| tree | aff044f9569a674b403496be54ad939af2ac76fb /src/usr/pnor | |
| parent | c24b25d1a269c4f814b634e49d81a8bb3772f0e7 (diff) | |
| download | talos-hostboot-b0fc4d4e4bd6d78040b96674a2fe65fc306ea995.tar.gz talos-hostboot-b0fc4d4e4bd6d78040b96674a2fe65fc306ea995.zip | |
BEAM fixes for various components.
Change-Id: I900f33eefeeeaa35d981b93c1af0bec8ab4000c2
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4424
Tested-by: Jenkins Server
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
| -rw-r--r-- | src/usr/pnor/pnordd.C | 4 | ||||
| -rw-r--r-- | src/usr/pnor/pnorrp.C | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/src/usr/pnor/pnordd.C b/src/usr/pnor/pnordd.C index fb4540e34..6c65f2dd2 100644 --- a/src/usr/pnor/pnordd.C +++ b/src/usr/pnor/pnordd.C @@ -773,7 +773,7 @@ errlHndl_t PnorDD::micronFlagStatus(uint64_t i_pollTime) //Check flag status bit. - uint32_t opStatus; + uint32_t opStatus = 0; uint64_t poll_time = 0; uint64_t loop = 0; while( poll_time < i_pollTime ) @@ -842,7 +842,7 @@ errlHndl_t PnorDD::micronFlagStatus(uint64_t i_pollTime) //Erase & Program error bits are sticky, so they need to be cleared. //Configure Get "Chip ID" command in SFC to clear special - //Micron 'flag status' register. remaining bits are all zero + //Micron 'flag status' register. remaining bits are all zero // since we just need to issue the SPI command. uint32_t confData = SPI_MICRON_CLRFLAG_STAT << 24; TRACDCOMP( g_trac_pnor, "PnorDD::micronFlagStatus> confData=0x%.8x", diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C index 228771a11..af865d8d7 100644 --- a/src/usr/pnor/pnorrp.C +++ b/src/usr/pnor/pnorrp.C @@ -314,15 +314,19 @@ errlHndl_t PnorRP::getSectionInfo( PNOR::SectionId i_section, } } while(0); - TRACDCOMP( g_trac_pnor, "PnorRP::getSectionInfo: i_section=%d, side=%d : id=%d", i_section, side, iv_TOC[side][i_section].id ); - - // copy my data into the external format - o_info.id = iv_TOC[side][id].id; - o_info.side = iv_TOC[side][id].side; - o_info.name = cv_EYECATCHER[id]; - o_info.vaddr = iv_TOC[side][id].virtAddr; - o_info.size = iv_TOC[side][id].size; - o_info.eccProtected = (bool)(iv_TOC[side][id].miscFlags & FFS_MISC_ECC_PROTECT); + if (PNOR::INVALID_SECTION != id) + { + TRACDCOMP( g_trac_pnor, "PnorRP::getSectionInfo: i_section=%d, side=%d : id=%d", i_section, side, iv_TOC[side][i_section].id ); + + // copy my data into the external format + o_info.id = iv_TOC[side][id].id; + o_info.side = iv_TOC[side][id].side; + o_info.name = cv_EYECATCHER[id]; + o_info.vaddr = iv_TOC[side][id].virtAddr; + o_info.size = iv_TOC[side][id].size; + o_info.eccProtected = (bool)(iv_TOC[side][id].miscFlags & + FFS_MISC_ECC_PROTECT); + } return l_errhdl; } |
