From cbf60d385958cca0ad6c35926284cf35e62da65b Mon Sep 17 00:00:00 2001 From: Chris Cain Date: Mon, 22 Apr 2019 15:22:44 -0500 Subject: Add SMF mode flag to HOMER for use by OCC Change-Id: I03daab724811f09aa83c4e0d7929f0a013a2b731 RTC: 164116 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76398 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Reviewed-by: Christopher J. Cain Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Martha Broyles Reviewed-by: Sheldon Bailey Reviewed-by: Daniel M. Crowell --- src/include/usr/isteps/istep07list.H | 3 +-- src/include/usr/isteps/istep15list.H | 3 +-- src/include/usr/isteps/istep21list.H | 1 - src/include/usr/isteps/pm/occCheckstop.H | 6 +++++- src/include/usr/isteps/pm/pm_common_ext.H | 5 +++++ 5 files changed, 12 insertions(+), 6 deletions(-) (limited to 'src/include/usr') diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H index 4b1feb1b6..2fb8eb49f 100644 --- a/src/include/usr/isteps/istep07list.H +++ b/src/include/usr/isteps/istep07list.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2018 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -170,7 +170,6 @@ const DepModInfo g_istep07Dependancies = { #ifndef CONFIG_FSP_BUILD DEP_LIB(libnvram.so), #endif - DEP_LIB(libsmf.so), NULL } }; diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H index d32145d0c..8041d279b 100644 --- a/src/include/usr/isteps/istep15list.H +++ b/src/include/usr/isteps/istep15list.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2018 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -141,7 +141,6 @@ const DepModInfo g_istep15Dependancies = { DEP_LIB(libpm.so), DEP_LIB(libimageprocs.so), DEP_LIB(libisteps_mss.so), - DEP_LIB(libsmf.so), NULL } }; diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H index 18f029fad..65f62fab4 100644 --- a/src/include/usr/isteps/istep21list.H +++ b/src/include/usr/isteps/istep21list.H @@ -135,7 +135,6 @@ const DepModInfo g_istep21Dependancies = { #ifdef CONFIG_UCD_FLASH_UPDATES DEP_LIB(libucd.so), #endif - DEP_LIB(libsmf.so), NULL } }; diff --git a/src/include/usr/isteps/pm/occCheckstop.H b/src/include/usr/isteps/pm/occCheckstop.H index 026c8db55..edb4b4ab3 100644 --- a/src/include/usr/isteps/pm/occCheckstop.H +++ b/src/include/usr/isteps/pm/occCheckstop.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2017 */ +/* Contributors Listed Below - COPYRIGHT 2014,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -47,6 +47,10 @@ namespace HBOCC NOT_FIR_MASTER = 0x00000000, IS_FIR_MASTER = 0x00000001, + // SMF Mode + SMF_MODE_DISABLED = 0x00000000, + SMF_MODE_ENABLED = 0x00000001, + // SRAM Addresses for OCC Main App and GPE0 app OCC_405_SRAM_ADDRESS = 0xFFF40000, OCC_GPE0_SRAM_ADDRESS = 0xFFF01000, diff --git a/src/include/usr/isteps/pm/pm_common_ext.H b/src/include/usr/isteps/pm/pm_common_ext.H index 307dfbc7f..5c6e3985d 100644 --- a/src/include/usr/isteps/pm/pm_common_ext.H +++ b/src/include/usr/isteps/pm/pm_common_ext.H @@ -52,6 +52,11 @@ namespace HBPM // FIR collection configuration data needed by FIR Master // OCC in the event of a checkstop uint8_t firdataConfig[3072]; + + // For informing OCC if SMF mode is enabled: + // 0x00000000 = Default (SMF disabled) + // 0x00000001 = SMF mode is enabled + uint32_t smfMode; }; /** -- cgit v1.2.1