From 075f6aa5823fedc5a667a8032d14915dd31231a4 Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Fri, 12 Aug 2016 16:22:48 -0500 Subject: Use word instructions for MMIO accesses in Bootloader Bootloader was implemented with 1-byte assembler instructions due to model restrictions on LPC accesses that existed at the time. Those restrictions no longer exist. Change Bootloader to use the word (4-byte) assembler instructions for the MMIO accesses. Change-Id: Icc07e1a15d74214b3e6d13edc6cf75d452ee6d11 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28247 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Dean Sanner Reviewed-by: Christian R. Geddes Reviewed-by: Daniel M. Crowell --- src/bootloader/bl_pnorAccess.C | 4 ++-- src/bootloader/bootloader.C | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/bootloader') diff --git a/src/bootloader/bl_pnorAccess.C b/src/bootloader/bl_pnorAccess.C index 991011872..e5e790426 100644 --- a/src/bootloader/bl_pnorAccess.C +++ b/src/bootloader/bl_pnorAccess.C @@ -129,7 +129,7 @@ void bl_pnorAccess::findTOC(uint64_t i_pnorEnd, PNOR::SectionData_t * o_TOC, Bootloader::handleMMIO(i_pnorEnd - PNOR::TOC_OFFSET_FROM_TOP_OF_FLASH, reinterpret_cast(l_tocBuffer), (PNOR::TOC_SIZE), - Bootloader::BYTESIZE); + Bootloader::WORDSIZE); BOOTLOADER_TRACE(BTLDR_TRC_PA_FINDTOC_TOC1_HANDLEMMIO_RTN); @@ -147,7 +147,7 @@ void bl_pnorAccess::findTOC(uint64_t i_pnorEnd, PNOR::SectionData_t * o_TOC, Bootloader::handleMMIO(o_pnorStart, reinterpret_cast(l_tocBuffer), (PNOR::TOC_SIZE), - Bootloader::BYTESIZE); + Bootloader::WORDSIZE); o_errCode = 0; readTOC(l_tocBuffer, o_errCode, o_TOC, o_pnorStart, i_pnorEnd); diff --git a/src/bootloader/bootloader.C b/src/bootloader/bootloader.C index ec9b12c4a..8a129b7f3 100644 --- a/src/bootloader/bootloader.C +++ b/src/bootloader/bootloader.C @@ -112,7 +112,7 @@ namespace Bootloader{ (l_hbbEcc) ? HBB_ECC_WORKING_ADDR : HBB_WORKING_ADDR, (l_hbbEcc) ? (l_hbbLength * LENGTH_W_ECC)/LENGTH_WO_ECC : l_hbbLength, - BYTESIZE); + WORDSIZE); BOOTLOADER_TRACE(BTLDR_TRC_MAIN_WORKING_HANDLEMMIO_RTN); PNOR::ECC::eccStatus rc = PNOR::ECC::CLEAN; @@ -188,7 +188,7 @@ namespace Bootloader{ uint32_t i_size, MMIOLoadStoreSizes i_ld_st_size) { - BOOTLOADER_TRACE(BTLDR_TRC_HANDLEMMIO_START); + BOOTLOADER_TRACE(BTLDR_TRC_HANDLEMMIO_START + i_ld_st_size); // Set base addresses, Ignore HRMOR setting uint64_t l_srcAddr_base = i_srcAddr | IGNORE_HRMOR_MASK; -- cgit v1.2.3