diff options
Diffstat (limited to 'drivers/edac')
-rw-r--r-- | drivers/edac/cell_edac.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c index 09e1b5d3df70..14aa17492757 100644 --- a/drivers/edac/cell_edac.c +++ b/drivers/edac/cell_edac.c | |||
@@ -48,8 +48,9 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar) | |||
48 | syndrome = (ar & 0x000000001fe00000ul) >> 21; | 48 | syndrome = (ar & 0x000000001fe00000ul) >> 21; |
49 | 49 | ||
50 | /* TODO: Decoding of the error address */ | 50 | /* TODO: Decoding of the error address */ |
51 | edac_mc_handle_ce(mci, csrow->first_page + pfn, offset, | 51 | edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, |
52 | syndrome, 0, chan, ""); | 52 | csrow->first_page + pfn, offset, syndrome, |
53 | 0, chan, -1, "", "", NULL); | ||
53 | } | 54 | } |
54 | 55 | ||
55 | static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) | 56 | static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) |
@@ -69,7 +70,9 @@ static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) | |||
69 | offset = address & ~PAGE_MASK; | 70 | offset = address & ~PAGE_MASK; |
70 | 71 | ||
71 | /* TODO: Decoding of the error address */ | 72 | /* TODO: Decoding of the error address */ |
72 | edac_mc_handle_ue(mci, csrow->first_page + pfn, offset, 0, ""); | 73 | edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, |
74 | csrow->first_page + pfn, offset, 0, | ||
75 | 0, chan, -1, "", "", NULL); | ||
73 | } | 76 | } |
74 | 77 | ||
75 | static void cell_edac_check(struct mem_ctl_info *mci) | 78 | static void cell_edac_check(struct mem_ctl_info *mci) |
@@ -156,7 +159,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) | |||
156 | "Initialized on node %d, chanmask=0x%x," | 159 | "Initialized on node %d, chanmask=0x%x," |
157 | " first_page=0x%lx, nr_pages=0x%x\n", | 160 | " first_page=0x%lx, nr_pages=0x%x\n", |
158 | priv->node, priv->chanmask, | 161 | priv->node, priv->chanmask, |
159 | csrow->first_page, dimm->nr_pages); | 162 | csrow->first_page, nr_pages); |
160 | break; | 163 | break; |
161 | } | 164 | } |
162 | } | 165 | } |
@@ -165,9 +168,10 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) | |||
165 | { | 168 | { |
166 | struct cbe_mic_tm_regs __iomem *regs; | 169 | struct cbe_mic_tm_regs __iomem *regs; |
167 | struct mem_ctl_info *mci; | 170 | struct mem_ctl_info *mci; |
171 | struct edac_mc_layer layers[2]; | ||
168 | struct cell_edac_priv *priv; | 172 | struct cell_edac_priv *priv; |
169 | u64 reg; | 173 | u64 reg; |
170 | int rc, chanmask; | 174 | int rc, chanmask, num_chans; |
171 | 175 | ||
172 | regs = cbe_get_cpu_mic_tm_regs(cbe_node_to_cpu(pdev->id)); | 176 | regs = cbe_get_cpu_mic_tm_regs(cbe_node_to_cpu(pdev->id)); |
173 | if (regs == NULL) | 177 | if (regs == NULL) |
@@ -192,8 +196,16 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) | |||
192 | in_be64(®s->mic_fir)); | 196 | in_be64(®s->mic_fir)); |
193 | 197 | ||
194 | /* Allocate & init EDAC MC data structure */ | 198 | /* Allocate & init EDAC MC data structure */ |
195 | mci = edac_mc_alloc(sizeof(struct cell_edac_priv), 1, | 199 | num_chans = chanmask == 3 ? 2 : 1; |
196 | chanmask == 3 ? 2 : 1, pdev->id); | 200 | |
201 | layers[0].type = EDAC_MC_LAYER_CHIP_SELECT; | ||
202 | layers[0].size = 1; | ||
203 | layers[0].is_virt_csrow = true; | ||
204 | layers[1].type = EDAC_MC_LAYER_CHANNEL; | ||
205 | layers[1].size = num_chans; | ||
206 | layers[1].is_virt_csrow = false; | ||
207 | mci = new_edac_mc_alloc(pdev->id, ARRAY_SIZE(layers), layers, | ||
208 | sizeof(struct cell_edac_priv)); | ||
197 | if (mci == NULL) | 209 | if (mci == NULL) |
198 | return -ENOMEM; | 210 | return -ENOMEM; |
199 | priv = mci->pvt_info; | 211 | priv = mci->pvt_info; |