From ccf6b1d7112e80f19b5667f628e1abe06267f6be Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Thu, 6 Oct 2016 11:36:28 -0500 Subject: Changes for P9 SBE - End-to-End Testing SBE Boot Side Fix Changed SCOM that is read to determine SBE boot side to 0x0050008 and mask for the bit to check in that SCOM to bit 17. Change-Id: Ibec557edae338d54a0b61a2c49e746c76afa57b9 RTC:160466 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30812 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Matt Derksen Reviewed-by: Corey V. Swenson Reviewed-by: Daniel M. Crowell --- src/usr/sbe/sbe_update.C | 8 +++++--- src/usr/sbe/sbe_update.H | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 74f36f5a9..3307fd5ae 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -63,6 +63,7 @@ #include #include +#include #include #include @@ -1556,17 +1557,18 @@ namespace SBE } #endif + // Read PERV_SB_CS_SCOM 0x00050008 size_t op_size = sizeof(scomData); err = deviceRead( l_target, &scomData, op_size, - DEVICE_SCOM_ADDRESS(SBE_VITAL_REG_0x0005001C) ); + DEVICE_SCOM_ADDRESS(PERV_SB_CS_SCOM) ); if( err ) { TRACFCOMP( g_trac_sbe, ERR_MRK"getSbeBootSeeprom() -Error " - "reading SBE VITAL REG (0x%.8X) from Target :" + "reading SB CS SCOM (0x%.8X) from Target :" "HUID=0x%.8X, RC=0x%X, PLID=0x%lX", - SBE_VITAL_REG_0x0005001C, + PERV_SB_CS_SCOM, // 0x00050008 TARGETING::get_huid(l_target), ERRL_GETRC_SAFE(err), ERRL_GETPLID_SAFE(err)); diff --git a/src/usr/sbe/sbe_update.H b/src/usr/sbe/sbe_update.H index 56d4bdb33..e0d91b145 100644 --- a/src/usr/sbe/sbe_update.H +++ b/src/usr/sbe/sbe_update.H @@ -85,9 +85,8 @@ namespace SBE - SBE_SEEPROM_ECC_PAD - SBE_VERSION_SPACE_WITH_ECC; - // Used to read SBE Boot Side from processor - const uint64_t SBE_VITAL_REG_0x0005001C = 0x005001C; - const uint64_t SBE_BOOT_SELECT_MASK = 0x0080000000000000; + // Used to read SBE Boot Side from processor (PERV_SB_CS_SCOM 0x00050008) + const uint64_t SBE_BOOT_SELECT_MASK = 0x0000400000000000; // PNOR SBE and SBEC Partition constants const uint32_t MAX_SBE_ENTRIES = 9; -- cgit v1.2.1