Misc. fixes for PM Malf/Stop Recovery with CME injects

- Auto Spl wkup fix in malf path (leave hyp marked bad cores alone)
- Move Malf Handling (OCC FLG2 [29]) enable from sgpe init to later in PM Init
- Enable PM callout tracing (debug only)
- FAPI_ASSERT_NOEXIT UE to Recoverable fix (avoid unwanted err logs)
- OCC Spl wkup fix (fix bad target usage)
- Fix ffdc reg address not being added to ffdc region

Change-Id: I1771e178c12bcc6a9ab03ac48c7ad01cafa68ca7
CQ: SW438835
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/63324
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/63331
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: Christian R. Geddes <crgeddes@us.ibm.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/import/hwpf/fapi2/include/collect_reg_ffdc.H b/src/import/hwpf/fapi2/include/collect_reg_ffdc.H
index 12f74117a..bf62d7b25 100644
--- a/src/import/hwpf/fapi2/include/collect_reg_ffdc.H
+++ b/src/import/hwpf/fapi2/include/collect_reg_ffdc.H
@@ -403,6 +403,7 @@ ReturnCode collectRegisterAndAddressData(std::vector<T>& i_addresses, U& i_reade
     FAPI_DBG("collectRegisterAndAddressData -> address count: 0x%lx", i_addresses.size());
 
     T l_data = 0;
+    uint32_t l_addr = 0;
 
     ReturnCode l_rc = FAPI2_RC_SUCCESS;
 
@@ -423,14 +424,14 @@ ReturnCode collectRegisterAndAddressData(std::vector<T>& i_addresses, U& i_reade
             l_data = l_buf();
         }
 
-        l_address = htobe32(l_address);
+        l_address = htobe64(l_address);
         l_data = htobe64(l_data);
+        l_addr = l_address;
 
-        memcpy(o_pData, &l_address, sizeof(uint32_t));
+        memcpy(o_pData, &l_addr, sizeof(uint32_t));
         o_pData += sizeof(uint32_t);
 
         memcpy(o_pData, &l_data, sizeof(T));
-
         o_pData += sizeof(T);
 
     }