PRD: Fixed XML parser for summary analysis

Change-Id: Ie7c5da306889b0068ae962705333ef99b0a2bdee Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68714 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68822 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
open-power · Nov 16, 2018 · cc7d24e · cc7d24e
1 parent 06c7de4
commit cc7d24e
Show file tree

Hide file tree

Showing 23 changed files with 220 additions and 30 deletions.
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_capp.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_capp.rule
@@ -115,7 +115,7 @@ rule rCAPP
 group gCAPP attntype CHECK_STOP, RECOVERABLE, UNIT_CS
     filter singlebit
 {
-    (rCAPP, bit(0)) ? analyze(gCXAFIR);
+    (rCAPP, bit(0)) ? analyzeCXAFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi.rule
@@ -118,7 +118,7 @@ rule rDMI
 group gDMI attntype CHECK_STOP, RECOVERABLE, UNIT_CS, HOST_ATTN
     filter singlebit
 {
-    (rDMI, bit(0)) ? analyze(gCHIFIR);
+    (rDMI, bit(0)) ? analyzeCHIFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_actions.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_actions.rule
@@ -52,3 +52,10 @@ actionclass dsffChannelTimeout_UERE
     threshold1;
     funccall("dsffChannelTimeoutCheck");
 };
+
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzeCHIFIR { analyze(gCHIFIR); };
+
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_ex.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_ex.rule
@@ -229,10 +229,10 @@ rule rEX
 group gEX attntype CHECK_STOP, RECOVERABLE
     filter singlebit
 {
-    (rEX, bit(0)) ? analyze(gL2FIR);
-    (rEX, bit(1)) ? analyze(gNCUFIR);
-    (rEX, bit(2)) ? analyze(gL3FIR);
-    (rEX, bit(3)) ? analyze(gCMEFIR);
+    (rEX, bit(0)) ? analyzeL2FIR;
+    (rEX, bit(1)) ? analyzeNCUFIR;
+    (rEX, bit(2)) ? analyzeL3FIR;
+    (rEX, bit(3)) ? analyzeCMEFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_mi.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mi.rule
@@ -118,7 +118,7 @@ rule rMI
 group gMI attntype CHECK_STOP, RECOVERABLE, UNIT_CS, HOST_ATTN
     filter singlebit
 {
-    (rMI, bit(0)) ? analyze(gMCFIR);
+    (rMI, bit(0)) ? analyzeMCFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_mi_actions.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_mi_actions.rule
@@ -0,0 +1,31 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/cumulus/cumulus_mi_actions.rule $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzeMCFIR { analyze(gMCFIR); };
+
diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_pec.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_pec.rule
@@ -150,8 +150,8 @@ rule rPEC
 group gPEC attntype CHECK_STOP, RECOVERABLE
     filter singlebit
 {
-    (rPEC, bit(0)) ? analyze(gPCI_LFIR);
-    (rPEC, bit(1)) ? analyze(gIOPCIFIR);
+    (rPEC, bit(0)) ? analyzePCI_LFIR;
+    (rPEC, bit(1)) ? analyzeIOPCIFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_phb.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_phb.rule
@@ -188,9 +188,9 @@ rule rPHB
 group gPHB attntype CHECK_STOP, RECOVERABLE
     filter singlebit
 {
-    (rPHB, bit(0)) ? analyze(gPHBNFIR);
-    (rPHB, bit(1)) ? analyze(gPCIFIR);
-    (rPHB, bit(2)) ? analyze(gETUFIR);
+    (rPHB, bit(0)) ? analyzePHBNFIR;
+    (rPHB, bit(1)) ? analyzePCIFIR;
+    (rPHB, bit(2)) ? analyzeETUFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/cumulus/cumulus_xbus.rule b/src/usr/diag/prdf/common/plat/cumulus/cumulus_xbus.rule
@@ -157,8 +157,8 @@ rule rXBUS
 group gXBUS attntype CHECK_STOP, RECOVERABLE, UNIT_CS
     filter singlebit
 {
-    (rXBUS, bit(0)) ? analyze(gIOXBFIR);
-    (rXBUS, bit(1)) ? analyze(gIOELFIR);
+    (rXBUS, bit(0)) ? analyzeIOXBFIR;
+    (rXBUS, bit(1)) ? analyzeIOELFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_capp.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_capp.rule
@@ -115,7 +115,7 @@ rule rCAPP
 group gCAPP attntype CHECK_STOP, RECOVERABLE, UNIT_CS
     filter singlebit
 {
-    (rCAPP, bit(0)) ? analyze(gCXAFIR);
+    (rCAPP, bit(0)) ? analyzeCXAFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_ex.rule
@@ -229,10 +229,10 @@ rule rEX
 group gEX attntype CHECK_STOP, RECOVERABLE
     filter singlebit
 {
-    (rEX, bit(0)) ? analyze(gL2FIR);
-    (rEX, bit(1)) ? analyze(gNCUFIR);
-    (rEX, bit(2)) ? analyze(gL3FIR);
-    (rEX, bit(3)) ? analyze(gCMEFIR);
+    (rEX, bit(0)) ? analyzeL2FIR;
+    (rEX, bit(1)) ? analyzeNCUFIR;
+    (rEX, bit(2)) ? analyzeL3FIR;
+    (rEX, bit(3)) ? analyzeCMEFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca.rule
@@ -213,9 +213,9 @@ rule rMCA
 group gMCA attntype CHECK_STOP, RECOVERABLE, UNIT_CS, HOST_ATTN
     filter singlebit
 {
-    (rMCA, bit(0)) ? analyze(gMCACALFIR);
-    (rMCA, bit(1)) ? analyze(gMCAECCFIR);
-    (rMCA, bit(2)) ? analyze(gDDRPHYFIR);
+    (rMCA, bit(0)) ? analyzeMCACALFIR;
+    (rMCA, bit(1)) ? analyzeMCAECCFIR;
+    (rMCA, bit(2)) ? analyzeDDRPHYFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mca_actions.rule
@@ -131,3 +131,11 @@ actionclass mca_ue_algorithm_th_1
     funccall("mcaUeAlgorithm"); # must be called last
 };
 
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzeDDRPHYFIR { analyze(gDDRPHYFIR); };
+actionclass analyzeMCACALFIR { analyze(gMCACALFIR); };
+actionclass analyzeMCAECCFIR { analyze(gMCAECCFIR); };
+
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs.rule
@@ -122,7 +122,7 @@ rule rMCS
 group gMCS attntype CHECK_STOP, RECOVERABLE, UNIT_CS, HOST_ATTN
     filter singlebit
 {
-    (rMCS, bit(0)) ? analyze(gMCFIR);
+    (rMCS, bit(0)) ? analyzeMCFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs_actions.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs_actions.rule
@@ -0,0 +1,31 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/nimbus/nimbus_mcs_actions.rule $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzeMCFIR { analyze(gMCFIR); };
+
diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_pec.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_pec.rule
@@ -150,8 +150,8 @@ rule rPEC
 group gPEC attntype CHECK_STOP, RECOVERABLE
     filter singlebit
 {
-    (rPEC, bit(0)) ? analyze(gPCI_LFIR);
-    (rPEC, bit(1)) ? analyze(gIOPCIFIR);
+    (rPEC, bit(0)) ? analyzePCI_LFIR;
+    (rPEC, bit(1)) ? analyzeIOPCIFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_phb.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_phb.rule
@@ -188,9 +188,9 @@ rule rPHB
 group gPHB attntype CHECK_STOP, RECOVERABLE
     filter singlebit
 {
-    (rPHB, bit(0)) ? analyze(gPHBNFIR);
-    (rPHB, bit(1)) ? analyze(gPCIFIR);
-    (rPHB, bit(2)) ? analyze(gETUFIR);
+    (rPHB, bit(0)) ? analyzePHBNFIR;
+    (rPHB, bit(1)) ? analyzePCIFIR;
+    (rPHB, bit(2)) ? analyzeETUFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/nimbus/nimbus_xbus.rule b/src/usr/diag/prdf/common/plat/nimbus/nimbus_xbus.rule
@@ -157,8 +157,8 @@ rule rXBUS
 group gXBUS attntype CHECK_STOP, RECOVERABLE, UNIT_CS
     filter singlebit
 {
-    (rXBUS, bit(0)) ? analyze(gIOXBFIR);
-    (rXBUS, bit(1)) ? analyze(gIOELFIR);
+    (rXBUS, bit(0)) ? analyzeIOXBFIR;
+    (rXBUS, bit(1)) ? analyzeIOELFIR;
 };
 
 ################################################################################

diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_capp_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_capp_actions.rule
@@ -0,0 +1,31 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_capp_actions.rule $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzeCXAFIR { analyze(gCXAFIR); };
+
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_ex_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_ex_actions.rule
@@ -82,3 +82,13 @@ actionclass core_recovery_workaround
     try( analyze(connected(TYPE_CORE, 0)),
          analyze(connected(TYPE_CORE, 1)) );
 };
+
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzeCMEFIR { analyze(gCMEFIR); };
+actionclass analyzeL2FIR  { analyze(gL2FIR);  };
+actionclass analyzeL3FIR  { analyze(gL3FIR);  };
+actionclass analyzeNCUFIR { analyze(gNCUFIR); };
+
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_pec_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_pec_actions.rule
@@ -0,0 +1,32 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_pec_actions.rule $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzePCI_LFIR { analyze(gPCI_LFIR); };
+actionclass analyzeIOPCIFIR { analyze(gIOPCIFIR); };
+
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_phb_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_phb_actions.rule
@@ -0,0 +1,33 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/diag/prdf/common/plat/p9/p9_common_phb_actions.rule $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2018
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzeETUFIR  { analyze(gETUFIR);  };
+actionclass analyzePCIFIR  { analyze(gPCIFIR);  };
+actionclass analyzePHBNFIR { analyze(gPHBNFIR); };
+
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_xbus_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_xbus_actions.rule
@@ -68,3 +68,10 @@ actionclass maxSparesExceeded_xbus_clkgrp1 { maxSparesExceeded; };
 actionclass tooManyBusErrors_xbus_clkgrp0 { tooManyBusErrors; };
 actionclass tooManyBusErrors_xbus_clkgrp1 { tooManyBusErrors; };
 
+################################################################################
+# Analyze groups
+################################################################################
+
+actionclass analyzeIOELFIR { analyze(gIOELFIR); };
+actionclass analyzeIOXBFIR { analyze(gIOXBFIR); };
+