@@ -1552,10 +1552,17 @@ sub errors
undef($dbh);
}
+# Definitions of the vendor platform IDs.
+use constant {
+ HISILICON_KUNPENG_920 => "KunPeng920",
+};
+
sub vendor_errors_summary
{
require DBI;
my ($num_args, $platform_id);
+ my ($query, $query_handle, $count, $out);
+ my ($module_id, $sub_module_id, $err_severity, $err_sev);
$num_args = $#ARGV + 1;
$platform_id = 0;
@@ -1569,6 +1576,81 @@ sub vendor_errors_summary
# Disable the DBI automatic exception log
$dbh->{PrintError} = 0;
+ # HiSilicon KunPeng920 errors
+ if ($platform_id eq HISILICON_KUNPENG_920) {
+ try {
+ $query = "select err_severity, module_id, count(*) from hip08_oem_type1_event_v2 group by err_severity, module_id";
+ $query_handle = $dbh->prepare($query);
+ $query_handle->execute();
+ $query_handle->bind_columns(\($err_severity, $module_id, $count));
+ $out = "";
+ $err_sev = "";
+ while($query_handle->fetch()) {
+ if ($err_severity ne $err_sev) {
+ $out .= "$err_severity errors:\n";
+ $err_sev = $err_severity;
+ }
+ $out .= "\t$module_id: $count\n";
+ }
+ if ($out ne "") {
+ print "HiSilicon KunPeng920 OEM type1 error events summary:\n$out\n";
+ } else {
+ print "No HiSilicon KunPeng920 OEM type1 errors.\n\n";
+ }
+ $query_handle->finish;
+ } catch {
+ print "Exception: $DBI::errstr\n\n";
+ };
+
+ try {
+ $query = "select err_severity, module_id, count(*) from hip08_oem_type2_event_v2 group by err_severity, module_id";
+ $query_handle = $dbh->prepare($query);
+ $query_handle->execute();
+ $query_handle->bind_columns(\($err_severity, $module_id, $count));
+ $out = "";
+ $err_sev = "";
+ while($query_handle->fetch()) {
+ if ($err_severity ne $err_sev) {
+ $out .= "$err_severity errors:\n";
+ $err_sev = $err_severity;
+ }
+ $out .= "\t$module_id: $count\n";
+ }
+ if ($out ne "") {
+ print "HiSilicon KunPeng920 OEM type2 error events summary:\n$out\n";
+ } else {
+ print "No HiSilicon KunPeng920 OEM type2 errors.\n\n";
+ }
+ $query_handle->finish;
+ } catch {
+ print "Exception: $DBI::errstr\n\n";
+ };
+
+ try {
+ $query = "select err_severity, sub_module_id, count(*) from hip08_pcie_local_event_v2 group by err_severity, sub_module_id";
+ $query_handle = $dbh->prepare($query);
+ $query_handle->execute();
+ $query_handle->bind_columns(\($err_severity, $sub_module_id, $count));
+ $out = "";
+ $err_sev = "";
+ while($query_handle->fetch()) {
+ if ($err_severity ne $err_sev) {
+ $out .= "$err_severity errors:\n";
+ $err_sev = $err_severity;
+ }
+ $out .= "\t$sub_module_id: $count\n";
+ }
+ if ($out ne "") {
+ print "HiSilicon KunPeng920 PCIe controller error events summary:\n$out\n";
+ } else {
+ print "No HiSilicon KunPeng920 PCIe controller errors.\n\n";
+ }
+ $query_handle->finish;
+ } catch {
+ print "Exception: $DBI::errstr\n\n";
+ };
+ }
+
undef($dbh);
}
@@ -1576,6 +1658,9 @@ sub vendor_errors
{
require DBI;
my ($num_args, $platform_id);
+ my ($query, $query_handle, $id, $timestamp, $out);
+ my ($version, $soc_id, $socket_id, $nimbus_id, $core_id, $port_id);
+ my ($module_id, $sub_module_id, $err_severity, $err_type, $regs);
$num_args = $#ARGV + 1;
$platform_id = 0;
@@ -1589,12 +1674,100 @@ sub vendor_errors
# Disable the DBI automatic exception log
$dbh->{PrintError} = 0;
+ # HiSilicon KunPeng920 errors
+ if ($platform_id eq HISILICON_KUNPENG_920) {
+ try {
+ $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, module_id, sub_module_id, err_severity, regs_dump from hip08_oem_type1_event_v2 order by id, module_id, err_severity";
+ $query_handle = $dbh->prepare($query);
+ $query_handle->execute();
+ $query_handle->bind_columns(\($id, $timestamp, $version, $soc_id, $socket_id, $nimbus_id, $module_id, $sub_module_id, $err_severity, $regs));
+ $out = "";
+ while($query_handle->fetch()) {
+ $out .= "$id. $timestamp Error Info: ";
+ $out .= "version=$version, ";
+ $out .= "soc_id=$soc_id, " if ($soc_id);
+ $out .= "socket_id=$socket_id, " if ($socket_id);
+ $out .= "nimbus_id=$nimbus_id, " if ($nimbus_id);
+ $out .= "module_id=$module_id, " if ($module_id);
+ $out .= "sub_module_id=$sub_module_id, " if ($sub_module_id);
+ $out .= "err_severity=$err_severity, \n" if ($err_severity);
+ $out .= "Error Registers: $regs\n\n" if ($regs);
+ }
+ if ($out ne "") {
+ print "HiSilicon KunPeng920 OEM type1 error events:\n$out\n";
+ } else {
+ print "No HiSilicon KunPeng920 OEM type1 errors.\n";
+ }
+ $query_handle->finish;
+ } catch {
+ print "Exception: $DBI::errstr\n\n";
+ };
+
+ try {
+ $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, module_id, sub_module_id, err_severity, regs_dump from hip08_oem_type2_event_v2 order by id, module_id, err_severity";
+ $query_handle = $dbh->prepare($query);
+ $query_handle->execute();
+ $query_handle->bind_columns(\($id, $timestamp, $version, $soc_id, $socket_id, $nimbus_id, $module_id, $sub_module_id, $err_severity, $regs));
+ $out = "";
+ while($query_handle->fetch()) {
+ $out .= "$id. $timestamp Error Info: ";
+ $out .= "version=$version, ";
+ $out .= "soc_id=$soc_id, " if ($soc_id);
+ $out .= "socket_id=$socket_id, " if ($socket_id);
+ $out .= "nimbus_id=$nimbus_id, " if ($nimbus_id);
+ $out .= "module_id=$module_id, " if ($module_id);
+ $out .= "sub_module_id=$sub_module_id, " if ($sub_module_id);
+ $out .= "err_severity=$err_severity, \n" if ($err_severity);
+ $out .= "Error Registers: $regs\n\n" if ($regs);
+ }
+ if ($out ne "") {
+ print "HiSilicon KunPeng920 OEM type2 error events:\n$out\n";
+ } else {
+ print "No HiSilicon KunPeng920 OEM type2 errors.\n";
+ }
+ $query_handle->finish;
+ } catch {
+ print "Exception: $DBI::errstr\n\n";
+ };
+
+ try {
+ $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, sub_module_id, core_id, port_id, err_severity, err_type, regs_dump from hip08_pcie_local_event_v2 order by id, sub_module_id, err_severity";
+ $query_handle = $dbh->prepare($query);
+ $query_handle->execute();
+ $query_handle->bind_columns(\($id, $timestamp, $version, $soc_id, $socket_id, $nimbus_id, $sub_module_id, $core_id, $port_id, $err_severity, $err_type, $regs));
+ $out = "";
+ while($query_handle->fetch()) {
+ $out .= "$id. $timestamp Error Info: ";
+ $out .= "version=$version, ";
+ $out .= "soc_id=$soc_id, " if ($soc_id);
+ $out .= "socket_id=$socket_id, " if ($socket_id);
+ $out .= "nimbus_id=$nimbus_id, " if ($nimbus_id);
+ $out .= "sub_module_id=$sub_module_id, " if ($sub_module_id);
+ $out .= "core_id=$core_id, " if ($core_id);
+ $out .= "port_id=$port_id, " if ($port_id);
+ $out .= "err_severity=$err_severity, " if ($err_severity);
+ $out .= "err_type=$err_type, \n" if ($err_type);
+ $out .= "Error Registers: $regs\n\n" if ($regs);
+ }
+ if ($out ne "") {
+ print "HiSilicon KunPeng920 PCIe controller error events:\n$out\n";
+ } else {
+ print "No HiSilicon KunPeng920 PCIe controller errors.\n";
+ }
+ $query_handle->finish;
+ } catch {
+ print "Exception: $DBI::errstr\n\n";
+ };
+ }
+
undef($dbh);
}
sub vendor_platforms
{
print "\nSupported platforms for the vendor-specific errors:\n";
+ print "\tHiSilicon KunPeng920, platform-id=\"", HISILICON_KUNPENG_920, "\"\n";
+ print "\n";
}
sub log_msg { print STDERR "$prog: ", @_ unless $conf{opt}{quiet}; }