Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 884906f1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

i3000_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: Jason Uhlenkott <juhlenko@akamai.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 30ac4406

drivers/edac/i3000_edac.c

+20 −5
Original line number Diff line number Diff line
@@ -245,7 +245,9 @@ static int i3000_process_error_info(struct mem_ctl_info *mci, 
		return 1;



	if ((info->errsts ^ info->errsts2) & I3000_ERRSTS_BITS) {

		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;

	}
@@ -256,10 +258,15 @@ static int i3000_process_error_info(struct mem_ctl_info *mci, 
	row = edac_mc_find_csrow_by_page(mci, pfn);



	if (info->errsts & I3000_ERRSTS_UE)

		edac_mc_handle_ue(mci, pfn, offset, row, "i3000 UE");

		edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

				     pfn, offset, 0,

				     row, -1, -1,

				     "i3000 UE", "", NULL);

	else

		edac_mc_handle_ce(mci, pfn, offset, info->derrsyn, row,

				multi_chan ? channel : 0, "i3000 CE");

		edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

				     pfn, offset, info->derrsyn,

				     row, multi_chan ? channel : 0, -1,

				     "i3000 CE", "", NULL);



	return 1;

}
@@ -306,6 +313,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) 
	int rc;

	int i, j;

	struct mem_ctl_info *mci = NULL;

	struct edac_mc_layer layers[2];

	unsigned long last_cumul_size, nr_pages;

	int interleaved, nr_channels;

	unsigned char dra[I3000_RANKS / 2], drb[I3000_RANKS];
@@ -347,7 +355,14 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) 
	 */

	interleaved = i3000_is_interleaved(c0dra, c1dra, c0drb, c1drb);

	nr_channels = interleaved ? 2 : 1;

	mci = edac_mc_alloc(0, I3000_RANKS / nr_channels, nr_channels, 0);



	layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;

	layers[0].size = I3000_RANKS / nr_channels;

	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(0, ARRAY_SIZE(layers), layers, 0);

	if (!mci)

		return -ENOMEM;