summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C21
-rw-r--r--src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C17
-rw-r--r--src/import/chips/p9/procedures/xml/error_info/p9_mvpd_ring_funcs_errors.xml4
3 files changed, 29 insertions, 13 deletions
diff --git a/src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C b/src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C
index b9aa79591..1c6650825 100644
--- a/src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C
+++ b/src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C
@@ -280,13 +280,20 @@ extern "C"
// do the get or set specific operations
if (i_mvpdRingFuncOp == MVPD_RING_GET ) // do the get operation
{
- // ensure ring was found. Must be there for "get"
- FAPI_ASSERT(l_ringLen != 0,
- fapi2::MVPD_RING_NOT_FOUND().
- set_CHIP_TARGET(i_fapiTarget).
- set_RING_ID(i_ringId).
- set_CHIPLET_ID(i_chipletId),
- "mvpdRingFunc: mvpdRingFuncFind did not find ring");
+ // Ensure ring was found. Must be there for "get"
+ //@TODO: Uncomment the following after PowerOn. Also, need to come
+ // to agreement whether this should be fatal error or not.
+ // For now, for PO, it's considered benign and noise and is
+ // being commented out... most of it at least.
+ FAPI_ASSERT( l_ringLen != 0,
+ fapi2::MVPD_RING_NOT_FOUND().
+ set_CHIP_TARGET(i_fapiTarget) );
+ //FAPI_ASSERT(l_ringLen != 0,
+ // fapi2::MVPD_RING_NOT_FOUND().
+ // set_CHIP_TARGET(i_fapiTarget).
+ // set_RING_ID(i_ringId).
+ // set_CHIPLET_ID(i_chipletId),
+ // "mvpdRingFunc: mvpdRingFuncFind did not find ring");
// copy ring back to caller's buffer
FAPI_TRY(mvpdRingFuncGet(l_pRing,
diff --git a/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C b/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C
index 07a5c3f75..3f0df077b 100644
--- a/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C
+++ b/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C
@@ -446,9 +446,14 @@ fapi2::ReturnCode _fetch_and_insert_vpd_rings(
{
// No match, do nothing. Next chipletId.
- FAPI_INF("_fetch_and_insert_vpd_rings():"
- "(ringId,chipletId)=(0x%X,0x%X) not found.",
- i_ring.ringId, l_chipletId);
+ //@TODO: Uncomment the following after PowerOn. Also, need to come
+ // to agreement whether this should be fatal error or not.
+ // For now, for PO, it's considered benign and noise and is
+ // being commented out... most of it at least.
+ //FAPI_INF("_fetch_and_insert_vpd_rings(): "
+ // "(ringId,chipletId)=(0x%X,0x%X) not found.",
+ // i_ring.ringId, l_chipletId);
+
fapi2::current_err = fapi2::FAPI2_RC_SUCCESS;
}
@@ -866,9 +871,13 @@ fapi2::ReturnCode p9_xip_customize (
" Min req'd boot cores: %d",
io_bootCoreMask, l_actualEcCount, MIN_REQD_ECS );
- fapi2::current_err = fapi2::FAPI2_RC_SUCCESS;
+ l_fapiRc = fapi2::FAPI2_RC_SUCCESS;
}
+
+ fapi2::current_err = l_fapiRc;
+ goto fapi_try_exit;
+
}
// More size code sanity checks of section and image sizes.
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_mvpd_ring_funcs_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_mvpd_ring_funcs_errors.xml
index d1ee2e2e6..4250b2eef 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_mvpd_ring_funcs_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_mvpd_ring_funcs_errors.xml
@@ -54,8 +54,8 @@
<priority>HIGH</priority>
</callout>
<ffdc>CHIP_TARGET</ffdc>
- <ffdc>RING_ID</ffdc>
- <ffdc>CHIPLET_ID</ffdc>
+<!-- <ffdc>RING_ID</ffdc> -->
+<!-- <ffdc>CHIPLET_ID</ffdc> -->
</hwpError>
<!-- ********************************************************************* -->
<hwpError>
OpenPOWER on IntegriCloud