Skip to content

Commit

Permalink
SCOM Restore: Increased max eq scom restores entries supported to 255.
Browse files Browse the repository at this point in the history
Commit increases max eq scom restore entries supported from 63
to 255. It updates a field in QPMR header which is read by STOP API
and SGPE Hcode. This enables a flexible way to change SCOM
restore entries.

Key_Cronus_Test=PM_REGRESS

HW-Image-Prereq: Ie13a5110384e4161615167b238aecd4e2e0b9902
Change-Id: I036691f2fa152b1f0597e133b37b1795837d6e45
CQ: SW435708
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62222
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62242
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
premsjha authored and dcrowell77 committed Aug 20, 2018
1 parent 9a96890 commit a30c34a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 2 additions & 3 deletions src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ HCD_CONST64(PPMR_MAGIC_NUMBER, ULL(0x50504d525f312e30)) // PPM
HCD_CONST64(PGPE_MAGIC_NUMBER, ULL(0x504750455F312E30)) // PGPE_1.0

HCD_CONST(CME_BUILD_VERSION, 0x001) // CME__1.0
HCD_CONST(SGPE_BUILD_VERSION, 0x002) // SGPE_1.0
HCD_CONST(SGPE_BUILD_VERSION, 0x003) // SGPE_3.0
HCD_CONST(PGPE_BUILD_VERSION, 0x001) // PGPE_1.0

HCD_CONST64(CPMR_MAGIC_NUMBER_BASE, ULL(0x43504d525f302e30)) // CPMR_0.0
Expand Down Expand Up @@ -284,8 +284,7 @@ HCD_CONST(MAX_L3_SCOM_ENTRIES, 16)
// Reserve 06

HCD_CONST(MAX_EQ_SCOM_ENTRIES, 31)
HCD_CONST(QUAD_SCOM_RESTORE_REGS_PER_QUAD,
(MAX_EQ_SCOM_ENTRIES + MAX_L2_SCOM_ENTRIES + MAX_L3_SCOM_ENTRIES + 1))
HCD_CONST(QUAD_SCOM_RESTORE_REGS_PER_QUAD, 256)

HCD_CONST(QUAD_SCOM_RESTORE_SIZE_PER_QUAD,
(SCOM_RESTORE_ENTRY_SIZE* QUAD_SCOM_RESTORE_REGS_PER_QUAD))
Expand Down
5 changes: 4 additions & 1 deletion src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ enum
L2_EPS_DIVIDER = 1,
MAX_HOMER_HEADER = 6,
MAX_PM_REGION_HEADER = 3,
MAX_EQ_SCOM_RESTORES = 255,
SGPE_IMGAE_VERSION = 0x003, //Keeping in HWP to avoid hcode-HWP coreq
};

/**
Expand Down Expand Up @@ -1314,7 +1316,8 @@ void updateQpmrHeader( Homerlayout_t* i_pChipHomer, QpmrHeaderLayout_t& io_qpmrH
SWIZZLE_4_BYTE(io_qpmrHdr.quadCommonRingLength) +
SWIZZLE_4_BYTE(io_qpmrHdr.quadSpecRingLength);

io_qpmrHdr.maxQuadScomRestoreEntry = SWIZZLE_4_BYTE(QUAD_SCOM_RESTORE_REGS_PER_QUAD - 1);
io_qpmrHdr.maxQuadScomRestoreEntry = SWIZZLE_4_BYTE(MAX_EQ_SCOM_RESTORES); //Keeping it all in HWP to avoid hcode-HWP coreq
io_qpmrHdr.buildVersion = SWIZZLE_4_BYTE(SGPE_IMGAE_VERSION);

io_qpmrHdr.sgpeSramImageSize = SWIZZLE_4_BYTE(io_qpmrHdr.sgpeSramImageSize);
memcpy( pQpmrHdr, &io_qpmrHdr, sizeof( QpmrHeaderLayout_t ) );
Expand Down

0 comments on commit a30c34a

Please sign in to comment.