Skip to content

Commit 12a64eb

Browse files
Alex Taftdcrowell77
authored andcommitted
L3 Initfile: Qualify divide_minor setting
L3_REF_TIMER_DIVIDE_MINOR needs to be left at default value of Divide by 10 for DD1.X, DD2.0 due to bug Change-Id: I9bfbf243ecf854c2375e852f60d0bcb47812fe87 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41893 Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Reviewed-by: LUKE MURRAY <murrayl@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com> Reviewed-by: Matt K. Light <mklight@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41900 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
1 parent 0f213e5 commit 12a64eb

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3608,15 +3608,17 @@ fapi_try_exit:
36083608
/**
36093609
* @brief populate L3 Refresh Timer Control register
36103610
* @param i_pChipHomer points to start of P9 HOMER.
3611+
* @param i_procTgt fapi2 target for p9 chip.
36113612
* @return fapi2 return code.
36123613
*/
3613-
fapi2::ReturnCode populateL3RefreshScomReg( void* i_pChipHomer )
3614+
fapi2::ReturnCode populateL3RefreshScomReg( void* i_pChipHomer, CONST_FAPI2_PROC& i_procTgt)
36143615
{
36153616
FAPI_DBG("> populateL3RefreshScomReg");
36163617

36173618
do
36183619
{
36193620
uint32_t l_nest_freq_mhz = 0;
3621+
uint8_t l_chip_ec_feature_hw408892 = 0;
36203622
uint32_t scomAddr = 0;
36213623
uint32_t rc = IMG_BUILD_SUCCESS;
36223624
uint64_t l_refreshScomVal ;
@@ -3634,8 +3636,14 @@ fapi2::ReturnCode populateL3RefreshScomReg( void* i_pChipHomer )
36343636
l_nest_freq_mhz),
36353637
"Error from FAPI_ATTR_GET for attribute ATTR_FREQ_PB_MHZ");
36363638

3639+
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW408892,
3640+
i_procTgt,
3641+
l_chip_ec_feature_hw408892),
3642+
"Error from FAPI_ATTR_GET for attribute ATTR_CHIP_EC_FEATURE_HW408892");
3643+
3644+
36373645
// above 2GHz, set DIVIDE_MINOR = DIV_BY_12 = 0x2
3638-
if (l_nest_freq_mhz >= 2000)
3646+
if ((l_nest_freq_mhz >= 2000) && (l_chip_ec_feature_hw408892 == 0))
36393647
{
36403648
refreshValBuf.insertFromRight<EX_DRAM_REF_REG_L3_TIMER_DIVIDE_MINOR,
36413649
EX_DRAM_REF_REG_L3_TIMER_DIVIDE_MINOR_LEN>(0x2);
@@ -4025,7 +4033,7 @@ fapi2::ReturnCode p9_hcode_image_build( CONST_FAPI2_PROC& i_procTgt,
40254033
"populateEpsilonL3ScomReg failed" );
40264034

40274035
//Update L3 Refresh Timer Control SCOM Registers
4028-
FAPI_TRY( populateL3RefreshScomReg( pChipHomer ),
4036+
FAPI_TRY( populateL3RefreshScomReg( pChipHomer, i_procTgt),
40294037
"populateL3RefreshScomReg failed" );
40304038

40314039
//populate HOMER with SCOM restore value of NCU RNG BAR SCOM Register

src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,6 +1951,23 @@
19511951
</chipEcFeature>
19521952
</attribute>
19531953
<!-- ******************************************************************** -->
1954+
<attribute>
1955+
<id>ATTR_CHIP_EC_FEATURE_HW408892</id>
1956+
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
1957+
<description>
1958+
Nimbus DD1.X, DD2.0: Leave at deafult value of DIV_BY_10
1959+
</description>
1960+
<chipEcFeature>
1961+
<chip>
1962+
<name>ENUM_ATTR_NAME_NIMBUS</name>
1963+
<ec>
1964+
<value>0x20</value>
1965+
<test>LESS_THAN_OR_EQUAL</test>
1966+
</ec>
1967+
</chip>
1968+
</chipEcFeature>
1969+
</attribute>
1970+
<!-- ******************************************************************** -->
19541971
<attribute>
19551972
<id>ATTR_CHIP_EC_FEATURE_HW405880_LCO_IN_RETENTION</id>
19561973
<targetType>TARGET_TYPE_PROC_CHIP</targetType>

0 commit comments

Comments
 (0)