From b14cd8d7d424a226673519b9b90d73d482f416f2 Mon Sep 17 00:00:00 2001 From: Claus Michael Olsen Date: Fri, 29 Dec 2017 14:04:28 -0600 Subject: xip_customize and TOR API: Improved DD level verification This update propagates the extracted EC level in xip_customize through to the TOR API via the call to tor_get_single_ring(). The TOR API has been updated to verify that the requested DD level matches matches the DD level in the TOR header of the supplied ring section which, in the case of xip_customize, is an .overlays ring section. Key_Cronus_Test=XIP_REGRESS Change-Id: I3ef881a354e25a7f671a19373f2c80d88a42ccba Original-Change-Id: Ic087c269306acc0afcb8c759fe68eac63ae93d29 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51339 Tested-by: Jenkins Server Tested-by: Cronus HW CI Tested-by: PPE CI Tested-by: HWSV CI Tested-by: Hostboot CI Tested-by: FSP CI Jenkins Reviewed-by: Thi N. Tran Reviewed-by: Sumit Kumar Reviewed-by: Jennifer A. Stofer --- import/chips/p9/xip/p9_xip_image.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/import/chips/p9/xip/p9_xip_image.h b/import/chips/p9/xip/p9_xip_image.h index 8cc13ffe..0d462ee0 100644 --- a/import/chips/p9/xip/p9_xip_image.h +++ b/import/chips/p9/xip/p9_xip_image.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HCODE Project */ /* */ -/* COPYRIGHT 2015,2017 */ +/* COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -248,9 +248,6 @@ typedef enum { /// gaurantee that the something will be able to complete any 8-byte load/store. #define P9_XIP_FINAL_ALIGNMENT 8 -/// Local undefined DD level value. -#define P9_XIP_UNDEFINED_DDLEVEL (uint8_t)0xff - //////////////////////////////////////////////////////////////////////////// // C Definitions @@ -263,6 +260,7 @@ typedef enum { #include #endif #include +#include #ifdef __cplusplus extern "C" { @@ -713,7 +711,7 @@ p9_xip_get_section(const void* i_image, P9XipSection* o_hostSection); #else P9XipSection* o_hostSection, - uint8_t i_ddLevel=P9_XIP_UNDEFINED_DDLEVEL); + uint8_t i_ddLevel=UNDEFINED_DD_LEVEL); #endif -- cgit v1.2.3