Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ibmthi authored and Nicholas E Bofferding committed Sep 7, 2019
1 parent 59a2415 commit b3047dd
Showing 1 changed file with 2 additions and 1 deletion.
Expand Up @@ -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()
Expand Down

0 comments on commit b3047dd

Please sign in to comment.