Skip to content

Commit 971fb90

Browse files
premsjhadcrowell77
authored andcommitted
PM: Added SCOM restore region in extracted QPMR binary.
Commit adds to extracted QPMR binary, the SCOM restore region meant to restore quad SCOMS. Region starts at an offset of 128K from base of QPMR. It also adds an ability to generate image for Self Restore, CME and SGPE in DMA form. Change-Id: I1b420a462eec8997231d5916fd00fe23528f8e87 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36410 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: AMIT KUMAR <akumar3@us.ibm.com> Reviewed-by: Michael S. Floyd <mfloyd@us.ibm.com> Reviewed-by: Gregory S. Still <stillgs@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36437 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
1 parent c4599e7 commit 971fb90

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,7 @@ extern "C"
886886

887887
pQpmrHdr->magic_number = SWIZZLE_8_BYTE(QPMR_MAGIC_NUMBER);
888888
pSgpeHdr->g_sgpe_magic_number = SWIZZLE_8_BYTE(SGPE_MAGIC_NUMBER);
889+
pSgpeHdr->g_sgpe_scom_mem_offset = SWIZZLE_4_BYTE(QPMR_HOMER_OFFSET + QUAD_SCOM_RESTORE_QPMR_OFFSET );
889890

890891
FAPI_INF("==============================QPMR==================================");
891892
char magicWord[16] = {0};
@@ -905,6 +906,8 @@ extern "C"
905906
FAPI_DBG(" Cmn Ring Ovrd Length : 0x%08X", SWIZZLE_4_BYTE(pQpmrHdr->quadCommonOvrdLength) );
906907
FAPI_DBG(" Quad Spec Ring Offset : 0x%08X", SWIZZLE_4_BYTE(pQpmrHdr->quadSpecRingOffset) );
907908
FAPI_DBG(" Quad Spec Ring Length : 0x%08X", SWIZZLE_4_BYTE(pQpmrHdr->quadSpecRingLength) );
909+
FAPI_INF(" Quad SCOM Offset : 0x%08X", SWIZZLE_4_BYTE(pQpmrHdr->quadScomOffset) );
910+
FAPI_INF(" Quad SCOM Length : 0x%08X", SWIZZLE_4_BYTE(pQpmrHdr->quadScomLength) );
908911
FAPI_DBG("==============================QPMR Ends==============================");
909912

910913
FAPI_DBG("===========================SGPE Image Hdr=============================");
@@ -1050,9 +1053,8 @@ extern "C"
10501053
o_qpmrHdr.bootLoaderLength = SWIZZLE_4_BYTE(o_qpmrHdr.bootLoaderLength);
10511054
o_qpmrHdr.sgpeImgOffset = SWIZZLE_4_BYTE(o_qpmrHdr.sgpeImgOffset);
10521055

1053-
1054-
//FIXME Need to confirm it
1055-
o_qpmrHdr.quadScomOffset = SWIZZLE_4_BYTE(QUAD_SCOM_RESTORE_QPMR_OFFSET);
1056+
o_qpmrHdr.quadScomOffset = SWIZZLE_4_BYTE(QUAD_SCOM_RESTORE_QPMR_OFFSET);
1057+
o_qpmrHdr.quadScomLength = SWIZZLE_4_BYTE(QUAD_SCOM_RESTORE_SIZE_TOTAL);
10561058

10571059
sgpeHeader_t* pImgHdr = (sgpeHeader_t*)& i_pChipHomer->qpmrRegion.sgpeRegion.sgpeSramImage[SGPE_INT_VECTOR_SIZE];
10581060
pImgHdr->g_sgpe_ivpr_address = OCC_SRAM_SGPE_BASE_ADDR;

0 commit comments

Comments
 (0)