diff options
| author | Luke Murray <murrayl@us.ibm.com> | 2017-02-21 14:51:26 -0600 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2017-04-06 22:34:40 -0400 |
| commit | 710c595a1b73389106746844039e3b7d603fa91b (patch) | |
| tree | 3f261d795225f4a784e9a67a20a9712ccfe94a39 /src | |
| parent | 262344ebf732b90bbec43d215e1b08cecf479f21 (diff) | |
| download | talos-sbe-710c595a1b73389106746844039e3b7d603fa91b.tar.gz talos-sbe-710c595a1b73389106746844039e3b7d603fa91b.zip | |
Updating cache epsilon initfile equation
The epsilon attribute value is the number of cycles the caches
needs to wait, but this isn't one-to-one for what needs to be in
the cache dials. Needed to update the equation in the initfile.
Change-Id: Ia5809018a7dfb22e27ae4775bc5146d2a2381ce7
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36814
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: ALEXANDER M. TAFT <amtaft@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36816
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C | 54 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C | 54 |
2 files changed, 14 insertions, 94 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C index cdae772a..c868548f 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C @@ -31,8 +31,8 @@ using namespace fapi2; constexpr uint64_t literal_0b0001 = 0b0001; constexpr uint64_t literal_0b0100 = 0b0100; -constexpr uint64_t literal_0 = 0; -constexpr uint64_t literal_0x001 = 0x001; +constexpr uint64_t literal_1 = 1; +constexpr uint64_t literal_8 = 8; constexpr uint64_t literal_0b0000 = 0b0000; fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0, @@ -95,56 +95,16 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0, { FAPI_TRY(fapi2::getScom( TGT0, 0x10010810ull, l_scom_buffer )); - if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 != literal_0)) - { - l_scom_buffer.insert<0, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 == literal_0)) - { - l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x001 ); - } - - if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 != literal_0)) - { - l_scom_buffer.insert<12, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 == literal_0)) - { - l_scom_buffer.insert<12, 12, 52, uint64_t>(literal_0x001 ); - } - - if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 != literal_0)) - { - l_scom_buffer.insert<24, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 == literal_0)) - { - l_scom_buffer.insert<24, 12, 52, uint64_t>(literal_0x001 ); - } - + l_scom_buffer.insert<0, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 / literal_8) + literal_1) ); + l_scom_buffer.insert<12, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 / literal_8) + literal_1) ); + l_scom_buffer.insert<24, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 / literal_8) + literal_1) ); FAPI_TRY(fapi2::putScom(TGT0, 0x10010810ull, l_scom_buffer)); } { FAPI_TRY(fapi2::getScom( TGT0, 0x10010811ull, l_scom_buffer )); - if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 != literal_0)) - { - l_scom_buffer.insert<0, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 == literal_0)) - { - l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x001 ); - } - - if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 != literal_0)) - { - l_scom_buffer.insert<12, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 == literal_0)) - { - l_scom_buffer.insert<12, 12, 52, uint64_t>(literal_0x001 ); - } - + l_scom_buffer.insert<0, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 / literal_8) + literal_1) ); + l_scom_buffer.insert<12, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 / literal_8) + literal_1) ); constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF = 0x0; l_scom_buffer.insert<29, 1, 63, uint64_t>(l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF ); l_scom_buffer.insert<30, 4, 60, uint64_t>(literal_0b0000 ); diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C index 8267ab4c..486e6b75 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C @@ -29,8 +29,8 @@ using namespace fapi2; -constexpr uint64_t literal_0 = 0; -constexpr uint64_t literal_0x001 = 0x001; +constexpr uint64_t literal_1 = 1; +constexpr uint64_t literal_8 = 8; constexpr uint64_t literal_0b0 = 0b0; constexpr uint64_t literal_0b0000 = 0b0000; constexpr uint64_t literal_0b0001 = 0b0001; @@ -56,56 +56,16 @@ fapi2::ReturnCode p9_l3_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0, { FAPI_TRY(fapi2::getScom( TGT0, 0x10011829ull, l_scom_buffer )); - if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 != literal_0)) - { - l_scom_buffer.insert<0, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 == literal_0)) - { - l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x001 ); - } - - if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 != literal_0)) - { - l_scom_buffer.insert<12, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 == literal_0)) - { - l_scom_buffer.insert<12, 12, 52, uint64_t>(literal_0x001 ); - } - - if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 != literal_0)) - { - l_scom_buffer.insert<24, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 == literal_0)) - { - l_scom_buffer.insert<24, 12, 52, uint64_t>(literal_0x001 ); - } - + l_scom_buffer.insert<0, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T0 / literal_8) + literal_1) ); + l_scom_buffer.insert<12, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T1 / literal_8) + literal_1) ); + l_scom_buffer.insert<24, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_READ_CYCLES_T2 / literal_8) + literal_1) ); FAPI_TRY(fapi2::putScom(TGT0, 0x10011829ull, l_scom_buffer)); } { FAPI_TRY(fapi2::getScom( TGT0, 0x1001182aull, l_scom_buffer )); - if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 != literal_0)) - { - l_scom_buffer.insert<0, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 == literal_0)) - { - l_scom_buffer.insert<0, 12, 52, uint64_t>(literal_0x001 ); - } - - if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 != literal_0)) - { - l_scom_buffer.insert<12, 12, 52, uint64_t>(l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 ); - } - else if ((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 == literal_0)) - { - l_scom_buffer.insert<12, 12, 52, uint64_t>(literal_0x001 ); - } - + l_scom_buffer.insert<0, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T1 / literal_8) + literal_1) ); + l_scom_buffer.insert<12, 12, 52, uint64_t>(((l_TGT1_ATTR_PROC_EPS_WRITE_CYCLES_T2 / literal_8) + literal_1) ); l_scom_buffer.insert<34, 1, 63, uint64_t>(literal_0b0 ); l_scom_buffer.insert<26, 4, 60, uint64_t>(literal_0b0000 ); l_scom_buffer.insert<30, 4, 60, uint64_t>(literal_0b0001 ); |
