From b14f1ac08b24a702631eda2f677a3c0c751f33db Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Wed, 1 Feb 2017 08:34:25 -0600 Subject: [PATCH] Quick fix to get boot side before SBE is started Code can attempt to get the boot side for an SBE before the SBE is started and the SCOM can be read. In this case the boot side for the master processor should be used. First step of this fix is to remove the #if logic around the block to select the master processor target. Change-Id: Idb08165a3e2c9217adc17592ffb56b9434182acd Depends-on: I8111a40c8aa53e1699b0381440584db3dd6c3fc6 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35730 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Corey V. Swenson Tested-by: Jenkins OP Build CI Reviewed-by: William G. Hoffa --- src/usr/sbe/sbe_update.C | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index c79c036b448..752984105b1 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -1733,9 +1733,6 @@ namespace SBE TARGETING::Target * l_target=i_target; -#if defined(CONFIG_SBE_UPDATE_INDEPENDENT) || \ - defined(CONFIG_SBE_UPDATE_SIMULTANEOUS) - // Get the Master Proc Chip Target for comparisons later TARGETING::Target* masterProcChipTargetHandle = NULL; TargetService& tS = targetService(); @@ -1751,7 +1748,7 @@ namespace SBE TARGETING::get_huid(l_target)); } -#endif + // Read PERV_SB_CS_SCOM 0x00050008 size_t op_size = sizeof(scomData); err = deviceRead( l_target,