summaryrefslogtreecommitdiffstats
path: root/src/usr/sbeio
diff options
context:
space:
mode:
authorStephen Cprek <smcprek@us.ibm.com>2018-01-16 14:15:36 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-01-22 23:39:14 -0500
commit038392cae8c5a50b0098000566167fef68d047f5 (patch)
tree9bacc708ef80aaf79d4dd0eed40aa0ebf5cf1898 /src/usr/sbeio
parent07f9a377153875d5d00763b96b33e40a49ec274b (diff)
downloadtalos-hostboot-038392cae8c5a50b0098000566167fef68d047f5.tar.gz
talos-hostboot-038392cae8c5a50b0098000566167fef68d047f5.zip
Move closing all unsecure memory regions to 21.3
Current windows that are left open at end of IPL - SBE FFDC - CPU Controls SP ATTN area - 0-64MB for SP ATTN Change-Id: I887fc63bcc70f2351530741bd251db12732a5948 RTC:168745 Backport:release-fips910 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52045 Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/sbeio')
-rw-r--r--src/usr/sbeio/sbe_memRegionMgr.C7
-rw-r--r--src/usr/sbeio/test/sbe_memregiontest.H11
2 files changed, 17 insertions, 1 deletions
diff --git a/src/usr/sbeio/sbe_memRegionMgr.C b/src/usr/sbeio/sbe_memRegionMgr.C
index 524c99fbe..a5692549d 100644
--- a/src/usr/sbeio/sbe_memRegionMgr.C
+++ b/src/usr/sbeio/sbe_memRegionMgr.C
@@ -600,6 +600,13 @@ errlHndl_t MemRegionMgr::closeAllUnsecureMemRegions()
l_region.start_addr = itr->start_addr;
l_region.size = itr->size;
l_region.flags = SbePsu::SBE_MEM_REGION_CLOSE;
+ l_region.tgt = itr->tgt;
+
+ // Trace out information of memory region to close
+ SBE_TRACF("closeAllUnsecureMemRegions: Closing Region - tgt=0x%.8X: start_addr=0x%.16llX, size=0x%.8X, flags=0x%.2X",
+ TARGETING::get_huid(l_region.tgt),
+ l_region.start_addr, l_region.size,
+ l_region.flags);
errl = doUnsecureMemRegionOp(l_region);
diff --git a/src/usr/sbeio/test/sbe_memregiontest.H b/src/usr/sbeio/test/sbe_memregiontest.H
index 87cb4a040..f6d0ec634 100644
--- a/src/usr/sbeio/test/sbe_memregiontest.H
+++ b/src/usr/sbeio/test/sbe_memregiontest.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2017 */
+/* Contributors Listed Below - COPYRIGHT 2017,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -77,6 +77,15 @@ class SbeMemRegionTest : public CxxTest::TestSuite
do
{
+ // Tell SBE to Close All Unsecure Memory Regions before tests
+ errl = SBEIO::closeAllUnsecureMemRegions();
+ if (errl)
+ {
+ TS_FAIL("memRegionTest1: pre-test cleanup SBEIO::closeAllUnsecureMemRegions Failed: rc=0x%X, plid=0x%X",
+ ERRL_GETRC_SAFE(errl), ERRL_GETPLID_SAFE(errl));
+ break;
+ }
+
// Loop Test: Open MAX+1 to force a fail
for (size_t i = 1; i<=SBEIO_MAX_UNSECURE_MEMORY_REGIONS+1 ; i++)
{
OpenPOWER on IntegriCloud