Fix issues with how we were handling new .so added for Axone

This commit addresses two problems, one is that we were loading and
unloading expaccess.so in the ocmbcomm tests when it is included
in the extended image. Also we had mmio.so listed as a DEP lib in
istep 12, this caused it to get unloaded after that step. This .so
is also part of the extended image. To remove compile errors I added
these new .so's to the listdeps.pl script.

Change-Id: I83292a53e0021c05468605e62f9b00cefc2af268
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/73182
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 7 insertions, 28 deletions

diff --git a/src/build/tools/listdeps.pl b/src/build/tools/listdeps.pl
index be7b3a4d6..b71a9e2bd 100755
--- a/src/build/tools/listdeps.pl
+++ b/src/build/tools/listdeps.pl
@@ -226,6 +226,8 @@ my $resident_modules = {
     "libscom.so"                => '1',
     "libxscom.so"               => '1',
     "libnode_comm.so"           => '1',
+    "libmmio.so"                => '1',
+    "libexpaccess.so"           => '1',
 };
 
 # A list of the dependent libraries in each istep.
diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H
index 161c17732..2fadd6fee 100644
--- a/src/include/usr/isteps/istep12list.H
+++ b/src/include/usr/isteps/istep12list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2019                        */
 /* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
@@ -290,7 +290,6 @@ const DepModInfo g_istep12Dependancies = {
         DEP_LIB(libnestmemutils.so),
         DEP_LIB(libisteps_io.so),
         DEP_LIB(libisteps_mss.so),
-        DEP_LIB(libmmio.so),
         NULL
     }
 };
diff --git a/src/usr/expaccess/test/ocmbcommtest.H b/src/usr/expaccess/test/ocmbcommtest.H
index 3c717d939..94d298032 100644
--- a/src/usr/expaccess/test/ocmbcommtest.H
+++ b/src/usr/expaccess/test/ocmbcommtest.H
@@ -67,9 +67,6 @@ typedef struct
 } FW_ADAPTER_PROPERTIES_type;
 
 
-// Testing this code
-const char EXPLORER_LIBRARY_NAME[16]    = "libexpaccess.so";
-
 // Need this module for mss::c_str call in HWP failure path traces
 const char MSS_LIBRARY_NAME[17]         = "libisteps_mss.so";
 
@@ -271,28 +268,19 @@ class OCMBCommTest: public CxxTest::TestSuite
      */
     OCMBCommTest() : CxxTest::TestSuite()
     {
-        explorer_module_loaded = false;
         mss_module_loaded = false;
 
         // All modules are loaded by runtime,
         // so testcase loading of modules is not required
 #ifndef __HOSTBOOT_RUNTIME
         errlHndl_t err = nullptr;
-        err = loadModule(explorer_module_loaded, EXPLORER_LIBRARY_NAME);
+
+        err = loadModule(mss_module_loaded, MSS_LIBRARY_NAME);
         if(err)
         {
-            TS_FAIL("OCMBCommTest() - Constuctor: failed to load EXPLORER module");
+            TS_FAIL("OCMBCommTest() - Constuctor: failed to load MSS module");
             errlCommit( err, TARG_COMP_ID );
         }
-        else
-        {
-          err = loadModule(mss_module_loaded, MSS_LIBRARY_NAME);
-          if(err)
-          {
-              TS_FAIL("OCMBCommTest() - Constuctor: failed to load MSS module");
-              errlCommit( err, TARG_COMP_ID );
-          }
-        }
 #endif
     };
 
@@ -303,15 +291,6 @@ class OCMBCommTest: public CxxTest::TestSuite
     ~OCMBCommTest()
     {
         errlHndl_t err = nullptr;
-        if (explorer_module_loaded)
-        {
-            err = unloadModule(EXPLORER_LIBRARY_NAME);
-            if(err)
-            {
-                TS_FAIL("~OCMBCommTest() - Destructor: failed to unload EXPLORER module");
-                errlCommit( err, TARG_COMP_ID );
-            }
-        }
         if (mss_module_loaded)
         {
             err = unloadModule(MSS_LIBRARY_NAME);
@@ -324,9 +303,8 @@ class OCMBCommTest: public CxxTest::TestSuite
     };
 
     private:
-      // use these to keep track of if we need to unload any
+      // use this to keep track of if we need to unload any
       // modules loaded by this testcase
-      bool explorer_module_loaded;
       bool mss_module_loaded;
 
 };