diff options
| author | Mike Jones <mjjones@us.ibm.com> | 2013-01-09 15:58:11 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-01-10 12:24:46 -0600 |
| commit | d5128c2b9a065f89f2c3b2b105bd9d7647e0a9f2 (patch) | |
| tree | 31051b3a1d0b78ee5f5bd568104cb2485835aeb9 | |
| parent | 60271e9825b3dfabff876b569b61a52d237c7f25 (diff) | |
| download | talos-hostboot-d5128c2b9a065f89f2c3b2b105bd9d7647e0a9f2.tar.gz talos-hostboot-d5128c2b9a065f89f2c3b2b105bd9d7647e0a9f2.zip | |
HWPF: Fix automatic collection of CFAM register FFDC on HWP error
HWP Error XML files can specify CFAM/SCOM registers to collect on a HWP error.
The current code doesn't work for CFAM addresses containing non decimal
characters, simple fix.
Change-Id: I713ed12a85e6fd994c8e4b271b7901b0a66cd484
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2907
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rwxr-xr-x | src/usr/hwpf/fapi/fapiParseErrorInfo.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/usr/hwpf/fapi/fapiParseErrorInfo.pl b/src/usr/hwpf/fapi/fapiParseErrorInfo.pl index d6ff26259..359beb521 100755 --- a/src/usr/hwpf/fapi/fapiParseErrorInfo.pl +++ b/src/usr/hwpf/fapi/fapiParseErrorInfo.pl @@ -6,7 +6,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2012 +# COPYRIGHT International Business Machines Corp. 2011,2013 # # p1 # @@ -52,6 +52,7 @@ # Generate fapiCollectRegFfdc.C file # mjjones 10/23/12 Minor fix for Cronus compile failure # mjjones 11/09/12 Generate fapiSetSbeError.H +# mjjones 01/09/13 Fix CFAM register capture # # End Change Log ****************************************************** @@ -594,7 +595,7 @@ foreach my $argnum (1 .. $#ARGV) foreach my $cfamRegister (@{$registerFfdc->{cfamRegister}}) { # Extract the address - if ($cfamRegister =~ m/(0x\d+)/) + if ($cfamRegister =~ m/(0x[\dA-Fa-f]+)/) { print CRFILE " l_cfamAddresses.push_back($1);\n"; print CRFILE " l_ffdcSize += sizeof(l_cfamData);\n"; @@ -610,7 +611,7 @@ foreach my $argnum (1 .. $#ARGV) foreach my $scomRegister (@{$registerFfdc->{scomRegister}}) { # Extract the address - if ($scomRegister =~ m/(0x[\dA-Za-z]+)/) + if ($scomRegister =~ m/(0x[\dA-Fa-f]+)/) { print CRFILE " l_scomAddresses.push_back($1);\n"; print CRFILE " l_ffdcSize += sizeof(l_scomData);\n"; |
