diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-01-19 09:06:32 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-01-25 11:47:26 -0500 |
| commit | 2ed8b10f53407e38fdbeff8f839f474437ef06bf (patch) | |
| tree | 5ab5df6a6316b250a7c6f6f2c469493b90f87373 /src/include | |
| parent | 9fe6f884d176a13b432baaa986179ef6fa654f94 (diff) | |
| download | talos-hostboot-2ed8b10f53407e38fdbeff8f839f474437ef06bf.tar.gz talos-hostboot-2ed8b10f53407e38fdbeff8f839f474437ef06bf.zip | |
Support ring overrides for HCODE image
Allows data from the RINGOVD partition of PNOR to be applied
to the HCODE/STOP image that is generated during boot and
at runtime.
Change-Id: I66665bb89af020fc1a249d89f42d541a06383309
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35128
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: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/usr/isteps/pm/pm_common_ext.H | 12 | ||||
| -rw-r--r-- | src/include/usr/secureboot/service.H | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/include/usr/isteps/pm/pm_common_ext.H b/src/include/usr/isteps/pm/pm_common_ext.H index be7e9e9b0..c503ada82 100644 --- a/src/include/usr/isteps/pm/pm_common_ext.H +++ b/src/include/usr/isteps/pm/pm_common_ext.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -78,6 +78,16 @@ namespace HBPM */ errlHndl_t resetPMAll(); + /** + * @brief Fetch the ring overrides (if they exist) + * + * @param[inout] io_overrideImg NULL if image not in PNOR or is blank, + * else pointer to override data + * + * @return errlHndl_t Error log if resetPMAll failed + */ + errlHndl_t getRingOvd(void*& io_overrideImg); + } //namespace HBPM ends #endif diff --git a/src/include/usr/secureboot/service.H b/src/include/usr/secureboot/service.H index dce836106..1c83d73c1 100644 --- a/src/include/usr/secureboot/service.H +++ b/src/include/usr/secureboot/service.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -26,6 +26,7 @@ #define __SECUREBOOT_SERVICE_H #include <errl/errlentry.H> +#include <config.h> typedef uint8_t SHA512_t[64]; /* From sha512.h: */ @@ -74,7 +75,12 @@ namespace SECUREBOOT /** @brief Determines if Secureboot is enabled. */ +#if defined(CONFIG_SECUREBOOT) && !defined(__HOSTBOOT_RUNTIME) bool enabled(); +#else + inline bool enabled() { return false; }; +#endif + //@fixme-RTC:163094-Remove RUNTIME check once the code is there /** @brief Returns the state of the secure jumper as reported by the master * processor. |
