Add expscom test cases

This commit introduces some tests that check that scoms out to the
explorer chip work. This first commit only enables test through the
i2c path to ddimm0. Eventually expscomtest.H should contain tests
that write and read over both i2c and mmio on ddimms that are and
are not behind mux chips.

Change-Id: I9a0e6612fd1d72a26991b936301aabd29508db90
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69579
Tested-by: Jenkins Server <pfd-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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 738 insertions, 6 deletions

diff --git a/src/makefile b/src/makefile
index 9c4ca6f24..022711c91 100644
--- a/src/makefile
+++ b/src/makefile
@@ -257,6 +257,7 @@ TESTCASE_MODULES += testintr
 TESTCASE_MODULES += testfapi2
 TESTCASE_MODULES += $(if $(CONFIG_FSP_BUILD),,testnvram)
 TESTCASE_MODULES += testsmf
+TESTCASE_MODULES += testexpscom
 
 #******************************************************************
 #KNOWN ISSUES (I might let these run but there is something wrong)
diff --git a/src/usr/expscom/i2cscomdd.C b/src/usr/expscom/i2cscomdd.C
index b58a70648..580bec600 100644
--- a/src/usr/expscom/i2cscomdd.C
+++ b/src/usr/expscom/i2cscomdd.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -35,7 +35,8 @@
 #include <lib/i2c/exp_i2c_scom.H>  // i2c_get_scom
 #include <errl/errludtarget.H>     // ErrlUserDetailsTarget
 #include <hwpf/fapi2/include/fapi2_hwp_executor.H> // FAPI_EXEC_HWP
-#include "i2cscomdd.H"     //i2cScomPerformOp
+#include <expscom/expscom_reasoncodes.H> //  EXPSCOM::MOD_I2CSCOM_PERFORM_OP
+#include "i2cscomdd.H" //i2cScomPerformOp
 #include "expscom_trace.H" //g_trac_expscom
 #include "expscom_utils.H" //validateInputs
 
@@ -68,10 +69,13 @@ errlHndl_t i2cScomPerformOp(DeviceFW::OperationType i_opType,
     fapi2::buffer<uint32_t> l_fapi2Buffer32;
     l_fapi2Buffer64.extractToRight<32,32>(l_fapi2Buffer32);
 
+    TRACDCOMP( g_trac_expscom, ERR_MRK "i2cScomPerformOp> %s 0x%.16x or 0x%.8x to  Address 0x%lx ",
+                               i_opType == DeviceFW::READ ? "READ" : "WRITE", l_fapi2Buffer64(), l_fapi2Buffer32() , l_scomAddr );
+
     do
     {
         // First make sure the inputs are valid
-        l_err = EXPSCOM::validateInputs ( i_opType, i_target, l_scomAddr, io_buflen);
+        l_err = EXPSCOM::validateInputs ( i_opType, i_target, io_buflen, l_scomAddr );
 
         if(l_err)
         {
diff --git a/src/usr/expscom/makefile b/src/usr/expscom/makefile
index 4399d993b..e6cac665e 100644
--- a/src/usr/expscom/makefile
+++ b/src/usr/expscom/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2018
+# Contributors Listed Below - COPYRIGHT 2011,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -40,8 +40,8 @@ OBJS += expscom_trace.o
 OBJS += expscom_utils.o
 OBJS += i2cscomdd.o
 OBJS += mmioscomdd.o
-# TODO RTC:196806 ADD TESTs
-#SUBDIRS += test.d
+
+SUBDIRS += test.d
 
 VPATH += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/
 
diff --git a/src/usr/expscom/test/expscomtest.H b/src/usr/expscom/test/expscomtest.H
new file mode 100644
index 000000000..7049e84d4
--- /dev/null
+++ b/src/usr/expscom/test/expscomtest.H
@@ -0,0 +1,692 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/expscom/test/expscomtest.H $                          */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+#ifndef __EXPSCOMTEST_H
+#define __EXPSCOMTEST_H
+
+/**
+ *  @file expscomtest.H
+ *
+ *  @brief Test case for EXPSCOM code
+*/
+
+#include <cxxtest/TestSuite.H>
+#include <errl/errlmanager.H>
+#include <errl/errlentry.H>
+#include <devicefw/userif.H>
+#include <expscom/expscom_reasoncodes.H>
+#include <fapi2/target.H>
+#include <fapi2/plat_hwp_invoker.H>
+#include <fapi2_hwp_executor.H>
+#include <fapi2/hw_access.H>
+#include <exp_consts.H>
+
+extern trace_desc_t* g_trac_expscom;
+
+using namespace TARGETING;
+using namespace ERRORLOG;
+
+// Address and data to read/write
+struct testExpscomAddrData
+{
+    uint32_t addr;
+    uint64_t data;
+};
+
+// Test table values
+const testExpscomAddrData g_expscomAddrTable[] =
+{
+        {0x501C,     0x00000000DEADBEEF},
+        {0x209004,   0x00000000C0DEDEAD},
+        {0x8010002,  0xDEADC0DEC0DEBEEF}
+};
+const uint32_t g_expscomAddrTableSz =
+                    sizeof(g_expscomAddrTable)/sizeof(testExpscomAddrData);
+
+
+const ScomSwitches forceI2CScom = {.useFsiScom = 0, .useXscom = 0,
+                                   .useInbandScom = 0, .useSbeScom = 0,
+                                   .useI2cScom = 1};
+
+const ScomSwitches forceMMIOScom = {.useFsiScom = 0, .useXscom = 0,
+                                   .useInbandScom = 1, .useSbeScom = 0,
+                                   .useI2cScom = 0};
+
+#define FAIL_TEST_RC(TARGET, STRING) \
+l_fails++; \
+TS_FAIL(STRING , \
+        l_testEntry.data, \
+        l_testEntry.addr, \
+        get_huid(TARGET)); \
+l_err = fapi2::rcToErrl(l_rc); \
+errlCommit(l_err, 0x10);
+
+#define FAIL_TEST_ERRL(TARGET, STRING) \
+l_fails++; \
+TS_FAIL(STRING , \
+        l_testEntry.data, \
+        l_testEntry.addr, \
+        get_huid(TARGET)); \
+errlCommit(l_err, 0x10);
+
+class expscomTest: public CxxTest::TestSuite
+{
+public:
+
+    /**
+    * @brief EXPSCOM test I2C Path
+    *        Write value and read back to verify i2c scoms to OCMBs
+    */
+    void testExpscomI2c(void)
+    {
+        TRACFCOMP( g_trac_expscom, ">> Enter  testExpscomI2c");
+        // Keep trace of pass/fails
+        uint32_t l_tests = 0;
+        uint32_t l_fails = 0;
+        errlHndl_t l_err = nullptr;
+
+        // Fapi interfaces will be used in these tests so this variable
+        // will be used to hold error from fapi calls
+        fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS;
+        fapi2::buffer<uint64_t> l_scom_buffer;
+        TargetHandleList l_explorerList;
+
+        do{
+            // Get the system's OCMB chips, we will use these as test targets
+            getAllChips( l_explorerList,
+                          TYPE_OCMB_CHIP,
+                          true ); // true: return functional OCMBs
+
+            if(l_explorerList.size() == 0 )
+            {
+                TRACFCOMP( g_trac_expscom, "No OCMB targets found, skipping testExpscomI2c");
+                break;
+            }
+
+
+            // We will use the first and last targets for these scom tests
+            auto l_firstExpChip = l_explorerList.front();
+            auto l_lastExpChip  = l_explorerList.back();
+
+            // Cast the TARGETING::Targets into fapi2::Targets
+            fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> l_firstExpChip_fapi(l_firstExpChip);
+            fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> l_lastExpChip_fapi(l_lastExpChip);
+
+            // Save away original scom switch info so we can restore it at the end of the test
+            auto first_ocmb_info = l_firstExpChip->getAttr<TARGETING::ATTR_SCOM_SWITCHES>();
+            auto last_ocmb_info  = l_lastExpChip->getAttr<TARGETING::ATTR_SCOM_SWITCHES>();
+
+            // This goal of this tests is to make sure I2C scom to OCMB is working so force
+            // scom to go over I2C path for these targets
+            l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceI2CScom);
+            l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceI2CScom);
+
+            // Loop through table for first and last OCMB targets
+            for( uint32_t l_num=0; l_num < g_expscomAddrTableSz; l_num++)
+            {
+                // Read the test entry info from the global table at the top of this file
+                testExpscomAddrData l_testEntry = g_expscomAddrTable[l_num];
+
+                if(l_testEntry.addr & mss::exp::i2c::IBM_SCOM_INDICATOR)
+                {
+                    // If this is an IBM address then we expect 64 bits of data
+                    l_scom_buffer.insert<0,64,0,uint64_t>(l_testEntry.data);
+                }
+                else
+                {
+                    // Otherwise we know this is a native OCMB address and it is only 32 bits
+                    l_scom_buffer.insert<32,32,0,uint32_t>(l_testEntry.data);
+                }
+
+                FAPI_INVOKE_HWP(l_err, fapi2::putScom,
+                                l_firstExpChip_fapi,
+                                l_testEntry.addr,
+                                l_scom_buffer );
+                l_tests++;
+                if(l_err)
+                {
+                    FAIL_TEST_RC(l_firstExpChip,
+                                "testExpscomI2c>> Failed putScom writing 0x%.16X to 0x%.8X on target w/ huid 0x%.8X");
+
+                }
+
+                // putScom to last OCMB over i2c
+                FAPI_INVOKE_HWP(l_err, fapi2::putScom,
+                                l_lastExpChip_fapi,
+                                  l_testEntry.addr,
+                                l_scom_buffer );
+                l_tests++;
+                if(l_rc)
+                {
+                    FAIL_TEST_RC(l_lastExpChip,
+                              "testExpscomI2c>> Failed putScom writing 0x%.16X to 0x%.8X on target w/ huid 0x%.8X");
+                }
+
+
+                // Flush scom buffers so it doesnt mess up next test
+                l_scom_buffer.flush<0>();
+
+                // getScom to first OCMB over i2c
+                FAPI_INVOKE_HWP(l_err, fapi2::getScom,
+                                l_firstExpChip_fapi,
+                                l_testEntry.addr,
+                                l_scom_buffer );
+                l_tests++;
+                if(l_rc)
+                {
+                    FAIL_TEST_RC(l_firstExpChip,
+                                "testExpscomI2c>> Failed getScom reading 0x%.16X to 0x%.8X on target w/ huid 0x%.8X")
+                }
+
+                l_tests++;
+                if(l_scom_buffer() != l_testEntry.data)
+                {
+                    l_fails++;
+                    TS_FAIL("testExpscomI2c>> Expected 0x%.16X but got 0x%.16X on target w/ huid 0x%.8X",
+                            l_testEntry.data,
+                            l_scom_buffer(),
+                            get_huid(l_firstExpChip));
+                }
+
+                // Flush scom buffers so it doesnt mess up next test
+                l_scom_buffer.flush<0>();
+
+                // getScom to last OCMB over i2c
+                FAPI_INVOKE_HWP(l_err, fapi2::getScom,
+                                l_lastExpChip_fapi,
+                                l_testEntry.addr,
+                                l_scom_buffer );
+                l_tests++;
+                if(l_rc)
+                {
+                    FAIL_TEST_RC(l_lastExpChip,
+                                "testExpscomI2c>> Failed getScom reading 0x%.16X to 0x%.8X on target w/ huid 0x%.8X")
+                }
+
+                l_tests++;
+                if(l_scom_buffer() != l_testEntry.data)
+                {
+                    l_fails++;
+                    TS_FAIL("testExpscomI2c>> Expected 0x%.16X but got 0x%.16X on target w/ huid 0x%.8X",
+                            l_testEntry.data,
+                            l_scom_buffer(),
+                            get_huid(l_lastExpChip));
+                }
+            }
+
+            // Set ATTR_SCOM_SWITCHES back to their original values
+            l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(first_ocmb_info);
+            l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(last_ocmb_info);
+        }while(0);
+
+        TRACFCOMP( g_trac_expscom, "<< Exit  testExpscomI2c");
+        return;
+    }
+
+    void testExpscomI2cPlatform(void)
+    {
+
+        TRACFCOMP( g_trac_expscom, ">> Enter  testExpscomI2c");
+        // Keep trace of pass/fails
+        uint32_t l_tests = 0;
+        uint32_t l_fails = 0;
+        errlHndl_t l_err = nullptr;
+        size_t l_scomSize = sizeof(uint64_t);
+
+        // Fapi interfaces will be used in these tests so this variable
+        // will be used to hold error from fapi calls
+        fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS;
+        fapi2::buffer<uint64_t> l_scom_buffer;
+
+        // Get the system's OCMB chips, we will use these as test targets
+        TargetHandleList l_explorerList;
+
+        do{
+
+            getAllChips( l_explorerList,
+                          TYPE_OCMB_CHIP,
+                          true ); // true: return functional OCMBs
+
+
+            if(l_explorerList.size() == 0 )
+            {
+                TRACFCOMP( g_trac_expscom, "No OCMB targets found, skipping testExpscomI2cPlatform");
+                break;
+            }
+
+            // We will use the first and last targets for these scom tests
+            auto l_firstExpChip = l_explorerList.front();
+            auto l_lastExpChip  = l_explorerList.back();
+
+            // Save away original scom switch info so we can restore it at the end of the test
+            auto first_ocmb_info = l_firstExpChip->getAttr<TARGETING::ATTR_SCOM_SWITCHES>();
+            auto last_ocmb_info  = l_lastExpChip->getAttr<TARGETING::ATTR_SCOM_SWITCHES>();
+
+            // This goal of this tests is to make sure I2C scom to OCMB is working so force
+            // scom to go over I2C path for these targets
+            l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceI2CScom);
+            l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceI2CScom);
+
+            // Loop through table for first and last OCMB targets
+            for( uint32_t l_num=0; l_num < g_expscomAddrTableSz; l_num++)
+            {
+                  // Read the test entry info from the global table at the top of this file
+                  testExpscomAddrData l_testEntry = g_expscomAddrTable[l_num];
+
+                  if(l_testEntry.addr & mss::exp::i2c::IBM_SCOM_INDICATOR)
+                  {
+                      // If this is an IBM address then we expect 64 bits of data
+                      l_scom_buffer.insert<0,64,0,uint64_t>(l_testEntry.data);
+                  }
+                  else
+                  {
+                      // Otherwise we know this is a native OCMB address and it is only 32 bits
+                      l_scom_buffer.insert<32,32,0,uint32_t>(l_testEntry.data);
+                  }
+                  l_err = deviceWrite(l_firstExpChip,
+                                    &l_scom_buffer,
+                                    l_scomSize,
+                                    DEVICE_SCOM_ADDRESS( l_testEntry.addr));
+                  l_tests++;
+                  if(l_err)
+                  {
+                      FAIL_TEST_ERRL(l_firstExpChip,
+                                "testExpscomI2c>> Failed putScom writing 0x%.16X to 0x%.8X on target w/ huid 0x%.8X");
+
+                  }
+
+                  l_err = deviceWrite(l_lastExpChip,
+                                      &l_scom_buffer,
+                                      l_scomSize,
+                                      DEVICE_SCOM_ADDRESS( l_testEntry.addr));
+                  l_tests++;
+                  if(l_err)
+                  {
+                      FAIL_TEST_ERRL(l_firstExpChip,
+                                    "testExpscomI2c>> Failed putScom writing 0x%.16X to 0x%.8X on target w/ huid 0x%.8X");
+
+                  }
+                  // Flush scom buffers so it doesnt mess up next test
+                  l_scom_buffer.flush<0>();
+
+                  // getScom to first OCMB over i2c
+                  l_err = deviceRead(l_firstExpChip,
+                                    &l_scom_buffer(),
+                                    l_scomSize,
+                                    DEVICE_SCOM_ADDRESS( l_testEntry.addr));
+                  l_tests++;
+                  if(l_err)
+                  {
+                      FAIL_TEST_ERRL(l_firstExpChip,
+                                "testExpscomI2c>> Failed getScom reading 0x%.16X to 0x%.8X on target w/ huid 0x%.8X")
+                  }
+
+                  l_tests++;
+                  if(l_scom_buffer() != l_testEntry.data)
+                  {
+                      l_fails++;
+                      TS_FAIL("testExpscomI2c>> Expected 0x%.16X but got 0x%.16X on target w/ huid 0x%.8X",
+                            l_testEntry.data,
+                            l_scom_buffer(),
+                            get_huid(l_firstExpChip));
+                  }
+
+
+                  // Flush scom buffers so it doesnt mess up next test
+                  l_scom_buffer.flush<0>();
+
+                  // getScom to last OCMB over i2c
+                  l_err = deviceRead(l_lastExpChip,
+                                     &l_scom_buffer(),
+                                     l_scomSize,
+                                     DEVICE_SCOM_ADDRESS( l_testEntry.addr));
+                  l_tests++;
+                  if(l_err)
+                  {
+                      FAIL_TEST_ERRL(l_firstExpChip,
+                                     "testExpscomI2c>> Failed getScom reading 0x%.16X to 0x%.8X on target w/ huid 0x%.8X")
+                  }
+
+                  l_tests++;
+                  if(l_scom_buffer() != l_testEntry.data)
+                  {
+                      l_fails++;
+                      TS_FAIL("testExpscomI2c>> Expected 0x%.16X but got 0x%.16X on target w/ huid 0x%.8X",
+                              l_testEntry.data,
+                              l_scom_buffer(),
+                              get_huid(l_firstExpChip));
+                  }
+            }
+
+            // Set ATTR_SCOM_SWITCHES back to their original values
+            l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(first_ocmb_info);
+            l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(last_ocmb_info);
+        }while(0);
+
+        TRACFCOMP( g_trac_expscom, "<< Exit  testExpscomI2c");
+        return;
+    }
+
+// TODO RTC: 189447 Enable MMIO tests when MMIO drivers avail
+     /**
+     * @brief EXPSCOM test MMIO
+     *        Write value and read back to verify MMIO scoms to OCMBs
+     */
+//     void testExpscomMmio(void)
+//     {
+//         TargetHandleList l_explorerList;
+//         uint32_t l_tests = 0;
+//         uint32_t l_fails = 0;
+//         errlHndl_t l_err = nullptr;
+//         fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS;
+//         fapi2::buffer<uint64_t> l_scom_buffer;
+//
+//         // Get the system's procs
+//         getAllChips( l_explorerList,
+//                      TYPE_OCMB_CHIP,
+//                      true ); // true: return functional OCMBs
+//
+//         auto l_firstExpChip = l_explorerList.front();
+//         auto l_lastExpChip  = l_explorerList.back();
+//
+//         fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> l_firstExpChip_fapi(l_firstExpChip);
+//         fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> l_lastExpChip_fapi(l_lastExpChip);
+//
+//         auto first_ocmb_info = l_firstExpChip->getAttr<TARGETING::ATTR_SCOM_SWITCHES>();
+//         auto last_ocmb_info  = l_lastExpChip->getAttr<TARGETING::ATTR_SCOM_SWITCHES>();
+//
+//
+//         // Loop through table for first and last OCMB, perform i2c write, then
+//         // mmio read, and mmio write followed by i2c read.
+//         for( uint32_t l_num=0; l_num < g_expscomAddrTableSz; l_num++)
+//         {
+//               testExpscomAddrData l_testEntry = g_expscomAddrTable[l_num];
+//               if(l_testEntry.addr & mss::exp::i2c::IBM_SCOM_INDICATOR)
+//               {
+//                   l_scom_buffer.insert<0,64,0,uint64_t>(l_testEntry.data);
+//               }
+//               else
+//               {
+//                   l_scom_buffer.insert<0,32,0,uint32_t>(l_testEntry.data);
+//               }
+//
+//              // putScom to first OCMB over mmio
+//              l_rc = fapi2::putScom(l_firstExpChip_fapi,
+//                                    l_testEntry.addr,
+//                                    l_scom_buffer);
+//              l_tests++;
+//              if(l_rc)
+//              {
+//                 l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Failed putScom writing 0x%.16X to 0x%.8X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_testEntry.addr,
+//                         get_huid(l_firstExpChip));
+//                 l_err = fapi2::rcToErrl(l_rc);
+//                 errlCommit(l_err, 0x10);
+//              }
+//
+//              // putScom to last OCMB over mmio
+//              l_rc = fapi2::putScom(l_lastExpChip_fapi,
+//                                    l_testEntry.addr,
+//                                    l_scom_buffer);
+//              l_tests++;
+//              if(l_rc)
+//              {
+//                 l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Failed putScom writing 0x%.16X to 0x%.8X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_testEntry.addr,
+//                         get_huid(l_lastExpChip));
+//                 l_err = fapi2::rcToErrl(l_rc);
+//                 errlCommit(l_err, 0x10);
+//              }
+//
+//              // Flush scom buffer so it doesnt mess up next test
+//              l_scom_buffer.flush<0>();
+//
+//
+//              // getScom to first OCMB over mmio
+//              l_rc = fapi2::getScom(l_firstExpChip_fapi,
+//                                    l_testEntry.addr,
+//                                    l_scom_buffer);
+//              l_tests++;
+//              if(l_rc)
+//              {
+//                 l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Failed getScom reading 0x%.16X to 0x%.8X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_testEntry.addr,
+//                         get_huid(l_firstExpChip));
+//                 l_err = fapi2::rcToErrl(l_rc);
+//                 errlCommit(l_err, 0x10);
+//              }
+//
+//              l_tests++;
+//              if(l_scom_buffer() != l_testEntry.data)
+//              {
+//                l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Expected 0x%.16X but got 0x%.16X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_scom_buffer(),
+//                         get_huid(l_firstExpChip));
+//                 l_err = fapi2::rcToErrl(l_rc);
+//                 errlCommit(l_err, 0x10);
+//              }
+//
+//              // Flush scom buffer so it doesnt mess up next test
+//              l_scom_buffer.flush<0>();
+//
+//              // getScom to last OCMB over mmio
+//              l_rc = fapi2::getScom(l_lastExpChip_fapi,
+//                                    l_testEntry.addr,
+//                                    l_scom_buffer);
+//              l_tests++;
+//              if(l_rc)
+//              {
+//                 l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Failed getScom reading 0x%.16X to 0x%.8X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_testEntry.addr,
+//                         get_huid(l_lastExpChip));
+//                 l_err = fapi2::rcToErrl(l_rc);
+//                 errlCommit(l_err, 0x10);
+//              }
+//
+//              l_tests++;
+//              if(l_scom_buffer() != l_testEntry.data)
+//              {
+//                l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Expected 0x%.16X but got 0x%.16X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_scom_buffer(),
+//                         get_huid(l_lastExpChip));
+//                 l_err = fapi2::rcToErrl(l_rc);
+//                 errlCommit(l_err, 0x10);
+//              }
+//         }
+//         // Set ATTR_SCOM_SWITCHES back to their original values
+//         l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(first_ocmb_info);
+//         l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(last_ocmb_info);
+//         return;
+//   }
+
+      /**
+    * @brief EXPSCOM test MMIO
+    *        Write value and read back to verify MMIO
+    */
+//   void testExpscomCombined(void)
+//   {
+//         TargetHandleList l_explorerList;
+//         uint32_t l_tests = 0;
+//         uint32_t l_fails = 0;
+//         fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS;
+//         fapi2::buffer<uint64_t> l_scom_buffer;
+//
+//         // Get the system's procs
+//         getAllChips( l_explorerList,
+//                      TYPE_OCMB_CHIP,
+//                      true ); // true: return functional OCMBs
+//
+//         auto l_firstExpChip = l_explorerList.front();
+//         auto l_lastExpChip  = l_explorerList.back();
+//
+//         fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> l_firstExpChip_fapi(l_firstExpChip);
+//         fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP> l_lastExpChip_fapi(l_lastExpChip);
+//
+//        auto first_ocmb_info = l_firstExpChip->getAttr<TARGETING::ATTR_SCOM_SWITCHES>();
+//         auto last_ocmb_info  = l_lastExpChip->getAttr<TARGETING::ATTR_SCOM_SWITCHES>();
+//
+//         // Loop through table for first and last OCMB
+//         for( uint32_t l_num=0; l_num < g_expscomAddrTableSz; l_num++)
+//         {
+//              testExpscomAddrData l_testEntry = g_expscomAddrTable[l_num];
+//
+//               if(l_testEntry.addr & mss::exp::i2c::IBM_SCOM_INDICATOR)
+//               {
+//                   l_scom_buffer.insert<0,64,0,uint64_t>(l_testEntry.data);
+//               }
+//               else
+//               {
+//                   l_scom_buffer.insert<0,32,0,uint32_t>(l_testEntry.data);
+//               }
+//
+//             // ODD tests  : first target writes MMIO, last target writes I2C
+//             // EVEN tests : first target writes I2C, last target writes MMIO
+//             if(l_num % 2)
+//             {
+//                 l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceMMIOScom);
+//                 l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceI2CScom);
+//             }
+//             else
+//             {
+//                 l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceI2CScom);
+//                 l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceMMIOScom);
+//             }
+//
+//              // putScom to first OCMB over mmio
+//              l_rc = fapi2::putScom(l_firstExpChip_fapi,
+//                                    l_testEntry.addr,
+//                                    l_scom_buffer);
+//              l_tests++;
+//              if(l_rc)
+//              {
+//                 l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Failed putScom writing 0x%.16X to 0x%.8X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_testEntry.addr,
+//                         get_huid(l_firstExpChip));
+//              }
+//
+//              // putScom to last OCMB over mmio
+//              l_rc = fapi2::putScom(l_lastExpChip_fapi,
+//                                    l_testEntry.addr,
+//                                    l_scom_buffer);
+//              l_tests++;
+//              if(l_rc)
+//              {
+//                 l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Failed putScom writing 0x%.16X to 0x%.8X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_testEntry.addr,
+//                         get_huid(l_lastExpChip));
+//              }
+//
+//              // Flush scom buffer so it doesnt mess up next test
+//              l_scom_buffer.flush<0>();
+//
+//              // getScom to first OCMB over mmio
+//              l_rc = fapi2::getScom(l_firstExpChip_fapi,
+//                                    l_testEntry.addr,
+//                                    l_scom_buffer);
+//              l_tests++;
+//              if(l_rc)
+//              {
+//                 l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Failed getScom reading 0x%.16X to 0x%.8X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_testEntry.addr,
+//                         get_huid(l_firstExpChip));
+//              }
+//
+//              l_tests++;
+//              if(l_scom_buffer() != l_testEntry.data)
+//              {
+//                l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Expected 0x%.16X but got 0x%.16X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_scom_buffer(),
+//                         get_huid(l_firstExpChip));
+//              }
+//
+//             // ODD tests  : first target reads I2C, last target reads MMIO
+//             // EVEN tests : first target reads MMIO, last target reads I2C
+//             if(l_num % 2)
+//             {
+//                 l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceI2CScom);
+//                 l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceMMIOScom);
+//             }
+//             else
+//             {
+//                 l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceMMIOScom);
+//                 l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(forceI2CScom);
+//             }
+//
+//              // Flush scom buffer so it doesnt mess up next test
+//              l_scom_buffer.flush<0>();
+//
+//              // getScom to last OCMB over mmio
+//              l_rc = fapi2::getScom(l_lastExpChip_fapi,
+//                                    l_testEntry.addr,
+//                                    l_scom_buffer);
+//              l_tests++;
+//              if(l_rc)
+//              {
+//                 l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Failed getScom reading 0x%.16X to 0x%.8X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_testEntry.addr,
+//                         get_huid(l_lastExpChip));
+//              }
+//
+//              l_tests++;
+//              if(l_scom_buffer() != l_testEntry.data)
+//              {
+//                l_fails++;
+//                 TS_FAIL("testExpscomMmio>> Expected 0x%.16X but got 0x%.16X on target w/ huid 0x%.8X",
+//                         l_testEntry.data,
+//                         l_scom_buffer(),
+//                         get_huid(l_lastExpChip));
+//              }
+//         }
+//         // Set ATTR_SCOM_SWITCHES back to their original values
+//         l_firstExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(first_ocmb_info);
+//         l_lastExpChip->setAttr<TARGETING::ATTR_SCOM_SWITCHES>(last_ocmb_info);
+//         return;
+//   }
+
+
+};
+
+#endif
diff --git a/src/usr/expscom/test/makefile b/src/usr/expscom/test/makefile
new file mode 100644
index 000000000..47d9bfebd
--- /dev/null
+++ b/src/usr/expscom/test/makefile
@@ -0,0 +1,35 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/expscom/test/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+ROOTPATH = ../../../..
+
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/
+EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/
+
+MODULE = testexpscom
+TESTS = *.H
+
+include ${ROOTPATH}/config.mk
\ No newline at end of file