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

Commit 6458fc08 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

cell_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: Jiri Kosina <jkosina@suse.cz>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d8c34af4

drivers/edac/cell_edac.c

+19 −7
Original line number Original line Diff line number Diff line
@@ -48,8 +48,9 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar) 
	syndrome = (ar & 0x000000001fe00000ul) >> 21;

	syndrome = (ar & 0x000000001fe00000ul) >> 21;





	/* TODO: Decoding of the error address */

	/* TODO: Decoding of the error address */

	edac_mc_handle_ce(mci, csrow->first_page + pfn, offset,

	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

			  syndrome, 0, chan, "");

			     csrow->first_page + pfn, offset, syndrome,

			     0, chan, -1, "", "", NULL);

}

}





static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar)

static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar)
@@ -69,7 +70,9 @@ static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) 
	offset = address & ~PAGE_MASK;

	offset = address & ~PAGE_MASK;





	/* TODO: Decoding of the error address */

	/* TODO: Decoding of the error address */

	edac_mc_handle_ue(mci, csrow->first_page + pfn, offset, 0, "");

	edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

			     csrow->first_page + pfn, offset, 0,

			     0, chan, -1, "", "", NULL);

}

}





static void cell_edac_check(struct mem_ctl_info *mci)

static void cell_edac_check(struct mem_ctl_info *mci)
@@ -156,7 +159,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) 
			"Initialized on node %d, chanmask=0x%x,"

			"Initialized on node %d, chanmask=0x%x,"

			" first_page=0x%lx, nr_pages=0x%x\n",

			" first_page=0x%lx, nr_pages=0x%x\n",

			priv->node, priv->chanmask,

			priv->node, priv->chanmask,

			csrow->first_page, dimm->nr_pages);

			csrow->first_page, nr_pages);

		break;

		break;

	}

	}

}

}
@@ -165,9 +168,10 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) 
{

{

	struct cbe_mic_tm_regs __iomem	*regs;

	struct cbe_mic_tm_regs __iomem	*regs;

	struct mem_ctl_info		*mci;

	struct mem_ctl_info		*mci;

	struct edac_mc_layer		layers[2];

	struct cell_edac_priv		*priv;

	struct cell_edac_priv		*priv;

	u64				reg;

	u64				reg;

	int				rc, chanmask;

	int				rc, chanmask, num_chans;





	regs = cbe_get_cpu_mic_tm_regs(cbe_node_to_cpu(pdev->id));

	regs = cbe_get_cpu_mic_tm_regs(cbe_node_to_cpu(pdev->id));

	if (regs == NULL)

	if (regs == NULL)
@@ -192,8 +196,16 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) 
		in_be64(&regs->mic_fir));

		in_be64(&regs->mic_fir));





	/* Allocate & init EDAC MC data structure */

	/* Allocate & init EDAC MC data structure */

	mci = edac_mc_alloc(sizeof(struct cell_edac_priv), 1,

	num_chans = chanmask == 3 ? 2 : 1;

			    chanmask == 3 ? 2 : 1, pdev->id);



	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 = num_chans;

	layers[1].is_virt_csrow = false;

	mci = new_edac_mc_alloc(pdev->id, ARRAY_SIZE(layers), layers,

			    sizeof(struct cell_edac_priv));

	if (mci == NULL)

	if (mci == NULL)

		return -ENOMEM;

		return -ENOMEM;

	priv = mci->pvt_info;

	priv = mci->pvt_info;