Re-enable functionality turned off during p9 bringup

Change-Id: I39e1d7fa7854be7425831e657c82a4a3ebdeebf2
RTC:137627
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/777
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

6 files changed, 12 insertions, 16 deletions

diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C
index d5d8521a6..1081bb615 100644
--- a/src/usr/hwas/common/hwas.C
+++ b/src/usr/hwas/common/hwas.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
@@ -370,9 +370,8 @@ errlHndl_t discoverTargets()
                             if (l_procEntry.maxEXs == 0)
                             {
                                 // this is PROBABLY bad PR, so YELL...
-                                // @todo RTC:137627 - remove for P9 bringup
-                                //HWAS_ERR("pTarget %.8X - PR VPD says 0 CORES",
-                                //    pTarget->getAttr<ATTR_HUID>());
+                                HWAS_ERR("pTarget %.8X - PR VPD says 0 CORES",
+                                   pTarget->getAttr<ATTR_HUID>());
                             }
                         }
                       }
@@ -928,9 +927,8 @@ errlHndl_t restrictEXunits(
     HWAS_INF("restrictEXunits entry, %d elements", i_procList.size());
     errlHndl_t errl = NULL;
 
-    // @todo RTC:137627 - return from restrictEXunits for P9 bringup
+    // @todo RTC:145459 - P9 changes for PR core restriction
     return errl;
-
     // sort by group so PROC# are in the right groupings.
     std::sort(i_procList.begin(), i_procList.end(),
                 compareProcGroup);
@@ -1418,7 +1416,7 @@ errlHndl_t checkMinimumHardware(const TARGETING::ConstTargetHandle_t i_nodeOrSys
         HWAS_DBG( "checkMinimumHardware: %d functional dimms",
                   l_dimms.size());
 
-// @todo RTC:137627 - remov dimm stuff for P9 bringup
+// @todo RTC:142535 Add DIMM targets to MRW targeting script
 #if (0)
         if (l_dimms.empty())
         {
diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C
index 0b77c1b03..62a8f15d0 100755
--- a/src/usr/i2c/i2c.C
+++ b/src/usr/i2c/i2c.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -2898,7 +2898,7 @@ errlHndl_t i2cResetActiveMasters ( i2cProcessType i_resetType,
                "i_functional=%d",
                i_resetType, i_functional );
 
-    // @todo RTC:137627 - remove for P9 bringup
+    // @todo RTC:123019- I2CM Changes for P9
 #if (0)
     err = i2cProcessActiveMasters (i_resetType,  // select engines
                                    I2C_OP_RESET, // reset engines
diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H
index 4cd06b868..f0eece8bd 100644
--- a/src/usr/initservice/extinitsvc/extinitsvctasks.H
+++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H
@@ -267,7 +267,7 @@ const TaskInfo g_exttaskinfolist[]   =   {
         },
 
 
-        // @todo RTC:137627 - remove for p9 bringup
+        // @todo RTC:145354 Restore testprdf and testattn in p9 branch
 #if (0)
 // No mdia in VPO
 #ifndef CONFIG_VPO_COMPILE
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index 022d115cc..c696faa11 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -726,7 +726,7 @@ errlHndl_t IStepDispatcher::doIstep(uint32_t i_istep,
                       err->plid());
         }
 
-// @todo RTC:137627 - Removed for P9 bringup
+// @todo RTC:145353 - Restore testprdf and testattn in p9 branch
 #if (0)
         // Check for any attentions and invoke PRD for analysis
         // if not in MPIPL mode
diff --git a/src/usr/isteps/istep21/call_host_start_payload.C b/src/usr/isteps/istep21/call_host_start_payload.C
index a57ccd01b..3b6a5a536 100644
--- a/src/usr/isteps/istep21/call_host_start_payload.C
+++ b/src/usr/isteps/istep21/call_host_start_payload.C
@@ -254,7 +254,7 @@ void* call_host_start_payload (void *io_pArgs)
 
     if( l_errl == NULL )
     {
-// todo RTC:137627 - remove for P9 bringup
+// todo RTC:132413 Special Wakeup updates for P9
 #if (0)
         l_errl = disableSpecialWakeup();
 #endif
@@ -339,7 +339,7 @@ errlHndl_t callShutdown ( uint64_t i_masterInstance,
 
         }
 
-// @todo RTC:137627 - remove i2cSetupActiveMasters for P9 bringup
+// @todo RTC:123019 I2CM changes for P9bringup
 #if (0)
         // Phyp needs us to program all of the I2C masters with the bus
         // divisor
diff --git a/src/usr/xscom/piberror.C b/src/usr/xscom/piberror.C
index abcc4b24a..85cf3026f 100644
--- a/src/usr/xscom/piberror.C
+++ b/src/usr/xscom/piberror.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -48,8 +48,6 @@ void addFruCallouts(TARGETING::Target* i_target,
                     uint64_t i_scomAddr,
                     errlHndl_t& io_errl)
 {
-    // @todo RTC:137627 - Remove for p9 bringup
-    return;
 
    switch (i_pibErrStatus)
    {