PRD: Restore testprdf and testattn for p9 - hostboot changes

Change-Id: I50232e9e40799e8e17d5379695b75ae9895cc631
RTC: 147040
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/20833
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 26 insertions, 28 deletions

diff --git a/src/makefile b/src/makefile
index 143231e53..c819633b8 100644
--- a/src/makefile
+++ b/src/makefile
@@ -157,8 +157,9 @@ EXTENDED_MODULES += vpd
 EXTENDED_MODULES += util
 EXTENDED_MODULES += tracedaemon
 EXTENDED_MODULES += mbox
-#@TODO RTC:126631
-#EXTENDED_MODULES += attn
+EXTENDED_MODULES += attn
+EXTENDED_MODULES += prdf
+EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,mdia)
 EXTENDED_MODULES += ibscom
 EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,dump)
 EXTENDED_MODULES += $(if $(CONFIG_VPO_COMPILE),,runtime)
@@ -196,6 +197,8 @@ TESTCASE_MODULES += testxscom
 TESTCASE_MODULES += testkernel
 TESTCASE_MODULES += testtargeting
 TESTCASE_MODULES += testmemoize
+TESTCASE_MODULES += testprdf
+TESTCASE_MODULES += testattn
 
 #******************************************************************
 #KNOWN ISSUES (I might let these run but there is something wrong)
@@ -220,11 +223,6 @@ TESTCASE_MODULES += testfapi2
 #TODO: Need to re-enable testmdia (RTC 135217)
 #TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testmdia)
 
-#@TODO RTC: 139904 need to reenable testattn and testprdf
-#TESTCASE_MODULES += testattn
-#Need PRD team to look at this
-#TESTCASE_MODULES += testprdf
-
 #@TODO RTC: 123019 (p9 work in progress)
 #TESTCASE_MODULES += testi2c
 
diff --git a/src/usr/diag/attn/ipl/test/makefile b/src/usr/diag/attn/ipl/test/makefile
index e4ceab6db..c9514872f 100644
--- a/src/usr/diag/attn/ipl/test/makefile
+++ b/src/usr/diag/attn/ipl/test/makefile
@@ -1,11 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/usr/diag/attn/hostboot/test/makefile $
+# $Source: src/usr/diag/attn/ipl/test/makefile $
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -43,6 +43,7 @@ OBJS += attnmeminject.o
 
 MODULE = testattn
 
-TESTS = *.H
+#TODO RTC 148565 reenable when test cases are updated for P9
+#TESTS = *.H
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C
index 45629a400..0b108a3a5 100644
--- a/src/usr/diag/mdia/mdiasm.C
+++ b/src/usr/diag/mdia/mdiasm.C
@@ -705,7 +705,8 @@ bool StateMachine::executeWorkItem(WorkFlowProperties * i_wfp)
 
             case RESTORE_DRAM_REPAIRS:
 
-                rc = PRDF::restoreDramRepairs(getTarget(*i_wfp));
+                //TODO RTC 136126
+                //rc = PRDF::restoreDramRepairs(getTarget(*i_wfp));
 
                 break;
 
diff --git a/src/usr/initservice/extinitsvc/extinitsvctasks.H b/src/usr/initservice/extinitsvc/extinitsvctasks.H
index 46bd65473..e7afd2164 100644
--- a/src/usr/initservice/extinitsvc/extinitsvctasks.H
+++ b/src/usr/initservice/extinitsvc/extinitsvctasks.H
@@ -262,23 +262,21 @@ const TaskInfo g_exttaskinfolist[]   =   {
                 }
         },
 
-
-        // @todo RTC:145354 Restore testprdf and testattn in p9 branch
-#if (0)
+//TODO RTC: 148566
 // No mdia in VPO
-#ifndef CONFIG_VPO_COMPILE
-        /**
-         * @brief MDIA code library
-         */
-        {
-            "libmdia.so" ,                        // taskname
-            NULL,                                 // no pointer to fn
-            {
-               INIT_TASK,                         // task type
-               EXT_IMAGE,                         // Extended Module
-            }
-        },
-#endif
+//#ifndef CONFIG_VPO_COMPILE
+//        /**
+//         * @brief MDIA code library
+//         */
+//        {
+//            "libmdia.so" ,                        // taskname
+//            NULL,                                 // no pointer to fn
+//            {
+//               INIT_TASK,                         // task type
+//               EXT_IMAGE,                         // Extended Module
+//            }
+//        },
+//#endif
 
         /**
          * @brief PRDF code library
@@ -304,7 +302,7 @@ const TaskInfo g_exttaskinfolist[]   =   {
             }
         },
 
-#endif
+
 #ifdef CONFIG_GPIODD
         /**
          * @brief GPIO code library