summaryrefslogtreecommitdiffstats
path: root/src/usr/targeting/test
diff options
context:
space:
mode:
authorMike Baiocchi <mbaiocch@us.ibm.com>2017-07-01 01:43:12 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-08-09 13:47:00 -0400
commit776d1086a7ed224c482d2da3c49b2c597b8776ab (patch)
tree1da81d9f9edec18550b4bd69dcfd95140e741fa1 /src/usr/targeting/test
parente676209189922c5105629a9785a25958ba0972a9 (diff)
downloadtalos-hostboot-776d1086a7ed224c482d2da3c49b2c597b8776ab.tar.gz
talos-hostboot-776d1086a7ed224c482d2da3c49b2c597b8776ab.zip
Secureboot: Inhibit attribute overrides and sync exposures
For Secureboot purposes, we don't consider the FSP a secure source. So this commit inhibts attribute overrides and any sort of attribute syncing from the FSP. Change-Id: I941ab5083d3055bc29237839aaaf4b723a2b0e90 RTC:175071 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42687 Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@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/targeting/test')
-rw-r--r--src/usr/targeting/test/testattrtank.H14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/usr/targeting/test/testattrtank.H b/src/usr/targeting/test/testattrtank.H
index 247076e58..e1a2b22af 100644
--- a/src/usr/targeting/test/testattrtank.H
+++ b/src/usr/targeting/test/testattrtank.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2013,2014 */
+/* Contributors Listed Below - COPYRIGHT 2013,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -36,6 +36,7 @@
#include <targeting/common/attributeTank.H>
#include <targeting/attrPlatOverride.H>
#include <pnor/pnorif.H>
+#include <kernel/bltohbdatamgr.H>
using namespace TARGETING;
@@ -1171,6 +1172,13 @@ public:
l_attrPermSec.name = "Test Attr Perm";
l_attrPermSec.vaddr = reinterpret_cast<uint64_t>(malloc(3*l_chunkSize));
+
+ // This test needs Attribute Overrides to work, so save global variable
+ // before setting it to 'true' for the duration of this test
+ bool save_allowAttrOverrides = g_BlToHbDataManager.iv_data.allowAttrOverrides;
+ g_BlToHbDataManager.iv_data.allowAttrOverrides = true;
+ TS_TRACE("testBMCAttrOverride: saved Allow Attr Override (%d) and set to true", save_allowAttrOverrides);
+
do
{
// Create local AttributeTanks
@@ -1448,6 +1456,10 @@ public:
} while(0);
+ // Restore Allow Attr Override Setting
+ g_BlToHbDataManager.iv_data.allowAttrOverrides = save_allowAttrOverrides;
+ TS_TRACE("testBMCAttrOverride: restored Allow Attr Override (%d)", save_allowAttrOverrides);
+
// Free memory
free (reinterpret_cast<char *>(l_attrTmpSec.vaddr));
free (reinterpret_cast<char *>(l_attrPermSec.vaddr));
OpenPOWER on IntegriCloud