HTMGT: Ensure processor callout added when going to safe mode

Change-Id: Ib5e1035121ed574a97416d59498b39f997131fd6
CQ: SW398232
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50597
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@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: Sheldon R. Bailey <baileysh@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 14 insertions, 12 deletions

diff --git a/src/usr/htmgt/htmgt_cfgdata.C b/src/usr/htmgt/htmgt_cfgdata.C
index 995042f4f..457aee9dd 100644
--- a/src/usr/htmgt/htmgt_cfgdata.C
+++ b/src/usr/htmgt/htmgt_cfgdata.C
@@ -212,7 +212,7 @@ namespace HTMGT
                                 {
                                     TMGT_ERR("sendOccConfigData: OCC%d cfg "
                                              "format 0x%02X had bad rsp status"
-                                             " 0x%02X for sysConfig",
+                                             " 0x%02X",
                                              occInstance, format,
                                              cmd.getRspStatus());
                                 }
@@ -761,7 +761,15 @@ void getSystemConfigMessageData(const TargetHandle_t i_occ, uint8_t* o_data,
     uint64_t index = 0;
     uint32_t SensorID1 = 0;
     uint32_t SensorID2 = 0;
-        assert(o_data != nullptr);
+    assert(o_data != nullptr);
+
+    TargetHandle_t sys = nullptr;
+    TargetHandleList nodes;
+    targetService().getTopLevelTarget(sys);
+    assert(sys != nullptr);
+    getChildAffinityTargets(nodes, sys, CLASS_ENC, TYPE_NODE);
+    assert(!nodes.empty());
+    TargetHandle_t node = nodes[0];
 
     o_data[index++] = OCC_CFGDATA_SYS_CONFIG;
     o_data[index++] = OCC_CFGDATA_SYS_CONFIG_VERSION;
@@ -781,6 +789,10 @@ void getSystemConfigMessageData(const TargetHandle_t i_occ, uint8_t* o_data,
     TargetHandleList cores;
     getChildChiplets(cores, proc, TYPE_CORE, false);
 
+    TMGT_INF("getSystemConfigMessageData: systemType: 0x%02X, "
+             "procSensor: 0x%04X, %d cores, %d nodes",
+             G_opalMode, SensorID1, cores.size(), nodes.size());
+
     for (uint64_t core=0; core<CFGDATA_CORES; core++)
     {
         SensorID1 = 0;
@@ -804,16 +816,6 @@ void getSystemConfigMessageData(const TargetHandle_t i_occ, uint8_t* o_data,
         index += 4;
     }
 
-
-    TargetHandle_t sys = nullptr;
-    TargetHandleList nodes;
-    targetService().getTopLevelTarget(sys);
-    assert(sys != nullptr);
-    getChildAffinityTargets(nodes, sys, CLASS_ENC, TYPE_NODE);
-    assert(!nodes.empty());
-    TargetHandle_t node = nodes[0];
-
-
     //Backplane Callout Sensor ID
     SensorID1 = UTIL::getSensorNumber(node, SENSOR_NAME_BACKPLANE_FAULT);
     memcpy(&o_data[index], &SensorID1, 4);