mv64x60_edac: convert driver to use the new edac ABI

The legacy edac ABI is going to be removed. Port the driver to use
and benefit from the new API functionality.

Cc: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 19 insertions, 6 deletions

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 281e24528599..289a6cc859b4 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -611,12 +611,17 @@ static void mv64x60_mc_check(struct mem_ctl_info *mci)
 
         /* first bit clear in ECC Err Reg, 1 bit error, correctable by HW */
         if (!(reg & 0x1))
-                edac_mc_handle_ce(mci, err_addr >> PAGE_SHIFT,
-                                  err_addr & PAGE_MASK, syndrome, 0, 0,
-                                  mci->ctl_name);
+                edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
+                                     err_addr >> PAGE_SHIFT,
+                                     err_addr & PAGE_MASK, syndrome,
+                                     0, 0, -1,
+                                     mci->ctl_name, "", NULL);
         else    /* 2 bit error, UE */
-                edac_mc_handle_ue(mci, err_addr >> PAGE_SHIFT,
-                                  err_addr & PAGE_MASK, 0, mci->ctl_name);
+                edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
+                                     err_addr >> PAGE_SHIFT,
+                                     err_addr & PAGE_MASK, 0,
+                                     0, 0, -1,
+                                     mci->ctl_name, "", NULL);
 
         /* clear the error */
         out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR, 0);
@@ -695,6 +700,7 @@ static void mv64x60_init_csrows(struct mem_ctl_info *mci,
 static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
 {
         struct mem_ctl_info *mci;
+        struct edac_mc_layer layers[2];
         struct mv64x60_mc_pdata *pdata;
         struct resource *r;
         u32 ctl;
@@ -703,7 +709,14 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
         if (!devres_open_group(&pdev->dev, mv64x60_mc_err_probe, GFP_KERNEL))
                 return -ENOMEM;
 
-        mci = edac_mc_alloc(sizeof(struct mv64x60_mc_pdata), 1, 1, edac_mc_idx);
+        layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;
+        layers[0].size = 1;
+        layers[0].is_virt_csrow = true;
+        layers[1].type = EDAC_MC_LAYER_CHANNEL;
+        layers[1].size = 1;
+        layers[1].is_virt_csrow = false;
+        mci = new_edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
+                            sizeof(struct mv64x60_mc_pdata));
         if (!mci) {
                 printk(KERN_ERR "%s: No memory for CPU err\n", __func__);
                 devres_release_group(&pdev->dev, mv64x60_mc_err_probe);