From 7d7c9d3dbd1bfd3fce9f534d9ba5bb179711202a Mon Sep 17 00:00:00 2001 From: spashabk-in Date: Wed, 25 Oct 2017 07:48:20 -0500 Subject: Handle OCC SRAM secure mem window Allow access to only the unsecure memory windows of OCC SRAM Change-Id: I66a9383b2470fa0124708a582db4a643738535cf Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48796 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Sachin Gupta --- src/sbefw/sbeSecureMemRegionManager.C | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/sbefw/sbeSecureMemRegionManager.C') diff --git a/src/sbefw/sbeSecureMemRegionManager.C b/src/sbefw/sbeSecureMemRegionManager.C index 27bd0f66..822ee040 100644 --- a/src/sbefw/sbeSecureMemRegionManager.C +++ b/src/sbefw/sbeSecureMemRegionManager.C @@ -28,15 +28,12 @@ #include "sbeglobals.H" #ifndef __SBEFW_SEEPROM__ - -SBESecureMemRegionManager* SBESecMemRegionManager = - &SBESecureMemRegionManager::getInstance(); - -SBESecureMemRegionManager& SBESecureMemRegionManager::getInstance() -{ - static SBESecureMemRegionManager iv_instance; - return iv_instance; -} +SBESecureMemRegionManager mainStoreSecMemRegionManager( + &SBE_GLOBAL->mainMemRegions[0], + MAX_MAIN_STORE_REGIONS); +SBEOccSramSecMemRegionManager occSramSecRegionManager( + &SBE_GLOBAL->occSramRegions[0], + MAX_OCC_SRAM_REGIONS); secureMemRegion_t SBESecureMemRegionManager::getPartialRegionSize( const secureMemRegion_t i_region) @@ -91,7 +88,7 @@ sbeSecondaryResponse SBESecureMemRegionManager::add(const uint64_t i_startAddr, rc = SBE_SEC_MEM_REGION_AMEND_ATTEMPTED; break; } - if(iv_regionsOpenCnt >= MAX_NONSECURE_MEM_REGIONS) + if(iv_regionsOpenCnt >= iv_maxRegions) { SBE_ERROR(SBE_FUNC" SBE_SEC_MAXIMUM_MEM_REGION_EXCEEDED"); rc = SBE_SEC_MAXIMUM_MEM_REGION_EXCEEDED; -- cgit v1.2.1