From 5e28eb679db54fa4f0040dd712b311d441ed6ca2 Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Tue, 20 Sep 2016 16:22:57 -0500 Subject: Changes for P9 SBE - Clean-up work from MRW Finalize changes needed to correctly set MRW for SBE Update and SBE SEEPROMs. Check for receiving 0 as the Nest PLL Bucket ID. Change-Id: Ic6d47a8135ccc01f15d5d0d6a64736da31661090 RTC:161049 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29995 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Andres A. Lugo-Reyes Reviewed-by: Daniel M. Crowell --- src/usr/sbe/sbe_update.C | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/usr/sbe') diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index faf90c581..daffc76f3 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -4449,7 +4449,15 @@ namespace SBE size_t sizeOfPll = sizeof(NEST_PLL_FREQ_LIST)/ sizeof(NEST_PLL_FREQ_LIST[0]); - + // Put in an override if 0 is received -- @TODO RTC:161398 to remove + if (0 == l_scratch4.nestPllBucket) + { + // ID of 0 is invalid, so default ID to 3 instead + l_scratch4.nestPllBucket = 3; + TRACFCOMP(g_trac_sbe, + "Nest PLL bucket id is invalid, changed id to %d", + l_scratch4.nestPllBucket ); + } assert((uint8_t)(l_scratch4.nestPllBucket-1) < (uint8_t) sizeOfPll ); -- cgit v1.2.3