diff options
| author | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-02-23 10:47:56 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-02-23 12:45:39 -0600 |
| commit | a48f4e95990413fdc9c5993cf9061f138910db57 (patch) | |
| tree | f927d8daa6d1e33a68163ea034a9fa876c7a62bb /src/bootloader | |
| parent | 2a2071cb681555449f12769c8c3e3d7e03a37d8e (diff) | |
| download | talos-hostboot-a48f4e95990413fdc9c5993cf9061f138910db57.tar.gz talos-hostboot-a48f4e95990413fdc9c5993cf9061f138910db57.zip | |
Revert "Enhance RAS for case where boot firmware image is too big to load"
This reverts commit ee1cd5b0adfaf133abe846ccbaebe48d7dbded0f.
We overran our size constraint in the bootloader.
Change-Id: Ib579b5971e5f03131a0b6580cd698e7f725dd383
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72401
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/bootloader')
| -rw-r--r-- | src/bootloader/bootloader.C | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/src/bootloader/bootloader.C b/src/bootloader/bootloader.C index 69058b18b..defac9b57 100644 --- a/src/bootloader/bootloader.C +++ b/src/bootloader/bootloader.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -456,42 +456,11 @@ namespace Bootloader{ bool l_hbbEcc = ( g_blData->bl_hbbSection.integrity == FFS_INTEG_ECC_PROTECT); - uint32_t workingLength= (l_hbbEcc) ? - (l_hbbLength * LENGTH_W_ECC)/LENGTH_WO_ECC : l_hbbLength; - - // handleMMIO below always moves WORDSIZE chunks at a time, even - // if there is just one byte left, so subtract WORDSIZE from the - // limit to compensate - if(workingLength > (MEGABYTE-WORDSIZE)) - { - BOOTLOADER_TRACE(BTLDR_TRC_BAD_WORK_LEN); - /*@ - * @errortype - * @moduleid Bootloader::MOD_BOOTLOADER_MAIN - * @reasoncode Bootloader::RC_BAD_WORK_LEN - * @userdata1[0:15] TI_WITH_SRC - * @userdata1[16:31] TI_BOOTLOADER - * @userdata1[32:63] Failing address = 0 - * @userdata2[0:31] Length of data from TOC (bytes) - * @userdata2[32:63] Working length (bytes) - * @errorInfo[0:31] Max space available (bytes) - * @devdesc Not enough memory to load boot firmware - * @custdesc Failed to load boot firmware - */ - bl_terminate( - MOD_BOOTLOADER_MAIN, - RC_BAD_WORK_LEN, - l_hbbLength, - workingLength, - true, - 0, - (MEGABYTE-WORDSIZE)); - } - // Copy HB base code from PNOR to working location handleMMIO(l_pnorStart + l_hbbFlashOffset, (l_hbbEcc) ? HBB_ECC_WORKING_ADDR : HBB_WORKING_ADDR, - workingLength, + (l_hbbEcc) ? (l_hbbLength * LENGTH_W_ECC)/LENGTH_WO_ECC + : l_hbbLength, WORDSIZE); BOOTLOADER_TRACE(BTLDR_TRC_MAIN_WORKING_HANDLEMMIO_RTN); |
