diff options
41 files changed, 74 insertions, 71 deletions
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_dmi_actions.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_actions.rule index ee4735b38..3974391ce 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_dmi_actions.rule +++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_actions.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_dmi_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_actions.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_dmi_regs.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_regs.rule index 00ad32124..6b3514104 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_dmi_regs.rule +++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_regs.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_dmi_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_regs.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mc_actions.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_actions.rule index 78327eb55..2472a3956 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mc_actions.rule +++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_actions.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_mc_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_actions.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2017 +# Contributors Listed Below - COPYRIGHT 2017,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mc_regs.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_regs.rule index 9deb647ca..50a0170c2 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mc_regs.rule +++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_regs.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_mc_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/cumulus/cumulus_mc_regs.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mi_regs.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mi_regs.rule index 4dfc9b318..dac1ddf59 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mi_regs.rule +++ b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mi_regs.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_mi_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/cumulus/cumulus_mi_regs.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mca_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule index fc37c4809..75dd81b9e 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mca_actions.rule +++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_mca_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mca_regs.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_regs.rule index 3db7276f4..0c2e52c8e 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mca_regs.rule +++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_regs.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_mca_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_regs.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mcbist_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_actions.rule index 2225061e4..9c4739010 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mcbist_actions.rule +++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_actions.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_mcbist_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_actions.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2017 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mcbist_regs.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_regs.rule index e55dbfeda..52342eb09 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mcbist_regs.rule +++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_regs.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_mcbist_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mcbist_regs.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2017 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mcs_regs.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs_regs.rule index 61b7ad105..59a217ba0 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mcs_regs.rule +++ b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs_regs.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_mcs_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs_regs.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_capp.rule b/src/usr/diag/prdf/common/plat/p9/p9_capp.rule index 456bb556a..55ca5bd8f 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_capp.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_capp.rule @@ -80,7 +80,7 @@ chip p9_capp }; # Include registers not defined by the xml -.include "p9_capp_regs.rule"; +.include "p9_common_capp_regs.rule"; }; @@ -409,5 +409,5 @@ group gCXAFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_capp_actions.rule"; +.include "p9_common_capp_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_capp_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_capp_regs.rule index bd0a74808..5a15b536d 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_capp_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_capp_regs.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_capp_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_capp_regs.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2017 +# Contributors Listed Below - COPYRIGHT 2017,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ec_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_ec_actions.rule index dc58acaf1..a508f01ba 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_ec_actions.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_ec_actions.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_ec_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_ec_actions.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ec_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_ec_regs.rule index 4a85056dc..df47f4a4d 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_ec_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_ec_regs.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_ec_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_ec_regs.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2017 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_eq_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_eq_regs.rule index 3e9d49fee..d56493964 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_eq_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_eq_regs.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_eq_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_eq_regs.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2017 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_ex_actions.rule index 27804afcc..78d8f73a7 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_ex_actions.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_ex_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_ex_actions.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ex_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_ex_regs.rule index 1c90a58ff..f661254fd 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_ex_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_ex_regs.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_ex_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_ex_regs.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_obus_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_obus_actions.rule index ad24b3a40..7f2cc1567 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_obus_actions.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_obus_actions.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_obus_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_obus_actions.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_obus_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_obus_regs.rule index a61e8f247..3559662af 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_obus_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_obus_regs.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_obus_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_obus_regs.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_pec_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_pec_regs.rule index 29093f11f..0b947f59e 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_pec_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_pec_regs.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_pec_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_pec_regs.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2017 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_phb_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_phb_regs.rule index c5c04d5c2..f779b3d19 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_phb_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_phb_regs.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_phb_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_phb_regs.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2017 +# Contributors Listed Below - COPYRIGHT 2017,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_proc_common_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule index 6e87a336c..058e2f7e2 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_proc_common_actions.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_proc_common_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_proc_actions.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_proc_common_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_proc_regs.rule index 8d9182d0a..c58f30615 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_proc_common_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_proc_regs.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_proc_common_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_proc_regs.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_xbus_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_xbus_actions.rule index c37f380fc..8e77173e6 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_xbus_actions.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_xbus_actions.rule @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_xbus_actions.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_xbus_actions.rule $ # # OpenPOWER HostBoot Project # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_xbus_regs.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_xbus_regs.rule index db314a777..af42ba39a 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_xbus_regs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_common_xbus_regs.rule @@ -1,11 +1,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/diag/prdf/common/plat/p9/p9_xbus_regs.rule $ +# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_xbus_regs.rule $ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2017 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # diff --git a/src/usr/diag/prdf/common/plat/p9/p9_cumulus.rule b/src/usr/diag/prdf/common/plat/p9/p9_cumulus.rule index 260a1fd15..e7f04ba09 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_cumulus.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_cumulus.rule @@ -1520,7 +1520,7 @@ chip p9_cumulus }; # Include registers common to all P9 proc chips, not defined by the XML -.include "p9_proc_common_regs.rule"; +.include "p9_common_proc_regs.rule"; }; @@ -7899,8 +7899,7 @@ group gPCI2_CHIPLET_FIR filter singlebit # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_proc_common_actions.rule"; -.include "p9_cumulus_actions.rule"; +.include "p9_common_proc_actions.rule"; actionclass analyzeConnectedEQ0 { analyze(connected(TYPE_EQ, 0)); }; actionclass analyzeConnectedEQ1 { analyze(connected(TYPE_EQ, 1)); }; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_dmi.rule b/src/usr/diag/prdf/common/plat/p9/p9_dmi.rule index 7961f2110..7c35a70e9 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_dmi.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_dmi.rule @@ -84,7 +84,7 @@ chip p9_dmi }; # Include registers not defined by the xml -.include "p9_dmi_regs.rule"; +.include "cumulus_dmi_regs.rule"; }; @@ -424,5 +424,5 @@ group gCHIFIR filter priority( 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_dmi_actions.rule"; +.include "cumulus_dmi_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ec.rule b/src/usr/diag/prdf/common/plat/p9/p9_ec.rule index d904d988c..bda7915aa 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_ec.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_ec.rule @@ -164,7 +164,7 @@ chip p9_ec }; # Include registers not defined by the xml -.include "p9_ec_regs.rule"; +.include "p9_common_ec_regs.rule"; }; @@ -642,5 +642,5 @@ group gCOREFIR filter priority(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19 # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_ec_actions.rule"; +.include "p9_common_ec_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_eq.rule b/src/usr/diag/prdf/common/plat/p9/p9_eq.rule index 7cbf388df..073ef8a51 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_eq.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_eq.rule @@ -105,7 +105,7 @@ chip p9_eq }; # Include registers not defined by the xml -.include "p9_eq_regs.rule"; +.include "p9_common_eq_regs.rule"; }; @@ -361,7 +361,7 @@ group gEQ_LFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_eq_actions.rule"; +.include "p9_common_eq_actions.rule"; actionclass analyzeConnectedEX0 { analyze(connected(TYPE_EX, 0)); }; actionclass analyzeConnectedEX1 { analyze(connected(TYPE_EX, 1)); }; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule b/src/usr/diag/prdf/common/plat/p9/p9_ex.rule index 9d5ecdbba..9c349cd70 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_ex.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_ex.rule @@ -190,7 +190,7 @@ chip p9_ex }; # Include registers not defined by the xml -.include "p9_ex_regs.rule"; +.include "p9_common_ex_regs.rule"; }; @@ -891,5 +891,5 @@ group gCMEFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_ex_actions.rule"; +.include "p9_common_ex_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mc.rule b/src/usr/diag/prdf/common/plat/p9/p9_mc.rule index 8727bdc53..e9b7bc32d 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mc.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_mc.rule @@ -251,7 +251,7 @@ chip p9_mc }; # Include registers not defined by the xml -.include "p9_mc_regs.rule"; +.include "cumulus_mc_regs.rule"; }; @@ -842,7 +842,7 @@ group gMCBISTFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_mc_actions.rule"; +.include "cumulus_mc_actions.rule"; actionclass analyzeConnectedDMI0 { analyze(connected(TYPE_DMI, 0)); }; actionclass analyzeConnectedDMI1 { analyze(connected(TYPE_DMI, 1)); }; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mca.rule b/src/usr/diag/prdf/common/plat/p9/p9_mca.rule index dfd1568d2..6b0800390 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mca.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_mca.rule @@ -168,7 +168,7 @@ chip p9_mca }; # Include registers not defined by the xml -.include "p9_mca_regs.rule"; +.include "nimbus_mca_regs.rule"; }; @@ -702,5 +702,5 @@ group gDDRPHYFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_mca_actions.rule"; +.include "nimbus_mca_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mcbist.rule b/src/usr/diag/prdf/common/plat/p9/p9_mcbist.rule index 9a24a60b8..7c8ff27b1 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mcbist.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_mcbist.rule @@ -180,7 +180,7 @@ chip p9_mcbist }; # Include registers not defined by the xml -.include "p9_mcbist_regs.rule"; +.include "nimbus_mcbist_regs.rule"; }; @@ -639,7 +639,7 @@ group gMCBISTFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_mcbist_actions.rule"; +.include "nimbus_mcbist_actions.rule"; actionclass analyzeConnectedMCA0 { analyze(connected(TYPE_MCA, 0)); }; actionclass analyzeConnectedMCA1 { analyze(connected(TYPE_MCA, 1)); }; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mcs.rule b/src/usr/diag/prdf/common/plat/p9/p9_mcs.rule index a24defe12..930f770d1 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mcs.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_mcs.rule @@ -84,7 +84,7 @@ chip p9_mcs }; # Include registers not defined by the xml -.include "p9_mcs_regs.rule"; +.include "nimbus_mcs_regs.rule"; }; @@ -263,5 +263,5 @@ group gMCFIR filter singlebit, cs_root_cause( 0, 6, 8, 9 ) # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_mcs_actions.rule"; +.include "nimbus_mcs_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_mi.rule b/src/usr/diag/prdf/common/plat/p9/p9_mi.rule index 7c2b8fb0e..55b73f61e 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_mi.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_mi.rule @@ -80,7 +80,7 @@ chip p9_mi }; # Include registers not defined by the xml -.include "p9_mi_regs.rule"; +.include "cumulus_mi_regs.rule"; }; @@ -259,5 +259,5 @@ group gMCFIR filter singlebit, cs_root_cause( 0, 8 ) # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_mi_actions.rule"; +.include "cumulus_mi_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule b/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule index 05fda7b6f..6592e2842 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_nimbus.rule @@ -1520,7 +1520,7 @@ chip p9_nimbus }; # Include registers common to all P9 proc chips, not defined by the XML -.include "p9_proc_common_regs.rule"; +.include "p9_common_proc_regs.rule"; }; @@ -7858,7 +7858,7 @@ group gPCI2_CHIPLET_FIR filter singlebit # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_proc_common_actions.rule"; +.include "p9_common_proc_actions.rule"; actionclass analyzeConnectedEQ0 { analyze(connected(TYPE_EQ, 0)); }; actionclass analyzeConnectedEQ1 { analyze(connected(TYPE_EQ, 1)); }; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_obus.rule b/src/usr/diag/prdf/common/plat/p9/p9_obus.rule index 027ae99c1..5e62a4216 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_obus.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_obus.rule @@ -340,7 +340,7 @@ chip p9_obus }; # Include registers not defined by the xml -.include "p9_obus_regs.rule"; +.include "p9_common_obus_regs.rule"; }; @@ -977,5 +977,5 @@ group gOBPPEFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_obus_actions.rule"; +.include "p9_common_obus_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_pec.rule b/src/usr/diag/prdf/common/plat/p9/p9_pec.rule index ab2c4c845..e3ede37d5 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_pec.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_pec.rule @@ -116,7 +116,7 @@ chip p9_pec }; # Include registers not defined by the xml -.include "p9_pec_regs.rule"; +.include "p9_common_pec_regs.rule"; }; @@ -464,5 +464,5 @@ group gIOPCIFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_pec_actions.rule"; +.include "p9_common_pec_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_phb.rule b/src/usr/diag/prdf/common/plat/p9/p9_phb.rule index dfefee072..271265c98 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_phb.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_phb.rule @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2017 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # @@ -152,7 +152,7 @@ chip p9_phb }; # Include registers not defined by the xml -.include "p9_phb_regs.rule"; +.include "p9_common_phb_regs.rule"; }; @@ -754,5 +754,5 @@ group gETUFIR filter singlebit, cs_root_cause # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_phb_actions.rule"; +.include "p9_common_phb_actions.rule"; diff --git a/src/usr/diag/prdf/common/plat/p9/p9_xbus.rule b/src/usr/diag/prdf/common/plat/p9/p9_xbus.rule index 750a74824..ea8bc69be 100644 --- a/src/usr/diag/prdf/common/plat/p9/p9_xbus.rule +++ b/src/usr/diag/prdf/common/plat/p9/p9_xbus.rule @@ -119,7 +119,7 @@ chip p9_xbus }; # Include registers not defined by the xml -.include "p9_xbus_regs.rule"; +.include "p9_common_xbus_regs.rule"; }; @@ -585,5 +585,5 @@ group gIOELFIR filter singlebit, cs_root_cause( 54, 55, 56, 57, 58, 59 ) # Include the common action set. .include "p9_common_actions.rule"; # Include the chip-specific action set. -.include "p9_xbus_actions.rule"; +.include "p9_common_xbus_actions.rule"; diff --git a/src/usr/diag/prdf/rule/makefile b/src/usr/diag/prdf/rule/makefile index 102e82c2c..5c30f1910 100755 --- a/src/usr/diag/prdf/rule/makefile +++ b/src/usr/diag/prdf/rule/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2017 +# Contributors Listed Below - COPYRIGHT 2016,2018 # [+] International Business Machines Corp. # # @@ -207,11 +207,15 @@ ${PRDR_CMP_PATH}: ${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_FLEX_o_PATH} \ vpath %.rule \ ../common/plat/p9 \ ../common/plat/cen \ - ../common/plat/mem + ../common/plat/cumulus \ + ../common/plat/mem \ + ../common/plat/nimbus PRDRPP_SEARCHDIRS = -I../common/plat/p9 \ -I../common/plat/cen \ - -I../common/plat/mem + -I../common/plat/cumulus \ + -I../common/plat/mem \ + -I../common/plat/nimbus ${OBJ_RULE_DIR}/%.prf \ ${OBJ_RULE_DIR}/%.prf.err.C \ |
