diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2016-08-25 09:48:26 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-08-30 22:28:38 -0400 |
| commit | a6ffbfc855f914589e610d618592f92cc8a7af5e (patch) | |
| tree | aeacd13faaac4f9ab7d8c31558d4fd8396c4d1d3 /src | |
| parent | 17ff75043aff25a34d6deaa959fac9975199b9ed (diff) | |
| download | blackbird-hostboot-a6ffbfc855f914589e610d618592f92cc8a7af5e.tar.gz blackbird-hostboot-a6ffbfc855f914589e610d618592f92cc8a7af5e.zip | |
Fill in some missing callout info for new P9 types
Added a few target->subsys maps
Added a new OBUS callout type
Change-Id: Ic986db332395b6d8ad174f3f5b96baee651b711b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28789
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/usr/errl/hberrltypes.H | 6 | ||||
| -rw-r--r-- | src/include/usr/hwas/common/hwasCallout.H | 3 | ||||
| -rw-r--r-- | src/usr/errl/errlentry.C | 13 | ||||
| -rw-r--r-- | src/usr/errl/plugins/errludcallout.H | 1 | ||||
| -rw-r--r-- | src/usr/fapi2/plat_utils.C | 5 |
5 files changed, 26 insertions, 2 deletions
diff --git a/src/include/usr/errl/hberrltypes.H b/src/include/usr/errl/hberrltypes.H index c15fd4682..427029305 100644 --- a/src/include/usr/errl/hberrltypes.H +++ b/src/include/usr/errl/hberrltypes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -260,6 +260,10 @@ enum epubSubSystem_t EPUB_MEMORY_FRU = 0x24, //@PUB_IGNORE EPUB_EXTERNAL_CACHE = 0x25, //@PUB_IGNORE + // I/O subsystem: hub and bridge + EPUB_IO_SUBSYS = 0x30, + EPUB_IO_PHB = 0x38, + // CEC Hardware EPUB_CEC_HDW_SUBSYS = 0x50, EPUB_CEC_HDW_VPD_INTF = 0x55, diff --git a/src/include/usr/hwas/common/hwasCallout.H b/src/include/usr/hwas/common/hwasCallout.H index 7f73ff371..16a5d4d5a 100644 --- a/src/include/usr/hwas/common/hwasCallout.H +++ b/src/include/usr/hwas/common/hwasCallout.H @@ -114,7 +114,8 @@ enum busTypeEnum A_BUS_TYPE = 3, X_BUS_TYPE = 4, I2C_BUS_TYPE = 5, - PSI_BUS_TYPE = 6 + PSI_BUS_TYPE = 6, + O_BUS_TYPE = 7 }; enum clockTypeEnum diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C index 317a5c345..ace3ac0d7 100644 --- a/src/usr/errl/errlentry.C +++ b/src/usr/errl/errlentry.C @@ -113,6 +113,18 @@ static const epubTargetTypeToSub_t TARGET_TO_SUBSYS_TABLE[] = { TARGETING::TYPE_MBA , EPUB_MEMORY_CONTROLLER }, { TARGETING::TYPE_XBUS , EPUB_PROCESSOR_BUS_CTL }, { TARGETING::TYPE_ABUS , EPUB_PROCESSOR_SUBSYS }, + { TARGETING::TYPE_EQ , EPUB_PROCESSOR_SUBSYS }, + { TARGETING::TYPE_MCA , EPUB_MEMORY_CONTROLLER }, + { TARGETING::TYPE_MCBIST , EPUB_MEMORY_CONTROLLER }, + { TARGETING::TYPE_MI , EPUB_MEMORY_CONTROLLER }, + { TARGETING::TYPE_DMI , EPUB_MEMORY_SUBSYS }, + { TARGETING::TYPE_OBUS , EPUB_PROCESSOR_BUS_CTL }, + { TARGETING::TYPE_NX , EPUB_PROCESSOR_SUBSYS }, + { TARGETING::TYPE_CAPP , EPUB_PROCESSOR_SUBSYS }, + { TARGETING::TYPE_NV , EPUB_PROCESSOR_SUBSYS }, + { TARGETING::TYPE_PHB , EPUB_IO_PHB }, + { TARGETING::TYPE_PEC , EPUB_IO_PHB }, + { TARGETING::TYPE_CORE , EPUB_PROCESSOR_UNIT }, }; struct epubBusTypeToSub_t @@ -129,6 +141,7 @@ static const epubBusTypeToSub_t BUS_TO_SUBSYS_TABLE[] = { HWAS::X_BUS_TYPE , EPUB_PROCESSOR_BUS_CTL }, { HWAS::I2C_BUS_TYPE , EPUB_CEC_HDW_I2C_DEVS }, { HWAS::PSI_BUS_TYPE , EPUB_CEC_HDW_SP_PHYP_INTF }, + { HWAS::O_BUS_TYPE , EPUB_PROCESSOR_BUS_CTL }, }; struct epubClockTypeToSub_t diff --git a/src/usr/errl/plugins/errludcallout.H b/src/usr/errl/plugins/errludcallout.H index 416863bde..10cc3af96 100644 --- a/src/usr/errl/plugins/errludcallout.H +++ b/src/usr/errl/plugins/errludcallout.H @@ -197,6 +197,7 @@ case HWAS::_type: i_parser.PrintString( "Bus Type", #_type); break; case_BUS_TYPE(X_BUS_TYPE) case_BUS_TYPE(I2C_BUS_TYPE) case_BUS_TYPE(PSI_BUS_TYPE) + case_BUS_TYPE(O_BUS_TYPE) default: i_parser.PrintNumber( "Bus Type", "UNKNOWN: 0x%X", ntohl(pData->busType) ); diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C index 3433b088a..38df6a63d 100644 --- a/src/usr/fapi2/plat_utils.C +++ b/src/usr/fapi2/plat_utils.C @@ -554,6 +554,11 @@ void processEIBusCallouts(const ErrorInfo & i_errInfo, { l_busType = HWAS::X_BUS_TYPE; } + else if ((l_type1 == TARGETING::TYPE_OBUS) && + (l_type2 == TARGETING::TYPE_OBUS)) + { + l_busType = HWAS::O_BUS_TYPE; + } else { FAPI_ERR("processEIBusCallouts: Bus between target types not known (0x%08x:0x%08x)", |
