diff options
| author | Ilya Smirnov <ismirno@us.ibm.com> | 2018-12-11 09:47:55 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-04-12 12:12:11 -0500 |
| commit | a9addc3db4f8940ca38fb63c99fcab26126c88f0 (patch) | |
| tree | 081e8545ba2b6585342c73dd6101fef562765fae /src/include | |
| parent | 75c14bbdbc1f8706d8dccab7d273cc3fd581717f (diff) | |
| download | talos-hostboot-a9addc3db4f8940ca38fb63c99fcab26126c88f0.tar.gz talos-hostboot-a9addc3db4f8940ca38fb63c99fcab26126c88f0.zip | |
SMF: Logic For Creating Non-Secure HOMER Memory Space
For SMF to be enabled, HOMER requires a small amount of
non-SMF (unsecure) memory where the "jump to Ultravisor"
instruction can be put (to transition to UV mode). This
commit sets up a region of non-secure memory space for
that purpose.
Change-Id: Ib91ec69f49a4e174e65f3c2aad337a68eaa0803b
RTC: 205986
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70699
Reviewed-by: Prem Shanker Jha <premjha2@in.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>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/runtime/interface.h | 1 | ||||
| -rwxr-xr-x | src/include/usr/hdat/hdat.H | 3 | ||||
| -rw-r--r-- | src/include/usr/isteps/istep_reasoncodes.H | 2 | ||||
| -rw-r--r-- | src/include/usr/secureboot/smf.H | 4 | ||||
| -rw-r--r-- | src/include/usr/vmmconst.h | 4 |
5 files changed, 10 insertions, 4 deletions
diff --git a/src/include/runtime/interface.h b/src/include/runtime/interface.h index 31f5eaddc..bd04e7774 100644 --- a/src/include/runtime/interface.h +++ b/src/include/runtime/interface.h @@ -159,6 +159,7 @@ enum MemoryError_t #define HBRT_RSVD_MEM__SECUREBOOT "ibm,secure-crypt-algo-code" #define HBRT_RSVD_MEM__DATA "ibm,hbrt-data" #define HBRT_RSVD_MEM__ARCH_REG "ibm,arch-reg-data" +#define HBRT_RSVD_MEM__UNSEC_HOMER "ibm,unsecure-homer" /* Aligned reserved memory size for Opal */ #define HBRT_RSVD_MEM_OPAL_ALIGN 64*KILOBYTE diff --git a/src/include/usr/hdat/hdat.H b/src/include/usr/hdat/hdat.H index 0f750936c..01a196a41 100755 --- a/src/include/usr/hdat/hdat.H +++ b/src/include/usr/hdat/hdat.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -225,6 +225,7 @@ enum hdatMsVpdRhbAddrRangeType : uint8_t RHB_TYPE_SECUREBOOT = 3, RHB_TYPE_HOMER_OCC = 4, RHB_TYPE_VERIFIED_PNOR = 5, + RHB_TYPE_UNSECURE_HOMER = 6, RHB_TYPE_INVALID = 0xFF }; diff --git a/src/include/usr/isteps/istep_reasoncodes.H b/src/include/usr/isteps/istep_reasoncodes.H index 7aa3abc5e..5bd5fbf94 100644 --- a/src/include/usr/isteps/istep_reasoncodes.H +++ b/src/include/usr/isteps/istep_reasoncodes.H @@ -67,6 +67,7 @@ namespace ISTEP MOD_GET_LANEMASK_FROM_HX_KEYWORD = 0x24, MOD_MSS_SCRUB = 0x25, MOD_CALL_UPDATE_UCD_FLASH = 0x26, + MOD_LOAD_HCODE = 0x27, }; /** @@ -140,6 +141,7 @@ namespace ISTEP RC_PNOR_IPMI_NOT_ENABLED = ISTEP_COMP_ID | 0x4D, RC_SLAVE_CORE_WAKEUP_ERROR = ISTEP_COMP_ID | 0x4E, RC_UCD_IMG_NOT_IN_CONTAINER = ISTEP_COMP_ID | 0x4F, + RC_MM_UNMAP_FAILED = ISTEP_COMP_ID | 0x50, }; }; diff --git a/src/include/usr/secureboot/smf.H b/src/include/usr/secureboot/smf.H index 990bce09b..e062e56c9 100644 --- a/src/include/usr/secureboot/smf.H +++ b/src/include/usr/secureboot/smf.H @@ -27,6 +27,10 @@ #include <errl/errlentry.H> #include <stdint.h> +#include <limits.h> + +// The maximum size of the unsecure HOMER region in reserved memory +#define MAX_UNSECURE_HOMER_SIZE (1 * PAGESIZE) namespace SMF_TRACE { diff --git a/src/include/usr/vmmconst.h b/src/include/usr/vmmconst.h index ee280c6c2..b6841eea4 100644 --- a/src/include/usr/vmmconst.h +++ b/src/include/usr/vmmconst.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2011,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -286,6 +286,4 @@ enum BlockPriority #define PREVERLIDMGR_TEST_ADDR (512*MEGABYTE) #define PREVERLIDMGR_TEST_SIZE (64*MEGABYTE) - - #endif /* _VMMCONST_H */ |
