diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2016-10-06 11:36:28 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-10-10 14:44:05 -0400 |
| commit | ccf6b1d7112e80f19b5667f628e1abe06267f6be (patch) | |
| tree | 1203971b5dc0c0f1915c7947131e712709de9f64 /src | |
| parent | 1e2fdb0958f724d14f846486e952bebddd9677a0 (diff) | |
| download | talos-hostboot-ccf6b1d7112e80f19b5667f628e1abe06267f6be.tar.gz talos-hostboot-ccf6b1d7112e80f19b5667f628e1abe06267f6be.zip | |
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 <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 8 | ||||
| -rw-r--r-- | src/usr/sbe/sbe_update.H | 5 |
2 files changed, 7 insertions, 6 deletions
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 <p9_xip_section_append.H> #include <p9_xip_image.h> +#include <p9_perv_scom_addresses.H> #include <p9_frequency_buckets.H> #include <initservice/mboxRegs.H> @@ -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; |
