Add OMI bus support to callouts

Fill in a few spots where we need to handle OMI busses for proper error processing and display. Change-Id: Ibf236a7f6cb894d1516dbbe49b57e5be7dcceca2 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84952 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: Corey V Swenson <cswenson@us.ibm.com> Reviewed-by: Matt Derksen <mderkse1@us.ibm.com> Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com> Reviewed-by: William G Hoffa <wghoffa@us.ibm.com>
open-power · Oct 10, 2019 · a3a3923 · a3a3923
1 parent 514dce8
commit a3a3923
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/usr/errl/plugins/errludcallout.H b/src/usr/errl/plugins/errludcallout.H
@@ -210,6 +210,7 @@ case HWAS::_type: i_parser.PrintString( "Bus Type", #_type); break;
                     case_BUS_TYPE(I2C_BUS_TYPE)
                     case_BUS_TYPE(PSI_BUS_TYPE)
                     case_BUS_TYPE(O_BUS_TYPE)
+                    case_BUS_TYPE(OMI_BUS_TYPE)
                     default:
                         i_parser.PrintNumber( "Bus Type", "UNKNOWN: 0x%X",
                                         ntohl(pData->busType) );

diff --git a/src/usr/errldisplay/errldisplay.C b/src/usr/errldisplay/errldisplay.C
@@ -325,6 +325,7 @@ case HWAS::_type: CONSOLE::displayf(NULL, "  Bus Type                 : %s", #_t
                     case_BUS_TYPE(I2C_BUS_TYPE)
                     case_BUS_TYPE(PSI_BUS_TYPE)
                     case_BUS_TYPE(O_BUS_TYPE)
+                    case_BUS_TYPE(OMI_BUS_TYPE)
                     default:
                         CONSOLE::displayf(NULL, "  Bus Type                 : UNKNOWN 0x%X",
                                           callout->busType);

diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C
@@ -964,6 +964,13 @@ void processEIBusCallouts(const ErrorInfo & i_errInfo,
         {
             l_busType = HWAS::O_BUS_TYPE;
         }
+        else if ( ((l_type1 == TARGETING::TYPE_OMI) &&
+                   (l_type2 == TARGETING::TYPE_OCMB_CHIP)) ||
+                  ((l_type1 == TARGETING::TYPE_OCMB_CHIP) &&
+                   (l_type2 == TARGETING::TYPE_OMI)) )
+        {
+            l_busType = HWAS::OMI_BUS_TYPE;
+        }
         else
         {
             FAPI_ERR("processEIBusCallouts: Bus between target types not known (0x%08x:0x%08x)",