diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-06-22 16:20:55 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-26 18:07:56 -0400 |
| commit | 2374128170d355578a8d5141a19dfe6be7f8bd8e (patch) | |
| tree | 7a44948ed3b93a62fcb9d79fd2bf1a963a8ff15f /src/kernel | |
| parent | aa5ff65d1a960643a9bb6633921ed3b95ea34919 (diff) | |
| download | talos-hostboot-2374128170d355578a8d5141a19dfe6be7f8bd8e.tar.gz talos-hostboot-2374128170d355578a8d5141a19dfe6be7f8bd8e.zip | |
Remove asserts on variables that have valid default values
Currently the BlToHbData structure asserts when a caller asks for
info, but the structure was initialized as invalid. Now for the
the fields that have valid default values, we allow access to them.
Change-Id: I703526ab30c47c0e7723dbbfaf876ce4e2da6e3a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42321
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@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: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/bltohbdatamgr.C | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/kernel/bltohbdatamgr.C b/src/kernel/bltohbdatamgr.C index 919509c96..1bc076628 100644 --- a/src/kernel/bltohbdatamgr.C +++ b/src/kernel/bltohbdatamgr.C @@ -54,16 +54,16 @@ void BlToHbDataManager::validAssert() const void BlToHbDataManager::print() const { - printkd("\nBlToHbData (all addr HRMOR relative):\n"); - - if(iv_data.version >= Bootloader::BLTOHB_SAB) - { - printkd("-- secureSettings: SAB=%d, SecOvrd=%d, AllowAttrOvrd=%d\n", - iv_data.secureAccessBit, iv_data.securityOverride, - iv_data.allowAttrOverrides); - } if(iv_dataValid) { + printkd("\nBlToHbData (all addr HRMOR relative):\n"); + if(iv_data.version >= Bootloader::BLTOHB_SAB) + { + printkd("-- secureSettings: SAB=%d, SecOvrd=%d, AllowAttrOvrd=%d\n", + iv_data.secureAccessBit, iv_data.securityOverride, + iv_data.allowAttrOverrides); + } + printkd("-- eyeCatch = 0x%lX (%s)\n", iv_data.eyeCatch, reinterpret_cast<char*>(&iv_data.eyeCatch)); printkd("-- version = 0x%lX\n", iv_data.version); @@ -197,7 +197,6 @@ void BlToHbDataManager::initInvalid () const uint64_t BlToHbDataManager::getBranchtableOffset() const { - validAssert(); return iv_data.branchtableOffset; } @@ -215,7 +214,6 @@ const uint64_t BlToHbDataManager::getSecureRomAddr() const const size_t BlToHbDataManager::getSecureRomSize() const { - validAssert(); return iv_data.secureRomSize; } @@ -233,7 +231,6 @@ const uint64_t BlToHbDataManager::getHwKeysHashAddr() const const size_t BlToHbDataManager::getHwKeysHashSize() const { - validAssert(); return iv_data.hwKeysHashSize; } @@ -251,31 +248,26 @@ const uint64_t BlToHbDataManager::getHbbHeaderAddr() const const size_t BlToHbDataManager::getHbbHeaderSize() const { - validAssert(); return iv_data.hbbHeaderSize; } const bool BlToHbDataManager::getSecureAccessBit() const { - validAssert(); return iv_data.secureAccessBit; } const bool BlToHbDataManager::getSecurityOverride() const { - validAssert(); return iv_data.securityOverride; } const bool BlToHbDataManager::getAllowAttrOverrides() const { - validAssert(); return iv_data.allowAttrOverrides; } const size_t BlToHbDataManager::getPreservedSize() const { - validAssert(); return iv_preservedSize; } |
