From ff3b8e88ae62b4f48bee7e82abde3cc4af0d1ebd Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 16 Apr 2012 15:12:28 -0300 Subject: [PATCH] --- yaml --- r: 309127 b: refs/heads/master c: 40467db77050592cd514304db770739385b53cc6 h: refs/heads/master i: 309125: 866c3bc81f188d97a54831ee7db1890c66224dec 309123: 4b9f6c4f44e965748c39790a38eebddd6abdaee7 309119: a3827c8855f144b14e1de5e43b512fbfe9f457e0 v: v3 --- [refs] | 2 +- trunk/drivers/edac/tile_edac.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b50e411cfcd6..26a6439c2f68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c36e3e77687b39073903f55461fc9417514e831e +refs/heads/master: 40467db77050592cd514304db770739385b53cc6 diff --git a/trunk/drivers/edac/tile_edac.c b/trunk/drivers/edac/tile_edac.c index 054c9bb3a5dc..bcdd1e4dc735 100644 --- a/trunk/drivers/edac/tile_edac.c +++ b/trunk/drivers/edac/tile_edac.c @@ -71,7 +71,10 @@ static void tile_edac_check(struct mem_ctl_info *mci) if (mem_error.sbe_count != priv->ce_count) { dev_dbg(mci->dev, "ECC CE err on node %d\n", priv->node); priv->ce_count = mem_error.sbe_count; - edac_mc_handle_ce(mci, 0, 0, 0, 0, 0, mci->ctl_name); + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, + 0, 0, 0, + 0, 0, -1, + mci->ctl_name, "", NULL); } } @@ -122,6 +125,7 @@ static int __devinit tile_edac_mc_probe(struct platform_device *pdev) char hv_file[32]; int hv_devhdl; struct mem_ctl_info *mci; + struct edac_mc_layer layers[2]; struct tile_edac_priv *priv; int rc; @@ -131,8 +135,14 @@ static int __devinit tile_edac_mc_probe(struct platform_device *pdev) return -EINVAL; /* A TILE MC has a single channel and one chip-select row. */ - mci = edac_mc_alloc(sizeof(struct tile_edac_priv), - TILE_EDAC_NR_CSROWS, TILE_EDAC_NR_CHANS, pdev->id); + layers[0].type = EDAC_MC_LAYER_CHIP_SELECT; + layers[0].size = TILE_EDAC_NR_CSROWS; + layers[0].is_virt_csrow = true; + layers[1].type = EDAC_MC_LAYER_CHANNEL; + layers[1].size = TILE_EDAC_NR_CHANS; + layers[1].is_virt_csrow = false; + mci = new_edac_mc_alloc(pdev->id, ARRAY_SIZE(layers), layers, + sizeof(struct tile_edac_priv)); if (mci == NULL) return -ENOMEM; priv = mci->pvt_info;