diff options
| -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; |
