diff options
| author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2018-04-18 09:08:07 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2018-05-03 11:31:38 -0400 |
| commit | 34332987f42c5e806dc15d87de9bb79305a5c95b (patch) | |
| tree | b88390dccd2be0bfab95f1289a5b627cb978ebcf /src/hwpf | |
| parent | a7e21bc75bf93bcabf0c96e011e06c1790dfffaa (diff) | |
| download | talos-sbe-34332987f42c5e806dc15d87de9bb79305a5c95b.tar.gz talos-sbe-34332987f42c5e806dc15d87de9bb79305a5c95b.zip | |
Risk level 3/4/5 support: Step 2 - image update to TOR v7
- This commit updates the image ring sections to TOR v7.
- It will fail with EKB FSP CI until we include the prereq to the
merged step 1 commit in PPE and HB.
Key_Cronus_Test=XIP_REGRESS
cmvc-prereq: 1053262
cmvc-prereq: 1053182
Change-Id: Ie7452fe42877297da4f0da5cd4e51c989b6ac28d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57421
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: Hostboot CI <hostboot-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>
Reviewed-by: James N. Klazynski <jklazyns@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57432
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/hwpf')
| -rw-r--r-- | src/hwpf/plat_ring_traverse.C | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/hwpf/plat_ring_traverse.C b/src/hwpf/plat_ring_traverse.C index c8a3a6a1..a984bbf8 100644 --- a/src/hwpf/plat_ring_traverse.C +++ b/src/hwpf/plat_ring_traverse.C @@ -134,7 +134,7 @@ fapi2::ReturnCode getRS4ImageFromTor( uint8_t l_torVersion = ((TorHeader_t*)i_sectionTOR)->version; SectionTOR* l_sectionTOR = (SectionTOR*)((uint8_t*)i_sectionTOR + l_torHdrSz); uint8_t l_numVarAdjust = 0; - + // Determine the Offset ID and Ring Type for the given Ring ID. uint32_t l_torOffset = 0; RingType_t l_ringType = COMMON_RING; @@ -144,6 +144,14 @@ fapi2::ReturnCode getRS4ImageFromTor( do { + if (l_torVersion > TOR_VERSION) + { + SBE_TRACE("Image TOR version (=%d) > code TOR version (=%d) not allowed", + l_torVersion, TOR_VERSION); + l_rc = fapi2::FAPI2_RC_INVALID_PARAMETER; + break; + } + if((i_ringID >= NUM_RING_IDS)) { SBE_TRACE("Invalid Ring ID - %d", i_ringID); |
