diff options
| author | Corey Swenson <cswenson@us.ibm.com> | 2016-07-14 12:36:41 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-07-27 14:34:23 -0400 |
| commit | 08bd1261d0be0ff0335c97e2d2f6b2d4c3ea2484 (patch) | |
| tree | a06f07c664ef4357814fffa1b9f8898c839072c7 /src/usr/isteps | |
| parent | 3d565d0fd7f4f05803e53ab7274008fa448030f6 (diff) | |
| download | talos-hostboot-08bd1261d0be0ff0335c97e2d2f6b2d4c3ea2484.tar.gz talos-hostboot-08bd1261d0be0ff0335c97e2d2f6b2d4c3ea2484.zip | |
More fixes for issues found during start_pm_complex
Change-Id: I6011f2e13f616ff939ce74efd3fabdb2113cbe46
RTC:133847
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27094
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/isteps')
| -rw-r--r-- | src/usr/isteps/pm/pm_common.C | 7 | ||||
| -rw-r--r-- | src/usr/isteps/pm/pm_common.H | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C index 75f2c7984..972ecdf81 100644 --- a/src/usr/isteps/pm/pm_common.C +++ b/src/usr/isteps/pm/pm_common.C @@ -327,6 +327,13 @@ namespace HBPM break; } + // The ref image may still include the 4K header which the HWP is + // not expecting, so move the image pointer past the header + if( *(reinterpret_cast<uint64_t*>(l_pImageIn)) == VER_EYECATCH) + { + l_pImageIn = reinterpret_cast<void*> + (reinterpret_cast<uint8_t*>(l_pImageIn) + PAGESIZE); + } TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "loadHcode: HCODE addr = 0x%p, lidId = 0x%.8x", l_pImageIn, diff --git a/src/usr/isteps/pm/pm_common.H b/src/usr/isteps/pm/pm_common.H index 54f2bff02..567152dce 100644 --- a/src/usr/isteps/pm/pm_common.H +++ b/src/usr/isteps/pm/pm_common.H @@ -73,6 +73,7 @@ namespace HBPM // Mask off bit zero PHYSICAL_ADDR_MASK = 0x7FFFFFFFFFFFFFFF, + VER_EYECATCH = 0x56455253494F4E00, //'VERSION\0' }; /** |
