Support parsing call home informational eSELs with debug tooling

Nick Bofferding · dcrowell77 · commit 879d21d3cd70 · 2019-03-05T08:57:55.000-06:00
Modifies eSEL.pl to support decoding call home informational eSELs which have the 'dd' type vs. the 'df' type for other eSELs. Hostboot sends call home informational eSELs when it finds an unacknowledged error from a previous boot. Change-Id: I0c4c8eabe2f104796b5bde05fd493958ddc662c7 CQ: SW452532 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69478 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
diff --git a/src/build/debug/eSEL.pl b/src/build/debug/eSEL.pl
@@ -430,13 +430,14 @@ sub FilterACKedLogs
 # PEL data. The function also does some processing of the input string to
 # convert it to format acceptable by the errl parser. It returns a string with
 # PEL data (without the eSEL header) or an empty string if the input does not
-# contain PEL data (does not contain 'df' or '20 00 04').
+# contain PEL data (does not contain either 'df' or 'dd' followed a few bytes
+# later by '20 00 04').
 #
 # Ex input 1: "ESEL=00 00 df 00 00 00 00 20 00 04 0c b8 07 aa 00 00 50 48 00 30
 # 01 00 09 00 00 00 00 09 e6 43 1c b9 <more data>",
 # Ex output 1: 50 48 00 30 01 00 09 00 00 00 00 09 e6 43 1c b9 <more data>
 #
-# Ex input 2: ESEL=00 00 df 00 00 00 00 20 00 04 0c b8 07 aa 00 00 50 48 00 30
+# Ex input 2: ESEL=00 00 dd 00 00 00 00 20 00 04 0c b8 07 aa 00 00 50 48 00 30
 # 01 00 09 00 00 00 00 09 e6 43 1c b9 <more data>
 # Ex output 2: 50 48 00 30 01 00 09 00 00 00 00 09 e6 43 1c b9 <more data>
 #
@@ -451,11 +452,13 @@ sub ProcessEselString
         $inputString =~ s/ESEL=//g; # strip ESEL=
         ($debug) && print "ESEL data #$esel_record_count = $inputString\n";
     }
-    # If the SEL entry contains the "df" key, AND it has '040020' it's our eSEL
-    if(!($inputString =~ /df/) or !($inputString =~ /20 00 04/))
+    # If the SEL entry contains the "df" (regular) or "dd" (call home
+    # informational) key followed (a few bytes later) by '040020' it's our eSEL
+    my $criteria = qr/df|dd.*20 00 04/;
+    if(!($inputString =~ /$criteria/))
     {
         ($debug) &&
-               print " \'df\' or \'20 00 04\' was not found in $inputString.\n";
+               print " Did not find \'df\' or \'dd\' followed (a few bytes later) by \'20 00 04\' in $inputString.\n";
         return "";
     }
 
@@ -666,6 +669,7 @@ sub GetAmiEselData
     for(my $i=0; $i<$sel_count; $i++)
     {
         # If the SEL entry contains the "df" key, AND it has '040020' it's our eSEL
+        # AMI BMC does not support call home informationals
         if (($SEL_list[$i] =~ / OEM record df /) && ($SEL_list[$i] =~ /040020/))
         {
             push @eSEL_list, $SEL_list[$i];

Original file line number	Diff line number	Diff line change
`@@ -430,13 +430,14 @@ sub FilterACKedLogs`
`430`	`430`	`# PEL data. The function also does some processing of the input string to`
`431`	`431`	`# convert it to format acceptable by the errl parser. It returns a string with`
`432`	`432`	`# PEL data (without the eSEL header) or an empty string if the input does not`
`433`		`-# contain PEL data (does not contain 'df' or '20 00 04').`
	`433`	`+# contain PEL data (does not contain either 'df' or 'dd' followed a few bytes`
	`434`	`+# later by '20 00 04').`
`434`	`435`	`#`
`435`	`436`	`# Ex input 1: "ESEL=00 00 df 00 00 00 00 20 00 04 0c b8 07 aa 00 00 50 48 00 30`
`436`	`437`	`# 01 00 09 00 00 00 00 09 e6 43 1c b9 <more data>",`
`437`	`438`	`# Ex output 1: 50 48 00 30 01 00 09 00 00 00 00 09 e6 43 1c b9 <more data>`
`438`	`439`	`#`
`439`		`-# Ex input 2: ESEL=00 00 df 00 00 00 00 20 00 04 0c b8 07 aa 00 00 50 48 00 30`
	`440`	`+# Ex input 2: ESEL=00 00 dd 00 00 00 00 20 00 04 0c b8 07 aa 00 00 50 48 00 30`
`440`	`441`	`# 01 00 09 00 00 00 00 09 e6 43 1c b9 <more data>`
`441`	`442`	`# Ex output 2: 50 48 00 30 01 00 09 00 00 00 00 09 e6 43 1c b9 <more data>`
`442`	`443`	`#`
`@@ -451,11 +452,13 @@ sub ProcessEselString`
`451`	`452`	`$inputString =~ s/ESEL=//g; # strip ESEL=`
`452`	`453`	`($debug) && print "ESEL data #$esel_record_count = $inputString\n";`
`453`	`454`	`}`
`454`		`- # If the SEL entry contains the "df" key, AND it has '040020' it's our eSEL`
`455`		`- if(!($inputString =~ /df/) or !($inputString =~ /20 00 04/))`
	`455`	`+ # If the SEL entry contains the "df" (regular) or "dd" (call home`
	`456`	`+ # informational) key followed (a few bytes later) by '040020' it's our eSEL`
	`457`	`+ my $criteria = qr/df\|dd.*20 00 04/;`
	`458`	`+ if(!($inputString =~ /$criteria/))`
`456`	`459`	`{`
`457`	`460`	`($debug) &&`
`458`		`- print " \'df\' or \'20 00 04\' was not found in $inputString.\n";`
	`461`	`+ print " Did not find \'df\' or \'dd\' followed (a few bytes later) by \'20 00 04\' in $inputString.\n";`
`459`	`462`	`return "";`
`460`	`463`	`}`
`461`	`464`
`@@ -666,6 +669,7 @@ sub GetAmiEselData`
`666`	`669`	`for(my $i=0; $i<$sel_count; $i++)`
`667`	`670`	`{`
`668`	`671`	`# If the SEL entry contains the "df" key, AND it has '040020' it's our eSEL`
	`672`	`+ # AMI BMC does not support call home informationals`
`669`	`673`	`if (($SEL_list[$i] =~ / OEM record df /) && ($SEL_list[$i] =~ /040020/))`
`670`	`674`	`{`
`671`	`675`	`push @eSEL_list, $SEL_list[$i];`