diff options
| author | Yue Du <daviddu@us.ibm.com> | 2017-05-15 22:29:05 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-22 23:44:05 -0400 |
| commit | 6f774f08a1ed6b45291d83121c81c6d58a92ad5d (patch) | |
| tree | 08fe78a1ebc40a04af17f45622c34318fa0785ec /src/import | |
| parent | 379ea5569b14ed21bae944007ea8602a8d67ba07 (diff) | |
| download | talos-hostboot-6f774f08a1ed6b45291d83121c81c6d58a92ad5d.tar.gz talos-hostboot-6f774f08a1ed6b45291d83121c81c6d58a92ad5d.zip | |
STOP: Port recent L2/L3/Ncu Initfile changes to scominits in stop
Change-Id: Ie6069a57ba9899afa5a786fd1cd8c821c7a2d625
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40526
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael S. Floyd <mfloyd@us.ibm.com>
Reviewed-by: Juan R. Medina <jrmedina@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40527
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C index bca8849c6..ddefc23e4 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C @@ -130,6 +130,8 @@ enum EQ_INEX_BUCKET_2 = 1, EQ_INEX_BUCKET_3 = 2, EQ_INEX_BUCKET_4 = 3, + L3_EPS_DIVIDER = 1, + L2_EPS_DIVIDER = 1, }; /** @@ -3243,7 +3245,7 @@ fapi2::ReturnCode populateEpsilonL2ScomReg( void* i_pChipHomer ) attrValT0 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_READ_CYCLES_T0"); - attrValT0 = attrValT0 / 8 + 1; + attrValT0 = attrValT0 / 8 / L2_EPS_DIVIDER + 1; epsilonValBuf.insert<0, 12, 20, uint32_t>( attrValT0 ); //----------------------------- Tier1(T1)-------------------------------------- @@ -3253,7 +3255,7 @@ fapi2::ReturnCode populateEpsilonL2ScomReg( void* i_pChipHomer ) attrValT1 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_READ_CYCLES_T1"); - attrValT1 = attrValT1 / 8 + 1; + attrValT1 = attrValT1 / 8 / L2_EPS_DIVIDER + 1; epsilonValBuf.insert<12, 12, 20, uint32_t>( attrValT1 ); //----------------------------- Tier2(T2)-------------------------------------- @@ -3264,7 +3266,7 @@ fapi2::ReturnCode populateEpsilonL2ScomReg( void* i_pChipHomer ) "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_READ_CYCLES_T2"); - attrValT2 = attrValT2 / 8 + 1; + attrValT2 = attrValT2 / 8 / L2_EPS_DIVIDER + 1; epsilonValBuf.insert<24, 12, 20, uint32_t>( attrValT2 ); epsilonValBuf.extract<0, 64>(l_epsilonScomVal); @@ -3314,7 +3316,7 @@ fapi2::ReturnCode populateEpsilonL2ScomReg( void* i_pChipHomer ) attrValT1 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_WRITE_CYCLES_T1"); - attrValT1 = attrValT1 / 8 + 1; + attrValT1 = attrValT1 / 8 / L2_EPS_DIVIDER + 1; epsilonValBuf.insert< 0, 12, 20, uint32_t >(attrValT1); //----------------------------- Tier2(T2)-------------------------------------- @@ -3324,15 +3326,15 @@ fapi2::ReturnCode populateEpsilonL2ScomReg( void* i_pChipHomer ) attrValT2 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_WRITE_CYCLES_T2"); - attrValT2 = attrValT2 / 8 + 1; + attrValT2 = attrValT2 / 8 / L2_EPS_DIVIDER + 1; epsilonValBuf.insert< 12, 12, 20, uint32_t >(attrValT2); // p9.l2.scom.inifile: - // EPS_DIVIDER_MODE = 0001 + // EPS_DIVIDER_MODE = L2_EPS_DIVIDER // EPS_MODE_SEL = 0 // EPS_CNT_USE_L2_DIVIDER_EN = 0 // L2_EPS_STEP_MODE = 0000 - epsilonValBuf.setBit<27>(); + epsilonValBuf.insert<24, 4, 28, uint32_t>(L2_EPS_DIVIDER); epsilonValBuf.extract<0, 64>(l_epsilonScomVal); @@ -3422,7 +3424,7 @@ fapi2::ReturnCode populateEpsilonL3ScomReg( void* i_pChipHomer ) attrValT0 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_READ_CYCLES_T0"); - attrValT0 = attrValT0 / 8 + 1; + attrValT0 = attrValT0 / 8 / L3_EPS_DIVIDER + 1; epsilonValBuf.insert<0, 12, 20, uint32_t>( attrValT0 ); //----------------------------- Tier1(T1)-------------------------------------- @@ -3432,7 +3434,7 @@ fapi2::ReturnCode populateEpsilonL3ScomReg( void* i_pChipHomer ) attrValT1 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_READ_CYCLES_T1"); - attrValT1 = attrValT1 / 8 + 1; + attrValT1 = attrValT1 / 8 / L3_EPS_DIVIDER + 1; epsilonValBuf.insert<12, 12, 20, uint32_t>( attrValT1 ); //----------------------------- Tier2(T2)-------------------------------------- @@ -3442,7 +3444,7 @@ fapi2::ReturnCode populateEpsilonL3ScomReg( void* i_pChipHomer ) attrValT2 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_READ_CYCLES_T2"); - attrValT2 = attrValT2 / 8 + 1; + attrValT2 = attrValT2 / 8 / L3_EPS_DIVIDER + 1; epsilonValBuf.insert<24, 12, 20, uint32_t>( attrValT2 ); epsilonValBuf.extract<0, 64>(l_epsilonScomVal); @@ -3499,7 +3501,7 @@ fapi2::ReturnCode populateEpsilonL3ScomReg( void* i_pChipHomer ) attrValT1 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_WRITE_CYCLES_T1"); - attrValT1 = attrValT1 / 8 + 1; + attrValT1 = attrValT1 / 8 / L3_EPS_DIVIDER + 1; epsilonValBuf.insert< 0, 12, 20, uint32_t >(attrValT1); //----------------------------- Tier2(T2)-------------------------------------- @@ -3509,14 +3511,14 @@ fapi2::ReturnCode populateEpsilonL3ScomReg( void* i_pChipHomer ) attrValT2 ), "Error from FAPI_ATTR_GET for attribute ATTR_PROC_EPS_WRITE_CYCLES_T2"); - attrValT2 = attrValT2 / 8 + 1; + attrValT2 = attrValT2 / 8 / L3_EPS_DIVIDER + 1; epsilonValBuf.insert< 12, 12, 20, uint32_t >(attrValT2); // p9.l3.scom.initfile: // L3_EPS_STEP_MODE = 0000 - // L3_EPS_DIVIDER_MODE = 0001 + // L3_EPS_DIVIDER_MODE = L3_EPS_DIVIDER // EPS_CNT_USE_L3_DIVIDER_EN = 0 - epsilonValBuf.setBit<33>(); + epsilonValBuf.insert<30, 4, 28, uint32_t>(L3_EPS_DIVIDER); epsilonValBuf.extract<0, 64>(l_epsilonScomVal); |
