Commit df62b1e6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

cpc925_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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6458fc08
...@@ -555,13 +555,18 @@ static void cpc925_mc_check(struct mem_ctl_info *mci) ...@@ -555,13 +555,18 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
if (apiexcp & CECC_EXCP_DETECTED) { if (apiexcp & CECC_EXCP_DETECTED) {
cpc925_mc_printk(mci, KERN_INFO, "DRAM CECC Fault\n"); cpc925_mc_printk(mci, KERN_INFO, "DRAM CECC Fault\n");
channel = cpc925_mc_find_channel(mci, syndrome); channel = cpc925_mc_find_channel(mci, syndrome);
edac_mc_handle_ce(mci, pfn, offset, syndrome, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
csrow, channel, mci->ctl_name); pfn, offset, syndrome,
csrow, channel, -1,
mci->ctl_name, "", NULL);
} }
if (apiexcp & UECC_EXCP_DETECTED) { if (apiexcp & UECC_EXCP_DETECTED) {
cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n"); cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n");
edac_mc_handle_ue(mci, pfn, offset, csrow, mci->ctl_name); edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
pfn, offset, 0,
csrow, -1, -1,
mci->ctl_name, "", NULL);
} }
cpc925_mc_printk(mci, KERN_INFO, "Dump registers:\n"); cpc925_mc_printk(mci, KERN_INFO, "Dump registers:\n");
...@@ -933,6 +938,7 @@ static int __devinit cpc925_probe(struct platform_device *pdev) ...@@ -933,6 +938,7 @@ static int __devinit cpc925_probe(struct platform_device *pdev)
{ {
static int edac_mc_idx; static int edac_mc_idx;
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct edac_mc_layer layers[2];
void __iomem *vbase; void __iomem *vbase;
struct cpc925_mc_pdata *pdata; struct cpc925_mc_pdata *pdata;
struct resource *r; struct resource *r;
...@@ -969,8 +975,15 @@ static int __devinit cpc925_probe(struct platform_device *pdev) ...@@ -969,8 +975,15 @@ static int __devinit cpc925_probe(struct platform_device *pdev)
} }
nr_channels = cpc925_mc_get_channels(vbase) + 1; nr_channels = cpc925_mc_get_channels(vbase) + 1;
mci = edac_mc_alloc(sizeof(struct cpc925_mc_pdata),
CPC925_NR_CSROWS, nr_channels, edac_mc_idx); layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;
layers[0].size = CPC925_NR_CSROWS;
layers[0].is_virt_csrow = true;
layers[1].type = EDAC_MC_LAYER_CHANNEL;
layers[1].size = nr_channels;
layers[1].is_virt_csrow = false;
mci = new_edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
sizeof(struct cpc925_mc_pdata));
if (!mci) { if (!mci) {
cpc925_printk(KERN_ERR, "No memory for mem_ctl_info\n"); cpc925_printk(KERN_ERR, "No memory for mem_ctl_info\n");
res = -ENOMEM; res = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment