From 34870a4a98bb1c4759ed575fec8351941990e38e Mon Sep 17 00:00:00 2001 From: Yue Du Date: Sun, 19 Feb 2017 05:02:13 -0600 Subject: [PATCH] STOP: SGPE(image/bootloader) and OCC Start Addr CHANGE in SRAM Change-Id: Idd370310e23e795ea26750f9d4f1d6bb59512dee Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36703 Tested-by: Hostboot CI Tested-by: Jenkins Server Reviewed-by: AMIT KUMAR Reviewed-by: Brian T. Vanderpool Reviewed-by: Gregory S. Still Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36874 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- .../chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H | 6 +++--- .../p9/procedures/hwp/lib/p9_hcd_memmap_occ_sram.H | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H b/src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H index be75c06a086..d9ce7dbe561 100644 --- a/src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H +++ b/src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H @@ -178,7 +178,7 @@ HCD_CONST(SGPE_INSTRUMENTATION_SIZE, (2 * ONE_KB)) HCD_CONST(SGPE_IMAGE_QPMR_OFFSET, (SGPE_BOOT_LOADER_QPMR_OFFSET + SGPE_BOOT_LOADER_SIZE)) -HCD_CONST(SGPE_IMAGE_SIZE, (80 * ONE_KB)) +HCD_CONST(SGPE_IMAGE_SIZE, (80 * ONE_KB)) //RTC158543 HCD_CONST(SGPE_INT_VECTOR_SIZE, 384) HCD_CONST(SGPE_HCODE_RESET_ADDR_VAL, 0x40) @@ -420,7 +420,7 @@ HCD_CONST(PGPE_INSTRUMENTATION_SIZE, (2 * ONE_KB)) HCD_CONST(PGPE_IMAGE_PPMR_OFFSET, (PGPE_BOOT_LOADER_PPMR_OFFSET + PGPE_BOOT_LOADER_SIZE)) -HCD_CONST(PGPE_IMAGE_SIZE, (48 * ONE_KB)) //RTC 158543 +HCD_CONST(PGPE_IMAGE_SIZE, (48 * ONE_KB)) //RTC158543 HCD_CONST(PGPE_INT_VECTOR_SIZE, 384) HCD_CONST(PGPE_HCODE_RESET_ADDR_VAL, 0x40) @@ -457,7 +457,7 @@ HCD_CONST(PGPE_BUILD_VER_IMAGE_OFFSET, (PGPE_HEADER_IMAGE_OFFSET + PGPE /// PGPE Hcode -//HCD_CONST(PGPE_HCODE_SIZE, (32 * ONE_KB)) //RTC 158543 +//HCD_CONST(PGPE_HCODE_SIZE, (32 * ONE_KB)) //RTC158543 HCD_CONST(PGPE_DBG_PTR_AREA_SIZE, 64) HCD_CONST(PGPE_GLOBAL_PSTATE_PARAM_BLOCK_SIZE, (4 * ONE_KB)) diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_occ_sram.H b/src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_occ_sram.H index bc0591becf7..968821256c3 100644 --- a/src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_occ_sram.H +++ b/src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_occ_sram.H @@ -51,8 +51,8 @@ HCD_CONST(OCC_SRAM_BASE_ADDR, 0xFFF00000) HCD_CONST(OCC_SRAM_IPC_REGION_SIZE, (4 * ONE_KB)) HCD_CONST(OCC_SRAM_GPE0_REGION_SIZE, (60 * ONE_KB)) HCD_CONST(OCC_SRAM_GPE1_REGION_SIZE, (64 * ONE_KB)) -HCD_CONST(OCC_SRAM_PGPE_REGION_SIZE, (64 * ONE_KB)) -HCD_CONST(OCC_SRAM_SGPE_REGION_SIZE, (64 * ONE_KB)) +HCD_CONST(OCC_SRAM_PGPE_REGION_SIZE, PGPE_IMAGE_SIZE) +HCD_CONST(OCC_SRAM_SGPE_REGION_SIZE, SGPE_IMAGE_SIZE) HCD_CONST(OCC_SRAM_OCC_REGION_SIZE, (512 * ONE_KB)) HCD_CONST(OCC_SRAM_BEFORE_PGPE_REGION_SIZE_TOTAL, @@ -103,12 +103,18 @@ HCD_CONST(OCC_SRAM_SGPE_HCODE_RESET_ADDR, HCD_CONST(OCC_SRAM_SGPE_HEADER_ADDR, (OCC_SRAM_SGPE_BASE_ADDR + SGPE_INT_VECTOR_SIZE)) +/// SGPE Persistent Data Area(PDA) + +HCD_CONST(OCC_SRAM_SGPE_PDA_SIZE, ONE_KB) +HCD_CONST(OCC_SRAM_SGPE_PDA_ADDR, + (OCC_SRAM_SGPE_END_ADDR - OCC_SRAM_SGPE_PDA_SIZE)) + /// SGPE Boot HCD_CONST(OCC_SRAM_SGPE_COPY_BOOT_LOADER_SIZE, ONE_KB) HCD_CONST(OCC_SRAM_SGPE_COPY_QPMR_HEADER_SIZE, ONE_KB) HCD_CONST(OCC_SRAM_SGPE_BOOT_LOADER_ADDR, - (OCC_SRAM_SGPE_END_ADDR - OCC_SRAM_SGPE_COPY_BOOT_LOADER_SIZE)) + (OCC_SRAM_SGPE_PDA_ADDR - OCC_SRAM_SGPE_COPY_BOOT_LOADER_SIZE)) HCD_CONST(OCC_SRAM_SGPE_BOOT_LOADER_RESET_ADDR, (OCC_SRAM_SGPE_BOOT_LOADER_ADDR + SGPE_BOOT_LOADER_RESET_ADDR_VAL)) HCD_CONST(OCC_SRAM_SGPE_QPMR_HEADER_ADDR,