diff options
| author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2018-02-02 11:58:41 -0600 |
|---|---|---|
| committer | hostboot <hostboot@us.ibm.com> | 2018-03-22 14:06:34 -0500 |
| commit | 75d80ab7cfaa35b79cfa14d1e8447a3a03cb8173 (patch) | |
| tree | 15a320d0f6d78bc44f6d713b0ac0b18595f51af8 /import/chips/common/utils/imageProcs | |
| parent | 0cece595a521dfcb9fc4bf0127541437655a17c4 (diff) | |
| download | talos-hcode-75d80ab7cfaa35b79cfa14d1e8447a3a03cb8173.tar.gz talos-hcode-75d80ab7cfaa35b79cfa14d1e8447a3a03cb8173.zip | |
Additional risk level support - (step 2) Updating the image w/RL2
This commit changes the images' .rings section by adding the TOR
RL2 variant slot to the runtime Quad chiplets, EQ and EC.
Specifically, we have changed the definition of the ATTR_RISK_LEVEL
attribute to now have three risk levels, RL0 (prev FALSE), RL1
(prev TRUE) and RL2 (new). To accomodate RL2, a new "override"
txt file has been created, ./attribute_ovd/runtime_risk2.txt and
changes to many other files using the ATTR_RISK_LEVEL attrib have
been updated as well.
Lastly, and to allow for the inclusion of RL2 rings in the HW
image, the TOR_VERSION has been updated to version 6 which will
allow for RL2 support in the ring ID metadata files.
p9_setup_sbe_config is updated to write the RISK_LEVEL value into
scratch 3 bits 28:31, and deprecate the existing mailbox.
RISK_LEVEL processing has been removed from p9_sbe_attr_setup. It's
only function is to seed mailboxes which are empty via the
attribute state present in the SEEPROM. Since RISK_LEVEL is zero
at image build time, and explicitly cleared as a result of every
customization, there's logically no need to process the RISK_LEVEL
here.
PPE changes to accomodate the new RISK_LEVEL mailbox
location need to be implemented in the PLAT code: src/hwpf/target.C
Key_Cronus_Test=XIP_REGRESS
HW-ImageBuild-Preqeq=52659
- 52659 must be fully merged in Cronus and HB before this commit
(53292) can be merged. This is to avoid a Coreq situation.
CQ: SW416424
cmvc-prereq: 1046058
cmvc-prereq: 1043606
cmvc-prereq: 1045920
Change-Id: Ia0471219916602cc0041a2c55a1070013f66a7d9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53292
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Diffstat (limited to 'import/chips/common/utils/imageProcs')
| -rw-r--r-- | import/chips/common/utils/imageProcs/common_ringId.H | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/import/chips/common/utils/imageProcs/common_ringId.H b/import/chips/common/utils/imageProcs/common_ringId.H index 71cca176..3c8a5754 100644 --- a/import/chips/common/utils/imageProcs/common_ringId.H +++ b/import/chips/common/utils/imageProcs/common_ringId.H @@ -137,8 +137,8 @@ typedef uint16_t TorRingOffset_t; // Offset value to actual ring //#define TOR_VERSION 2 // Reduced RS4 header. //#define TOR_VERSION 3 // Added TOR magic header. //#define TOR_VERSION 4 // TOR API code restructuring. -#define TOR_VERSION 5 // Removed TOR-level DD handling. -//#define TOR_VERSION 6 // Added additional runtime risk level (RL2) +//#define TOR_VERSION 5 // Removed TOR-level DD handling. +#define TOR_VERSION 6 // Added additional runtime risk level (RL2) // TOR Magic values for top-level TOR ringSection and sub-ringSections enum TorMagicNum |
