Commit 84c3a684 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

i82860_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: Michal Marek <mmarek@suse.cz>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 40f562b1
...@@ -99,6 +99,7 @@ static int i82860_process_error_info(struct mem_ctl_info *mci, ...@@ -99,6 +99,7 @@ static int i82860_process_error_info(struct mem_ctl_info *mci,
struct i82860_error_info *info, struct i82860_error_info *info,
int handle_errors) int handle_errors)
{ {
struct dimm_info *dimm;
int row; int row;
if (!(info->errsts2 & 0x0003)) if (!(info->errsts2 & 0x0003))
...@@ -108,18 +109,25 @@ static int i82860_process_error_info(struct mem_ctl_info *mci, ...@@ -108,18 +109,25 @@ static int i82860_process_error_info(struct mem_ctl_info *mci,
return 1; return 1;
if ((info->errsts ^ info->errsts2) & 0x0003) { if ((info->errsts ^ info->errsts2) & 0x0003) {
edac_mc_handle_ce_no_info(mci, "UE overwrote CE"); edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0,
-1, -1, -1, "UE overwrote CE", "", NULL);
info->errsts = info->errsts2; info->errsts = info->errsts2;
} }
info->eap >>= PAGE_SHIFT; info->eap >>= PAGE_SHIFT;
row = edac_mc_find_csrow_by_page(mci, info->eap); row = edac_mc_find_csrow_by_page(mci, info->eap);
dimm = mci->csrows[row].channels[0].dimm;
if (info->errsts & 0x0002) if (info->errsts & 0x0002)
edac_mc_handle_ue(mci, info->eap, 0, row, "i82860 UE"); edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
info->eap, 0, 0,
dimm->location[0], dimm->location[1], -1,
"i82860 UE", "", NULL);
else else
edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row, 0, edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
"i82860 UE"); info->eap, 0, info->derrsyn,
dimm->location[0], dimm->location[1], -1,
"i82860 CE", "", NULL);
return 1; return 1;
} }
...@@ -179,18 +187,26 @@ static void i82860_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev) ...@@ -179,18 +187,26 @@ static void i82860_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev)
static int i82860_probe1(struct pci_dev *pdev, int dev_idx) static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct edac_mc_layer layers[2];
struct i82860_error_info discard; struct i82860_error_info discard;
/* RDRAM has channels but these don't map onto the abstractions that /*
edac uses. * RDRAM has channels but these don't map onto the csrow abstraction.
The device groups from the GRA registers seem to map reasonably * According with the datasheet, there are 2 Rambus channels, supporting
well onto the notion of a chip select row. * up to 16 direct RDRAM devices.
There are 16 GRA registers and since the name is associated with * The device groups from the GRA registers seem to map reasonably
the channel and the GRA registers map to physical devices so we are * well onto the notion of a chip select row.
going to make 1 channel for group. * There are 16 GRA registers and since the name is associated with
* the channel and the GRA registers map to physical devices so we are
* going to make 1 channel for group.
*/ */
mci = edac_mc_alloc(0, 16, 1, 0); layers[0].type = EDAC_MC_LAYER_CHANNEL;
layers[0].size = 2;
layers[0].is_virt_csrow = true;
layers[1].type = EDAC_MC_LAYER_SLOT;
layers[1].size = 8;
layers[1].is_virt_csrow = true;
mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
if (!mci) if (!mci)
return -ENOMEM; return -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