temp fix for boston mem 2400 nest 1600 issue HW411339

Change-Id: Ibe4569256ddae75b9250c5389e6ea90b753dc972
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40718
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: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40720
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 30 insertions, 4 deletions

diff --git a/src/import/chips/p9/initfiles/p9.mca.scom.initfile b/src/import/chips/p9/initfiles/p9.mca.scom.initfile
index cfbf17e55..99cf91bf7 100644
--- a/src/import/chips/p9/initfiles/p9.mca.scom.initfile
+++ b/src/import/chips/p9/initfiles/p9.mca.scom.initfile
@@ -769,21 +769,33 @@ define def_perf_tune_case = (MCBIST.ATTR_MSS_FREQ==2400) && (SYS.ATTR_FREQ_PB_MH
 # "L" field
 ispy MCP.PORT0.ECC64.SCOM.MBSECCQ_VAL_TO_DATA_DELAY [when=S && ATTR_CHIP_EC_FEATURE_P9N_DD1_SPY_NAMES] {
   spyv, expr;
-  3,      (def_perf_tune_case==0); # untuned
+  # OLD - keeping here because this Boston 2400/1600 fix is likely temporary (HW411339)
+  #3,      (def_perf_tune_case==0); # untuned
+  #5,      (def_perf_tune_case==1); # tuned
+  3,      (def_perf_tune_case==0) && (def_mn_freq_ratio<=1350); # untuned and NOT boston 2400/1600 temp fix
+  6,      (def_perf_tune_case==0) && (def_mn_freq_ratio>1350);  # untuned and     boston 2400/1600 temp fix
   5,      (def_perf_tune_case==1); # tuned
 }
 
 # "D" field
 ispy MCP.PORT0.ECC64.SCOM.MBSECCQ_NEST_VAL_TO_DATA_DELAY [when=S && ATTR_CHIP_EC_FEATURE_P9N_DD1_SPY_NAMES] {
   spyv, expr;
-  0,      (def_perf_tune_case==0); # untuned
+  # OLD - keeping here because this Boston 2400/1600 fix is likely temporary (HW411339)
+  #0,      (def_perf_tune_case==0); # untuned
+  #1,      (def_perf_tune_case==1); # tuned
+  0,      (def_perf_tune_case==0) && (def_mn_freq_ratio<=1350); # untuned and NOT boston 2400/1600 temp fix
+  2,      (def_perf_tune_case==0) && (def_mn_freq_ratio>1350);  # untuned and     boston 2400/1600 temp fix
   1,      (def_perf_tune_case==1); # tuned
 }
 
 # "dn" field
 espy MCP.PORT0.ECC64.SCOM.MBSECCQ_DELAY_NONBYPASS [when=S && ATTR_CHIP_EC_FEATURE_P9N_DD1_SPY_NAMES] {
-  spyv;
-  OFF; # untuned and tuned same value
+  # OLD - keeping here because this Boston 2400/1600 fix is likely temporary (HW411339)
+  #spyv;
+  #OFF; # untuned and tuned same value
+  spyv, expr;
+  OFF,    (def_mn_freq_ratio<=1350); # NOT boston 2400/1600 temp fix
+  ON,     (def_mn_freq_ratio>1350);  #     boston 2400/1600 temp fix
 }
 
 # "h" field
diff --git a/src/import/chips/p9/initfiles/p9.mcs.scom.initfile b/src/import/chips/p9/initfiles/p9.mcs.scom.initfile
index 965c54d25..fed1a82d5 100644
--- a/src/import/chips/p9/initfiles/p9.mcs.scom.initfile
+++ b/src/import/chips/p9/initfiles/p9.mcs.scom.initfile
@@ -52,6 +52,10 @@ SyntaxVersion = 3
 target_type 0 TARGET_TYPE_MCS;
 target_type 1 TARGET_TYPE_SYSTEM;
 target_type 2 TARGET_TYPE_PROC_CHIP;
+target_type 3 TARGET_TYPE_MCBIST;
+
+define SYS = TGT1; # If referencing Attr from system, add "SYS." in front
+define MCBIST = TGT3; # If referencing Attr from mcbist, add "MCBIST." in front
 
 
 #--******************************************************************************
@@ -115,6 +119,16 @@ ispy MC01.PBI01.SCOMFIR.MCPERF1_PF_DROP_CNT_THRESH [when=S] {
   25,     (ATTR_CHIP_EC_FEATURE_HW398139!=1); # dd2 (performance chosen)
 }
 
+# Temporary Boston Fix HW411339 for 1600 nest 2400 mem frequencies
+
+define def_mn_freq_ratio = (1000 * MCBIST.ATTR_MSS_FREQ) / SYS.ATTR_FREQ_PB_MHZ;
+
+espy MC01.PBI01.SCOMFIR.MCMODE2_FORCE_SFSTAT_ACTIVE [when=S] {
+  spyv, expr;
+  OFF,     (def_mn_freq_ratio<=1350); # 1333 which is 2666/2000 (and lower ratios) will work as normal
+  ON,      (def_mn_freq_ratio>1350);  # 1500 which is 2400/1600 will have sfsat/mdi always 1
+}
+
 ##################
 # DD2 NEW SETTINGS
 ##################