Enable state transition to observation

Enabled DCOM thread

RTC:140900
Change-Id: I857e2c4b2a15903ccddc2df5db910dddf155a8e5
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22658
Tested-by: FSP CI Jenkins
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: Wael Elessawy <welessa@us.ibm.com>

2 files changed, 8 insertions, 16 deletions

diff --git a/src/occ_405/dcom/dcom.c b/src/occ_405/dcom/dcom.c
index b5f8a52..4a00f4b 100755
--- a/src/occ_405/dcom/dcom.c
+++ b/src/occ_405/dcom/dcom.c
@@ -251,12 +251,8 @@ void dcom_initialize_roles(void)
         }
 
         // Always start as OCC Slave
-        //G_occ_role = OCC_SLAVE;
-        //rtl_set_run_mask(RTL_FLAG_NOTMSTR);
-
-        // For Simics, we need to start as OCC Master
-        G_occ_role = OCC_MASTER;
-        rtl_set_run_mask(RTL_FLAG_MSTR);
+        G_occ_role = OCC_SLAVE;
+        rtl_set_run_mask(RTL_FLAG_NOTMSTR);
 
 // @TODO TEMP - not ready yet for multiple DCMs
 /*
diff --git a/src/occ_405/dcom/dcom_thread.c b/src/occ_405/dcom/dcom_thread.c
index b171e1d..3d1bad9 100755
--- a/src/occ_405/dcom/dcom_thread.c
+++ b/src/occ_405/dcom/dcom_thread.c
@@ -26,8 +26,7 @@
 #ifndef _DCOM_THREAD_C
 #define _DCOM_THREAD_C
 
-#include <pgp_pmc.h>
-#include "pgp_pba.h"
+#include "occhw_pba.h"
 #include <rtls.h>
 #include <apss.h>
 #include <dcom.h>
@@ -79,6 +78,7 @@ void Dcom_thread_routine(void *arg)
                        SSX_SECONDS(10),
                        SSX_SECONDS(10));
 
+    DCOM_TRAC_INFO("DCOM Thread Started");
     for(;;)
     {
         // --------------------------------------------------
@@ -96,6 +96,8 @@ void Dcom_thread_routine(void *arg)
         // --------------------------------------------------
         G_dcom_thread_counter++;
 
+// NOTE: Temporary system config must say we are FSP system so
+// that we don't try to access main memory here.
         // --------------------------------------------------
         // Check if we need to update the sapphire table
         // --------------------------------------------------
@@ -161,14 +163,8 @@ void Dcom_thread_routine(void *arg)
             }
         }
 
-        // --------------------------------------------------
-        // DCM PStates
-        // \_ can do sem_post to increment through state machine
-        // --------------------------------------------------
-        if(OCC_STATE_SAFE != CURRENT_STATE())
-        {
-            proc_gpsm_dcm_sync_enable_pstates_smh();
-        }
+        // TEMP/TODO: In P8, we would call proc_gpsm_dcm_sync_enable_pstates_smh() here,
+        //            if not in safe mode. Do we need to do something similar in P9?
 
         // --------------------------------------------------
         // SSX Sleep