diff options
| author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2017-06-16 15:48:51 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-16 21:28:19 -0400 |
| commit | 2895249b06f4064caca13efc15a569fb43139ed7 (patch) | |
| tree | 0d862f1c507d481cd618f627ae789f31998e14de /src/kernel | |
| parent | 87824e36613d0f1a18ac2873012c7cc0ce98cc01 (diff) | |
| download | blackbird-hostboot-2895249b06f4064caca13efc15a569fb43139ed7.tar.gz blackbird-hostboot-2895249b06f4064caca13efc15a569fb43139ed7.zip | |
Fix Bl-To-Hb Data Issue
This commit fixes an issue where data was incorrectly added to the
middle of the existing BlToHbData struct. The secure settings
at fault have been moved to the end of the structure.
Change-Id: I9ecb3256325aaeb633e250cb60e4f4ffc6010dba
RTC:163094
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42005
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/bltohbdatamgr.C | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/kernel/bltohbdatamgr.C b/src/kernel/bltohbdatamgr.C index 95a21ab17..8358c5840 100644 --- a/src/kernel/bltohbdatamgr.C +++ b/src/kernel/bltohbdatamgr.C @@ -131,9 +131,18 @@ printk("Version=%lX\n",i_data.version); if(iv_data.version >= Bootloader::BLTOHB_SAB) { iv_data.secureAccessBit = i_data.secureAccessBit; - iv_data.securityOverride = i_data.securityOverride; + } + + if(iv_data.version >= Bootloader::BLTOHB_SECURE_OVERRIDES) + { + iv_data.securityOverride = i_data.securityOverride; iv_data.allowAttrOverrides = i_data.allowAttrOverrides; } + else + { + iv_data.securityOverride = 0; + iv_data.allowAttrOverrides = 0; + } // Ensure Bootloader to HB structure has the MMIO members if( iv_data.version >= Bootloader::BLTOHB_MMIOBARS ) |
