summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Palmer <cnpalmer@us.ibm.com>2019-08-14 08:16:04 -0500
committerZane C Shelley <zshelle@us.ibm.com>2019-08-21 09:57:35 -0500
commit285dc2bbefa0eca524cca8212d2cb9fd2ddf1fee (patch)
treee99542c5672b80ef4f5d63fed36dd256f13aa11b
parent84e076b714ec05cacad4fb97c3713ab08778c6b9 (diff)
downloadtalos-hostboot-285dc2bbefa0eca524cca8212d2cb9fd2ddf1fee.tar.gz
talos-hostboot-285dc2bbefa0eca524cca8212d2cb9fd2ddf1fee.zip
PRD: Uncomment OMI bus callout and cleanup getSlaveRanks
Change-Id: Ia5e6c86124b1a5ecece87eed43721fc38486ae88 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82216 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Benjamen G Tyner <ben.tyner@ibm.com> Reviewed-by: Zane C Shelley <zshelle@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82566 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
-rw-r--r--src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C3
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/prdfTargetServices.C25
2 files changed, 8 insertions, 20 deletions
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C b/src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C
index a51b94134..3168d77b7 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfLaneRepair.C
@@ -998,8 +998,7 @@ int32_t calloutBusInterface( ExtensibleChip * i_chip,
else if ( (TYPE_OMI == rxType && TYPE_OCMB_CHIP == txType) ||
(TYPE_OCMB_CHIP == rxType && TYPE_OMI == txType) )
{
- //TODO RTC 199028
- //hwasType = HWAS::OMI_BUS_TYPE;
+ hwasType = HWAS::OMI_BUS_TYPE;
}
else
{
diff --git a/src/usr/diag/prdf/common/plat/prdfTargetServices.C b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
index e881865ce..d34c980ad 100755
--- a/src/usr/diag/prdf/common/plat/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
@@ -1697,7 +1697,7 @@ void getMasterRanks<TYPE_OCMB_CHIP>( TargetHandle_t i_trgt,
//------------------------------------------------------------------------------
template<TARGETING::TYPE T>
-void __getSlaveRanks( TargetHandle_t i_trgt, std::vector<MemRank> & o_ranks,
+void getSlaveRanks( TargetHandle_t i_trgt, std::vector<MemRank> & o_ranks,
uint8_t i_ds )
{
PRDF_ASSERT( nullptr != i_trgt );
@@ -1738,29 +1738,18 @@ void __getSlaveRanks( TargetHandle_t i_trgt, std::vector<MemRank> & o_ranks,
}
}
-template<>
+template
void getSlaveRanks<TYPE_MCA>( TargetHandle_t i_trgt,
std::vector<MemRank> & o_ranks,
- uint8_t i_ds )
-{
- __getSlaveRanks<TYPE_MCA>( i_trgt, o_ranks, i_ds );
-}
-
-template<>
+ uint8_t i_ds );
+template
void getSlaveRanks<TYPE_MBA>( TargetHandle_t i_trgt,
std::vector<MemRank> & o_ranks,
- uint8_t i_ds )
-{
- __getSlaveRanks<TYPE_MBA>( i_trgt, o_ranks, i_ds );
-}
-
-template<>
+ uint8_t i_ds );
+template
void getSlaveRanks<TYPE_OCMB_CHIP>( TargetHandle_t i_trgt,
std::vector<MemRank> & o_ranks,
- uint8_t i_ds )
-{
- __getSlaveRanks<TYPE_OCMB_CHIP>( i_trgt, o_ranks, i_ds );
-}
+ uint8_t i_ds );
//------------------------------------------------------------------------------
OpenPOWER on IntegriCloud