diff options
| author | Nick Bofferding <bofferdn@us.ibm.com> | 2017-04-21 12:34:01 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-04-28 16:28:57 -0400 |
| commit | 65933dc2985b91be71ac35a6df2786f0e43ab779 (patch) | |
| tree | db50c52908c9bd3628d1aa6182e1981d6f6130b2 /src/usr/targeting/common | |
| parent | 78b9f5fc8fdd8aa99796729902150eae0f7829b5 (diff) | |
| download | blackbird-hostboot-65933dc2985b91be71ac35a6df2786f0e43ab779.tar.gz blackbird-hostboot-65933dc2985b91be71ac35a6df2786f0e43ab779.zip | |
Split ATTR_SECURITY_MODE into FSP/HB specific attributes
Change-Id: Ib4eed5cb069b4cef02fefcc398e27a51d0b287f6
RTC: 170650
CMVC-Coreq: 1022371
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39552
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@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: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting/common')
4 files changed, 27 insertions, 19 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 1d0b5a9bd..4ad390838 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -28582,24 +28582,6 @@ Measured in GB</description> </attribute> <attribute> - <id>SECURITY_MODE</id> - <description> - If SBE image has ATTR_SECURITY_MODE == 0b1, then leave SAB bit as is, - else ATTR_SECURITY_MODE == 0b0, then clear SAB bit - </description> - <simpleType> - <uint8_t></uint8_t> - </simpleType> - <persistency>non-volatile</persistency> - <writeable/> - <readable/> - <hwpfToHbAttrMap> - <id>ATTR_SECURITY_MODE</id> - <macro>DIRECT</macro> - </hwpfToHbAttrMap> -</attribute> - -<attribute> <id>PFET_OFF_CONTROLS</id> <description> To disable force pfet off control from fuse status diff --git a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml index f5f56e2b2..255851800 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml @@ -1948,4 +1948,30 @@ ID for the sensor number returned with the elog. --> <hbOnly/> </attribute> +<attribute> + <id>HB_SECURITY_MODE</id> + <description> + HB specific attribute which is aliased to the FAPI attribute + ATTR_SECURITY_MODE and customized into the SBE image. If 0b0, SBE + will disable proc security (via SAB bit) if mailbox scratch register 3 + bit 6 is set. Otherwise, if 0b1, SBE will not override proc security. + TODO RTC 170650: When SBE image is signed in all environments, set + default to 0b1 and rely on SBE signing header to configure the final + value, This may require hbOnly support for volatile attributes. + </description> + <simpleType> + <uint8_t> + <default>0x00</default> + </uint8_t> + </simpleType> + <persistency>volatile-zeroed</persistency> + <writeable/> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_SECURITY_MODE</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> + <hbOnly/> +</attribute> + </attributes> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 63caf89d6..16503c252 100755 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -805,7 +805,6 @@ <attribute><id>SYS_FORCE_ALL_CORES</id></attribute> <attribute><id>DISABLE_HBBL_VECTORS</id></attribute> <attribute><id>SECURITY_ENABLE</id></attribute> - <attribute><id>SECURITY_MODE</id></attribute> <attribute><id>PIBMEM_REPAIR0</id></attribute> <attribute><id>PIBMEM_REPAIR1</id></attribute> <attribute><id>PIBMEM_REPAIR2</id></attribute> diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml index d5b743e1f..b45a0bc79 100755 --- a/src/usr/targeting/common/xmltohb/target_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml @@ -88,6 +88,7 @@ <attribute><id>DRTM_PAYLOAD_ADDR_MB_HB</id></attribute> <attribute><id>FORCE_PRE_PAYLOAD_DRTM</id></attribute> <attribute><id>HB_RSV_MEM_NEXT_SECTION</id></attribute> + <attribute><id>HB_SECURITY_MODE</id></attribute> </targetTypeExtension> <targetTypeExtension> |
