Commit 70e2a837 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

i7300_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.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 296da591
...@@ -464,17 +464,14 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci) ...@@ -464,17 +464,14 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci)
FERR_FAT_FBD, error_reg); FERR_FAT_FBD, error_reg);
snprintf(pvt->tmp_prt_buffer, PAGE_SIZE, snprintf(pvt->tmp_prt_buffer, PAGE_SIZE,
"FATAL (Branch=%d DRAM-Bank=%d %s " "Bank=%d RAS=%d CAS=%d Err=0x%lx (%s))",
"RAS=%d CAS=%d Err=0x%lx (%s))", bank, ras, cas, errors, specific);
branch, bank,
is_wr ? "RDWR" : "RD", edac_mc_handle_error(HW_EVENT_ERR_FATAL, mci, 0, 0, 0,
ras, cas, branch, -1, rank,
errors, specific); is_wr ? "Write error" : "Read error",
pvt->tmp_prt_buffer, NULL);
/* Call the helper to output message */
edac_mc_handle_fbd_ue(mci, rank, branch << 1,
(branch << 1) + 1,
pvt->tmp_prt_buffer);
} }
/* read in the 1st NON-FATAL error register */ /* read in the 1st NON-FATAL error register */
...@@ -513,23 +510,14 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci) ...@@ -513,23 +510,14 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci)
/* Form out message */ /* Form out message */
snprintf(pvt->tmp_prt_buffer, PAGE_SIZE, snprintf(pvt->tmp_prt_buffer, PAGE_SIZE,
"Corrected error (Branch=%d, Channel %d), " "DRAM-Bank=%d RAS=%d CAS=%d, Err=0x%lx (%s))",
" DRAM-Bank=%d %s " bank, ras, cas, errors, specific);
"RAS=%d CAS=%d, CE Err=0x%lx, Syndrome=0x%08x(%s))",
branch, channel, edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 0, 0,
bank, syndrome,
is_wr ? "RDWR" : "RD", branch >> 1, channel % 2, rank,
ras, cas, is_wr ? "Write error" : "Read error",
errors, syndrome, specific); pvt->tmp_prt_buffer, NULL);
/*
* Call the helper to output message
* NOTE: Errors are reported per-branch, and not per-channel
* Currently, we don't know how to identify the right
* channel.
*/
edac_mc_handle_fbd_ce(mci, rank, channel,
pvt->tmp_prt_buffer);
} }
return; return;
} }
...@@ -807,9 +795,10 @@ static int i7300_init_csrows(struct mem_ctl_info *mci) ...@@ -807,9 +795,10 @@ static int i7300_init_csrows(struct mem_ctl_info *mci)
for (ch = 0; ch < MAX_CH_PER_BRANCH; ch++) { for (ch = 0; ch < MAX_CH_PER_BRANCH; ch++) {
int channel = to_channel(ch, branch); int channel = to_channel(ch, branch);
dinfo = &pvt->dimm_info[slot][channel]; dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms,
mci->n_layers, branch, ch, slot);
dimm = mci->csrows[slot].channels[branch * MAX_CH_PER_BRANCH + ch].dimm; dinfo = &pvt->dimm_info[slot][channel];
mtr = decode_mtr(pvt, slot, ch, branch, mtr = decode_mtr(pvt, slot, ch, branch,
dinfo, dimm); dinfo, dimm);
...@@ -1034,10 +1023,8 @@ static int __devinit i7300_init_one(struct pci_dev *pdev, ...@@ -1034,10 +1023,8 @@ static int __devinit i7300_init_one(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct edac_mc_layer layers[3];
struct i7300_pvt *pvt; struct i7300_pvt *pvt;
int num_channels;
int num_dimms_per_channel;
int num_csrows;
int rc; int rc;
/* wake up device */ /* wake up device */
...@@ -1054,22 +1041,17 @@ static int __devinit i7300_init_one(struct pci_dev *pdev, ...@@ -1054,22 +1041,17 @@ static int __devinit i7300_init_one(struct pci_dev *pdev,
if (PCI_FUNC(pdev->devfn) != 0) if (PCI_FUNC(pdev->devfn) != 0)
return -ENODEV; return -ENODEV;
/* As we don't have a motherboard identification routine to determine
* actual number of slots/dimms per channel, we thus utilize the
* resource as specified by the chipset. Thus, we might have
* have more DIMMs per channel than actually on the mobo, but this
* allows the driver to support up to the chipset max, without
* some fancy mobo determination.
*/
num_dimms_per_channel = MAX_SLOTS;
num_channels = MAX_CHANNELS;
num_csrows = MAX_SLOTS * MAX_CHANNELS;
debugf0("MC: %s(): Number of - Channels= %d DIMMS= %d CSROWS= %d\n",
__func__, num_channels, num_dimms_per_channel, num_csrows);
/* allocate a new MC control structure */ /* allocate a new MC control structure */
mci = edac_mc_alloc(sizeof(*pvt), num_csrows, num_channels, 0); layers[0].type = EDAC_MC_LAYER_BRANCH;
layers[0].size = MAX_BRANCHES;
layers[0].is_virt_csrow = false;
layers[1].type = EDAC_MC_LAYER_CHANNEL;
layers[1].size = MAX_CH_PER_BRANCH;
layers[1].is_virt_csrow = true;
layers[2].type = EDAC_MC_LAYER_SLOT;
layers[2].size = MAX_SLOTS;
layers[2].is_virt_csrow = true;
mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
if (mci == NULL) if (mci == NULL)
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