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/include/bootloader | |
| parent | 87824e36613d0f1a18ac2873012c7cc0ce98cc01 (diff) | |
| download | talos-hostboot-2895249b06f4064caca13efc15a569fb43139ed7.tar.gz talos-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/include/bootloader')
| -rw-r--r-- | src/include/bootloader/bootloaderif.H | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/include/bootloader/bootloaderif.H b/src/include/bootloader/bootloaderif.H index 3ec6261be..dd1c3a8ff 100644 --- a/src/include/bootloader/bootloaderif.H +++ b/src/include/bootloader/bootloaderif.H @@ -54,9 +54,10 @@ const uint64_t BLTOHB_EYECATCHER = 0x23626C746F686200; // #BLTOHB\0 enum BlToHbDataVersion { // [release:4][version:4] - BLTOHB_INIT = 0x0000000900000001, - BLTOHB_SAB = 0x0000000900000002, - BLTOHB_MMIOBARS = 0x0000000900000003 + BLTOHB_INIT = 0x0000000900000001, + BLTOHB_SAB = 0x0000000900000002, + BLTOHB_MMIOBARS = 0x0000000900000003, + BLTOHB_SECURE_OVERRIDES = 0x0000000900000004, }; @@ -76,9 +77,9 @@ struct BlToHbData secureRomSize(0), hwKeysHash(nullptr), hwKeysHashSize(0), hbbHeader(nullptr), hbbHeaderSize(0), secureAccessBit(0), - securityOverride(0), allowAttrOverrides(0), xscomBAR(MMIO_GROUP0_CHIP0_XSCOM_BASE_ADDR), - lpcBAR(MMIO_GROUP0_CHIP0_LPC_BASE_ADDR) {} + lpcBAR(MMIO_GROUP0_CHIP0_LPC_BASE_ADDR), + securityOverride(0), allowAttrOverrides(0) {} // Simple way to tell if data is valid uint64_t eyeCatch; @@ -100,14 +101,14 @@ struct BlToHbData size_t hbbHeaderSize; // Secure Setting - Secure Access Bit bool secureAccessBit; - // Secure Setting - Security Override - bool securityOverride; - // Secure Setting - Allow Attribute Overrides in Securemode - bool allowAttrOverrides; // XSCOM MMIO BAR uint64_t xscomBAR; // LPC MMIO BAR uint64_t lpcBAR; + // Secure Setting - Security Override + bool securityOverride; + // Secure Setting - Allow Attribute Overrides in Securemode + bool allowAttrOverrides; } __attribute__((packed)); /** |
