|
 |
97e186 |
From 0d53728f9cbdca5a1bd32c51a121dd1162f50e95 Mon Sep 17 00:00:00 2001
|
|
|
97e186 |
From: Mauro Carvalho Chehab <m.chehab@samsung.com>
|
|
|
97e186 |
Date: Thu, 15 Aug 2013 12:45:18 -0300
|
|
|
97e186 |
Subject: [PATCH 14/32] ras-mc-ctl: Fix label register with 2 layers
|
|
|
97e186 |
|
|
|
97e186 |
When there aren't 3 layers, label print/register weren't working.
|
|
|
97e186 |
|
|
|
97e186 |
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
|
|
|
97e186 |
---
|
|
|
97e186 |
util/ras-mc-ctl.in | 19 +++++++++++++------
|
|
|
97e186 |
1 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
97e186 |
|
|
|
97e186 |
diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
|
|
|
97e186 |
index f5a8ce5..a7137be 100755
|
|
|
97e186 |
--- a/util/ras-mc-ctl.in
|
|
|
97e186 |
+++ b/util/ras-mc-ctl.in
|
|
|
97e186 |
@@ -508,7 +508,6 @@ sub parse_dimm_labels_file
|
|
|
97e186 |
}
|
|
|
97e186 |
map { $lh->{$vendor}{lc $_}{$mc}{$top}{$mid}{$low} = $label }
|
|
|
97e186 |
@models;
|
|
|
97e186 |
- $n = 3;
|
|
|
97e186 |
}
|
|
|
97e186 |
if (!$num) {
|
|
|
97e186 |
$num = $n;
|
|
|
97e186 |
@@ -542,9 +541,13 @@ sub parse_dimm_labels
|
|
|
97e186 |
|
|
|
97e186 |
sub read_dimm_label
|
|
|
97e186 |
{
|
|
|
97e186 |
- my ($mc, $top, $mid, $low) = @_;
|
|
|
97e186 |
+ my ($num_layers, $mc, $top, $mid, $low) = @_;
|
|
|
97e186 |
my $sysfs = "/sys/devices/system/edac/mc";
|
|
|
97e186 |
- my $pos = "$mc:$top:$mid:$low";
|
|
|
97e186 |
+ my $pos;
|
|
|
97e186 |
+
|
|
|
97e186 |
+ $pos = "$mc:$top:$mid:$low" if ($num_layers == 3);
|
|
|
97e186 |
+ $pos = "$mc:$top:$mid" if ($num_layers == 2);
|
|
|
97e186 |
+ $pos = "$mc:$top" if ($num_layers == 1);
|
|
|
97e186 |
|
|
|
97e186 |
if (!defined($dimm_node{$pos})) {
|
|
|
97e186 |
my $label = "$pos missing";
|
|
|
97e186 |
@@ -574,10 +577,14 @@ sub read_dimm_label
|
|
|
97e186 |
|
|
|
97e186 |
sub get_dimm_label_node
|
|
|
97e186 |
{
|
|
|
97e186 |
- my ($mc, $top, $mid, $low) = @_;
|
|
|
97e186 |
+ my ($num_layers, $mc, $top, $mid, $low) = @_;
|
|
|
97e186 |
my $sysfs = "/sys/devices/system/edac/mc";
|
|
|
97e186 |
my $pos = "$mc:$top:$mid:$low";
|
|
|
97e186 |
|
|
|
97e186 |
+ $pos = "$mc:$top:$mid:$low" if ($num_layers == 3);
|
|
|
97e186 |
+ $pos = "$mc:$top:$mid" if ($num_layers == 2);
|
|
|
97e186 |
+ $pos = "$mc:$top" if ($num_layers == 1);
|
|
|
97e186 |
+
|
|
|
97e186 |
return "" if (!defined($dimm_node{$pos}));
|
|
|
97e186 |
|
|
|
97e186 |
my $dimm = $dimm_node{$pos};
|
|
|
97e186 |
@@ -611,7 +618,7 @@ sub print_dimm_labels
|
|
|
97e186 |
for my $mid (sort keys %{$$lref{$vendor}{$model}{$mc}{$top}}) {
|
|
|
97e186 |
for my $low (sort keys %{$$lref{$vendor}{$model}{$mc}{$top}{$mid}}) {
|
|
|
97e186 |
my $label = $$lref{$vendor}{$model}{$mc}{$top}{$mid}{$low};
|
|
|
97e186 |
- my ($rlabel,$loc) = read_dimm_label ($mc, $top, $mid, $low);
|
|
|
97e186 |
+ my ($rlabel,$loc) = read_dimm_label ($$num_layers{$vendor}{$model}, $mc, $top, $mid, $low);
|
|
|
97e186 |
|
|
|
97e186 |
printf $fh $format, $loc, $label, $rlabel;
|
|
|
97e186 |
}
|
|
|
97e186 |
@@ -645,7 +652,7 @@ sub register_dimm_labels
|
|
|
97e186 |
for my $mid (sort keys %{$$lref{$vendor}{$model}{$mc}{$top}}) {
|
|
|
97e186 |
for my $low (sort keys %{$$lref{$vendor}{$model}{$mc}{$top}{$mid}}) {
|
|
|
97e186 |
|
|
|
97e186 |
- my $file = get_dimm_label_node($mc, $top, $mid, $low);
|
|
|
97e186 |
+ my $file = get_dimm_label_node($$num_layers{$vendor}{$model}, $mc, $top, $mid, $low);
|
|
|
97e186 |
|
|
|
97e186 |
# Ignore sysfs files that don't exist. Might just be
|
|
|
97e186 |
# unpopulated bank.
|
|
|
97e186 |
--
|
|
|
97e186 |
1.7.1
|
|
|
97e186 |
|