Set FIR master in HOMER config data

Change-Id: I14efac59ce36e838f9438facd729b296ac9c552f
RTC: 108820
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15657
Tested-by: Jenkins Server
Reviewed-by: Joshua P. Rispoli <jprispol@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 24 insertions, 3 deletions

diff --git a/src/include/usr/hwpf/hwp/occ/occ_common.H b/src/include/usr/hwpf/hwp/occ/occ_common.H
index 1886e51ee..824553961 100644
--- a/src/include/usr/hwpf/hwp/occ/occ_common.H
+++ b/src/include/usr/hwpf/hwp/occ/occ_common.H
@@ -36,19 +36,38 @@ namespace HBOCC
     struct occHostConfigDataArea_t
     {
         uint32_t version;
+
+        //For computation of timebase frequency
         uint32_t nestFrequency;
+
+        // For determining the interrupt type to Host
+        //  0x00000000 = Use FSI2HOST Mailbox
+        //  0x00000001 = Use OCC interrupt line through PSIHB complex
         uint32_t interruptType;
+
+        // For informing OCC if it is the FIR master:
+        //  0x00000000 = Default
+        //  0x00000001 = FIR Master
+        uint32_t firMaster;
+
+        // FIR collection configuration data needed by FIR Master
+        //  OCC in the event of a checkstop
+        uint8_t firdataConfig[3072];
     };
 
     enum
     {
-        OccHostDataVersion = 2,
+        OccHostDataVersion = 3,
         OCC_LIDID = 0x81e00430,
         OCC_IBSCOM_RANGE_IN_MB = MEGABYTE,
 
         // Interrupt Types
         USE_FSI2HOST_MAILBOX = 0x00000000,
-        USE_PSIHB_COMPLEX    = 0x00000001
+        USE_PSIHB_COMPLEX    = 0x00000001,
+
+        // FIR Master
+        NOT_FIR_MASTER = 0x00000000,
+        IS_FIR_MASTER  = 0x00000001
     };
 
     enum occAction_t
@@ -59,13 +78,15 @@ namespace HBOCC
     /**
      * @brief Sets up OCC Host data
      *
+     * @param[in] i_proc:         target processor to load
      * @param[in] i_occHostDataVirtAddr Virtual
      *                       address of current
      *                       proc's Host data area.
      *
      * @return errlHndl_t  Error log Host data setup failed
      */
-    errlHndl_t loadHostDataToHomer(void* i_occHostDataVirtAddr);
+    errlHndl_t loadHostDataToHomer(TARGETING::Target* i_proc,
+                                   void* i_occHostDataVirtAddr);
 
     /**
      * @brief Execute procedures and steps required to load