diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2017-03-24 14:17:48 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-23 14:02:55 -0400 |
| commit | 3d40df249d4ff2f2f6a3c17dcab7d069a355d28a (patch) | |
| tree | c4dae42b02565637586d2c254ab8077a3dac1658 /src/include | |
| parent | da1946689af4b765c9ad5c6a7f64cc4f34df252a (diff) | |
| download | talos-hostboot-3d40df249d4ff2f2f6a3c17dcab7d069a355d28a.tar.gz talos-hostboot-3d40df249d4ff2f2f6a3c17dcab7d069a355d28a.zip | |
Changing NV target to OBUS_BRICK and mark it a child of OBUS
Change-Id: I17b52033d1e6811c320f201056708f31ef34d0e9
RTC:171597
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38481
Tested-by: Jenkins Server <pfd-jenkins+hostboot@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>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H | 2 | ||||
| -rw-r--r-- | src/include/usr/fapi2/target.H | 32 |
2 files changed, 18 insertions, 16 deletions
diff --git a/src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H b/src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H index 78101fe95..e114a487b 100644 --- a/src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H +++ b/src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H @@ -100,7 +100,7 @@ namespace fapi2 RC_PEC_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1a, RC_XBUS_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1b, RC_OBUS_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1c, - RC_NV_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1d, + RC_OBRICK_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1d, RC_PPE_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1e, RC_PERV_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1f, RC_CAPP_NO_PROC_FOUND = FAPI2_COMP_ID | 0x20, diff --git a/src/include/usr/fapi2/target.H b/src/include/usr/fapi2/target.H index a02142d77..314801ca8 100644 --- a/src/include/usr/fapi2/target.H +++ b/src/include/usr/fapi2/target.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -217,8 +217,8 @@ inline TARGETING::TYPE convertFapi2TypeToTargeting(fapi2::TargetType i_T) case fapi2::TARGET_TYPE_OBUS: o_targetingType = TARGETING::TYPE_OBUS; break; - case fapi2::TARGET_TYPE_NV: - o_targetingType = TARGETING::TYPE_NV; + case fapi2::TARGET_TYPE_OBUS_BRICK: + o_targetingType = TARGETING::TYPE_OBUS_BRICK; break; case fapi2::TARGET_TYPE_SBE: o_targetingType = TARGETING::TYPE_SBE; @@ -314,8 +314,8 @@ inline fapi2::TargetType convertTargetingTypeToFapi2(TARGETING::TYPE i_T) case TARGETING::TYPE_OBUS: o_targetingType = fapi2::TARGET_TYPE_OBUS; break; - case TARGETING::TYPE_NV: - o_targetingType = fapi2::TARGET_TYPE_NV; + case TARGETING::TYPE_OBUS_BRICK: + o_targetingType = fapi2::TARGET_TYPE_OBUS_BRICK; break; case TARGETING::TYPE_SBE: o_targetingType = fapi2::TARGET_TYPE_SBE; @@ -368,7 +368,7 @@ inline Target<T, V> Target<K, V>::getParent(void) const fapi2::TARGET_TYPE_CAPP | fapi2::TARGET_TYPE_DMI | fapi2::TARGET_TYPE_OBUS | - fapi2::TARGET_TYPE_NV | + fapi2::TARGET_TYPE_OBUS_BRICK | fapi2::TARGET_TYPE_SBE | fapi2::TARGET_TYPE_PPE | fapi2::TARGET_TYPE_PERV | @@ -384,7 +384,7 @@ inline Target<T, V> Target<K, V>::getParent(void) const fapi2::TARGET_TYPE_XBUS | fapi2::TARGET_TYPE_OBUS | fapi2::TARGET_TYPE_CAPP | - fapi2::TARGET_TYPE_NV | + fapi2::TARGET_TYPE_OBUS_BRICK | fapi2::TARGET_TYPE_MCBIST | fapi2::TARGET_TYPE_MCS | fapi2::TARGET_TYPE_MCA | @@ -559,13 +559,15 @@ inline Target<T, V> Target<K, V>::getParent(void) const (T != fapi2::TARGET_TYPE_PROC_CHIP)), "improper parent of fapi2::TARGET_TYPE_OBUS"); - // valid parents for NV - // NV -> PERV - // NV -> PROC - static_assert(!((K == fapi2::TARGET_TYPE_NV) && + // valid parents for OBUS_BRICK + // OBUS_BRICK -> PERV + // OBUS_BRICK -> OBUS + // OBUS_BRICK -> PROC + static_assert(!((K == fapi2::TARGET_TYPE_OBUS_BRICK) && (T != fapi2::TARGET_TYPE_PERV) && + (T != fapi2::TARGET_TYPE_OBUS) && (T != fapi2::TARGET_TYPE_PROC_CHIP)), - "improper parent of fapi2::TARGET_TYPE_NV"); + "improper parent of fapi2::TARGET_TYPE_OBUS_BRICK"); // valid parents for CAPP // CAPP -> PERV @@ -666,7 +668,7 @@ FAPI_DBG(ENTER_MRK "getChildren. Type 0x%08x State:0x%08x", T, i_state); (T != fapi2::TARGET_TYPE_XBUS) && (T != fapi2::TARGET_TYPE_OBUS) && (T != fapi2::TARGET_TYPE_CAPP) && - (T != fapi2::TARGET_TYPE_NV) && + (T != fapi2::TARGET_TYPE_OBUS_BRICK) && (T != fapi2::TARGET_TYPE_MCBIST) && (T != fapi2::TARGET_TYPE_MCS) && (T != fapi2::TARGET_TYPE_MCA) && @@ -762,8 +764,8 @@ FAPI_DBG(ENTER_MRK "getChildren. Type 0x%08x State:0x%08x", T, i_state); "fapi2::TARGET_TYPE_CAPP has no children"); static_assert((K != fapi2::TARGET_TYPE_OBUS), "fapi2::TARGET_TYPE_OBUS has no children"); - static_assert((K != fapi2::TARGET_TYPE_NV), - "fapi2::TARGET_TYPE_NV has no children"); + static_assert((K != fapi2::TARGET_TYPE_OBUS_BRICK), + "fapi2::TARGET_TYPE_OBUS_BRICK has no children"); static_assert((K != fapi2::TARGET_TYPE_SBE), "fapi2::TARGET_TYPE_SBE has no children"); static_assert((K != fapi2::TARGET_TYPE_PPE), |
