Use new Bus callout Interface

HWSV has supported new interface of BUS Callout with flag parameter, HB has to use this New interface Change-Id: I2ceb6a086938fdb943a93b65f98158dfaec83a1d CQ: SW448379 CMVC-Prereq: 1073384 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69335 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: Sachin Gupta <sgupta2m@in.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
open-power · Dec 7, 2018 · 657fa3a · 657fa3a
1 parent b63c847
commit 657fa3a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/src/include/usr/hwas/common/hwasCallout.H b/src/include/usr/hwas/common/hwasCallout.H
@@ -398,21 +398,21 @@ errlHndl_t platHandleHWCallout(
  * @brief platform specific code to handle a bus callout that has been
  *  found in an errlog
  *
- * @param[in]  i_pTarget1       target endpoint1
- * @param[in]  i_pTarget2       target endpoint2
- * @param[in]  i_busType        bus type Enum
- * @param[in]  i_priority       Enum indicating the priority of the callout
- * @param[in]  io_errl          reference to errlHnld for this errlog
+ * @param[in]  io_busCallout a structure of all the fields data needed for
+ *             bus callout
+ *             TargetPart1: target endpoint1
+ *             TargetPart2: target endpoint2
+ *             busType:     bus type Enum
+ *             priority:    Enum indicating the priority of the callout
+ *             flag:        Flag for CBLV link state of SMP cables only
  *
+ * @param[in] io_errl  reference to errlHnld for this errlog
  * @return errlHndl_t       valid errlHndl_t handle if there was an error,
  *                          NULL if no errors;
  */
-errlHndl_t platHandleBusCallout(
-        TARGETING::Target *i_pTarget1,
-        TARGETING::Target *i_pTarget2,
-        busTypeEnum i_busType,
-        callOutPriority i_priority,
-        errlHndl_t &io_errl);
+errlHndl_t platHandleAddBusCallout(busCallout_t &io_busCallout,
+                                   errlHndl_t &io_errl);
+
 
 /**
  * @brief platform specific code to handle a clock callout that has been

diff --git a/src/usr/hwas/common/hwasCallout.C b/src/usr/hwas/common/hwasCallout.C
@@ -177,23 +177,27 @@ void processCallout(errlHndl_t &io_errl,
         } // PROCEDURE_CALLOUT
         case (BUS_CALLOUT):
         {
-            TARGETING::Target *pTarget1 = NULL;
-            TARGETING::Target *pTarget2 = NULL;
+            HWAS::busCallout_t io_busCallout;
 
             uint8_t * l_targetData = (uint8_t *)(pCalloutUD + 1);
-            bool l_err1 = retrieveTarget(l_targetData, pTarget1, io_errl);
-            bool l_err2 = retrieveTarget(l_targetData, pTarget2, io_errl);
+            bool l_err1 = retrieveTarget(l_targetData,
+                                         io_busCallout.TargetPart1,
+                                         io_errl);
+            bool l_err2 = retrieveTarget(l_targetData,
+                                         io_busCallout.TargetPart2,
+                                         io_errl);
+
+            io_busCallout.busType = pCalloutUD->busType;
+            io_busCallout.priority = pCalloutUD->priority;
+            io_busCallout.flag = pCalloutUD->flag;
 
             if (!l_err1 && !l_err2)
             {
-                errlHndl_t errl = platHandleBusCallout(
-                                        pTarget1, pTarget2,
-                                        pCalloutUD->busType,
-                                        pCalloutUD->priority,
-                                        io_errl);
+                errlHndl_t errl = platHandleAddBusCallout(
+                                     io_busCallout, io_errl );
                 if (errl)
                 {
-                    HWAS_ERR("processCallout: error from platHandlBusCallout");
+                    HWAS_ERR("processCallout: error in platHandlAddBusCallout");
                     errlCommit(errl, HWAS_COMP_ID);
                 }
             }

diff --git a/src/usr/hwas/hwasPlatCallout.C b/src/usr/hwas/hwasPlatCallout.C
@@ -171,14 +171,10 @@ errlHndl_t platHandleHWCallout(
 }
 
 //******************************************************************************
-// platHandleBusCallout
+// platHandleAddBusCallout
 //******************************************************************************
-errlHndl_t platHandleBusCallout(
-        TARGETING::Target *i_pTarget1,
-        TARGETING::Target *i_pTarget2,
-        busTypeEnum i_busType,
-        callOutPriority i_priority,
-        errlHndl_t &io_errl)
+errlHndl_t platHandleAddBusCallout( HWAS::busCallout_t &io_busCallout,
+                                    errlHndl_t &io_errl)
 {
     // WARNING:
     // this hostboot code should not change io_errl, unless the caller of the