From a3a3923859c8a336727043cd02c9dc8a45d2722b Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Mon, 7 Oct 2019 13:01:27 -0500 Subject: 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 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Corey V Swenson Reviewed-by: Matt Derksen Reviewed-by: Christian R Geddes Reviewed-by: William G Hoffa --- src/usr/errl/plugins/errludcallout.H | 1 + src/usr/errldisplay/errldisplay.C | 1 + src/usr/fapi2/plat_utils.C | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/src/usr/errl/plugins/errludcallout.H b/src/usr/errl/plugins/errludcallout.H index fc45e5590..47cbfd9fd 100644 --- 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 index b6ae46fc4..66c876162 100644 --- 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 index 5c4871a26..bcea30664 100644 --- 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)", -- cgit v1.2.1