From 57eeca20f6cc9236834b763b6301d475ad9944f0 Mon Sep 17 00:00:00 2001 From: Mark Wenning Date: Tue, 8 Jan 2013 10:26:36 -0600 Subject: Fix errlog memory leak in build_winkle_images.C If mm_linear_map fails and creates an error log, the log does not get added to IStepError and passed out to IstepDispatcher. Also fix set_pore_bars to pass in the correct memory size mask. Change-Id: I00df69733d2235901fcc5bb6eb5f11ddddc96c11 RTC:61645 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2908 Reviewed-by: Brian H. Horton Tested-by: Jenkins Server Reviewed-by: MIKE J. JONES Reviewed-by: A. Patrick Williams III --- src/include/usr/hwpf/istepreasoncodes.H | 1 + src/include/usr/vmmconst.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/include') diff --git a/src/include/usr/hwpf/istepreasoncodes.H b/src/include/usr/hwpf/istepreasoncodes.H index c0901acbc..4d0a619c1 100644 --- a/src/include/usr/hwpf/istepreasoncodes.H +++ b/src/include/usr/hwpf/istepreasoncodes.H @@ -162,6 +162,7 @@ enum istepReasonCode ISTEP_FABRIC_IO_DCCAL_ENDPOINT2_FAILED = ISTEP_COMP_ID | 0x25, ISTEP_CUSTOMIZE_CHIP_REGIONS_FAILED = ISTEP_COMP_ID | 0x26, ISTEP_GET_SLW_OUTPUT_BUFFER_FAILED = ISTEP_COMP_ID | 0x27, + ISTEP_GET_SLW_REALMEM_FAILED = ISTEP_COMP_ID | 0x28, }; // end ISTEP diff --git a/src/include/usr/vmmconst.h b/src/include/usr/vmmconst.h index c4a7e8bb8..b6e7f9dd8 100644 --- a/src/include/usr/vmmconst.h +++ b/src/include/usr/vmmconst.h @@ -110,8 +110,9 @@ enum BlockPriority /** Hardwired pointer to output SLW image in real mem */ /** 128M + 32M */ /** SLW image must be on 1M boundary */ +/** set_pore_bars expects a region size in MB. It must be a power of 2 */ #define OUTPUT_PORE_IMG_ADDR 128*MEGABYTE + 32*MEGABYTE -#define MAX_OUTPUT_PORE_IMG_SIZE 4*MEGABYTE +#define MAX_OUTPUT_PORE_IMG_IN_MB 4 /** -- cgit v1.2.1