From 2371c946def6923c102d67dd1bf79f21b911c656 Mon Sep 17 00:00:00 2001 From: Martin Peschke Date: Fri, 16 Dec 2016 17:52:33 +0100 Subject: TOR space reductions These changes avoid some waste of valuable memory used to store TOR and rings contained in TOR. This is mostly needed as a SEEPROM relief. Contains: - 12 byte ring header (former 31551 commit) - less zero padding at the end of compressed ring (former 31524 commit) - removed an additional ring meta data structure (former 31524 commit) In addition, it contains these fixes: - fixed a bunch of scan addresses (former 33969 commit) - increased size of ring decompression buffer (former 32796 commit) - zero byte ring padding up to 4 byte boundaries for SBE (former 33969 commit) - added dbgl control of error trace after call to get_ring_from_sbe_image - added enumerated ringId to the RS4v3 header - fixed incorrect scan address masks for even/odd EX RS4 v3 ring handling in MVPD accessor functions - fixed incorrect scan address region bits for odd EX rings translated from RS4 v2 to RS4 v3 in MVPD accessor functions CMVC-Prereq: 1015124 Change-Id: I8fd00760e6ac2b3760994d1ca819fffbf35188ca Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33993 Tested-by: Hostboot CI Tested-by: Jenkins Server Tested-by: PPE CI Reviewed-by: Prachi Gupta Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34014 Reviewed-by: Sachin Gupta --- src/import/tools/imageProcs/p9_ipl_build.C | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/import/tools/imageProcs') diff --git a/src/import/tools/imageProcs/p9_ipl_build.C b/src/import/tools/imageProcs/p9_ipl_build.C index 495d17ce..71babfad 100644 --- a/src/import/tools/imageProcs/p9_ipl_build.C +++ b/src/import/tools/imageProcs/p9_ipl_build.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -310,7 +310,8 @@ int ipl_build( char* i_fnSbeImage, if(rc == IMGBUILD_SUCCESS) { // update our SBE image size to include the new block of rings - sbeImageSize += l_blockSize; + // and make sure it's 8 byte aligned + sbeImageSize += ((l_blockSize + 7) / 8) * 8; // grow our workspace void* tmp = realloc(sbeImage, sbeImageSize); -- cgit v1.2.1