diff options
| author | Thi Tran <thi@us.ibm.com> | 2019-08-22 16:54:47 -0400 |
|---|---|---|
| committer | Nicholas E Bofferding <bofferdn@us.ibm.com> | 2019-09-07 13:44:11 -0500 |
| commit | b3047ddb16f3237934298189d2aff8828375339c (patch) | |
| tree | 56fcd53e2051a6abdc4a828e1f692ce0c4c066d2 /src/import/chips/p9/procedures | |
| parent | 59a24151460bc006f698c950a4c648061d8c88f1 (diff) | |
| download | talos-hostboot-b3047ddb16f3237934298189d2aff8828375339c.tar.gz talos-hostboot-b3047ddb16f3237934298189d2aff8828375339c.zip | |
Fix bug injected by https://rchgit01.rchland.ibm.com/gerrit1/#/c/82196/
The check for NHTM base address alignment in the above commit causes a
false fail when NHTM base address is zero.
This commit adds a non-zero check to the base address.
Change-Id: I53ed735269c67bdec02f8bb7a2b368b0d19da62c
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82706
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Dev-Ready: Thi N Tran <thi@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Thi N Tran <thi@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Kahn C Evans <kahnevan@us.ibm.com>
Reviewed-by: Joseph J McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82717
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C index 23eca6ac6..db3d3e430 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C @@ -1568,7 +1568,8 @@ fapi2::ReturnCode EffGroupingBaseSizeData::set_HTM_OCC_base_addr( // Verify NHTM base addresses aligned with allocated size. // The OCC sandbox base is just a FW scratch area and no HW // functions mapped to it so we don't need to check its base alignment. - if (iv_nhtm_bar_base & (l_nhtmSize + l_chtmSize - 1) ) + if ( ((l_nhtmSize + l_chtmSize) > 0) && + (iv_nhtm_bar_base & ((l_nhtmSize + l_chtmSize) - 1)) ) { FAPI_ASSERT(false, fapi2::MSS_EFF_GROUPING_ADDRESS_NOT_ALIGNED() |
