p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EDAC, altera: Drop some ifdeffery 

Make the IRQ and check_deps() functions available to all the memory
buffers by moving them outside of the OCRAM only area.

Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1466603939-7526-5-git-send-email-tthayer@opensource.altera.com
Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Thor Thayer 2016-06-22 08:58:55 -05:00 committed by Borislav Petkov
parent 2b083d65ff
commit 6b300fb953
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/edac/altera_edac.c
View File

@ -825,16 +825,16 @@ static struct platform_driver altr_edac_device_driver = {
}; };
module_platform_driver(altr_edac_device_driver); module_platform_driver(altr_edac_device_driver);
/*********************** OCRAM EDAC Device Functions *********************/ /******************* Arria10 Device ECC Shared Functions *****************/
#ifdef CONFIG_EDAC_ALTERA_OCRAM
/* /*
* Test for memory's ECC dependencies upon entry because platform specific * Test for memory's ECC dependencies upon entry because platform specific
* startup should have initialized the memory and enabled the ECC. * startup should have initialized the memory and enabled the ECC.
* Can't turn on ECC here because accessing un-initialized memory will * Can't turn on ECC here because accessing un-initialized memory will
* cause CE/UE errors possibly causing an ABORT. * cause CE/UE errors possibly causing an ABORT.
*/ */
static int altr_check_ecc_deps(struct altr_edac_device_dev *device) static int __maybe_unused
altr_check_ecc_deps(struct altr_edac_device_dev *device)
{ {
void __iomem *base = device->base; void __iomem *base = device->base;
const struct edac_device_prv_data *prv = device->data; const struct edac_device_prv_data *prv = device->data;
@ -848,6 +848,36 @@ static int altr_check_ecc_deps(struct altr_edac_device_dev *device)
return -ENODEV; return -ENODEV;
} }
static irqreturn_t __maybe_unused altr_edac_a10_ecc_irq(int irq, void *dev_id)
{
struct altr_edac_device_dev *dci = dev_id;
void __iomem *base = dci->base;
if (irq == dci->sb_irq) {
writel(ALTR_A10_ECC_SERRPENA,
base + ALTR_A10_ECC_INTSTAT_OFST);
edac_device_handle_ce(dci->edac_dev, 0, 0, dci->edac_dev_name);
return IRQ_HANDLED;
} else if (irq == dci->db_irq) {
writel(ALTR_A10_ECC_DERRPENA,
base + ALTR_A10_ECC_INTSTAT_OFST);
edac_device_handle_ue(dci->edac_dev, 0, 0, dci->edac_dev_name);
if (dci->data->panic)
panic("\nEDAC:ECC_DEVICE[Uncorrectable errors]\n");
return IRQ_HANDLED;
}
WARN_ON(1);
return IRQ_NONE;
}
/*********************** OCRAM EDAC Device Functions *********************/
#ifdef CONFIG_EDAC_ALTERA_OCRAM
static void *ocram_alloc_mem(size_t size, void **other) static void *ocram_alloc_mem(size_t size, void **other)
{ {
struct device_node *np; struct device_node *np;
@ -882,32 +912,6 @@ static void ocram_free_mem(void *p, size_t size, void *other)
gen_pool_free((struct gen_pool *)other, (u32)p, size); gen_pool_free((struct gen_pool *)other, (u32)p, size);
} }
static irqreturn_t altr_edac_a10_ecc_irq(int irq, void *dev_id)
{
struct altr_edac_device_dev *dci = dev_id;
void __iomem *base = dci->base;
if (irq == dci->sb_irq) {
writel(ALTR_A10_ECC_SERRPENA,
base + ALTR_A10_ECC_INTSTAT_OFST);
edac_device_handle_ce(dci->edac_dev, 0, 0, dci->edac_dev_name);
return IRQ_HANDLED;
} else if (irq == dci->db_irq) {
writel(ALTR_A10_ECC_DERRPENA,
base + ALTR_A10_ECC_INTSTAT_OFST);
edac_device_handle_ue(dci->edac_dev, 0, 0, dci->edac_dev_name);
if (dci->data->panic)
panic("\nEDAC:ECC_DEVICE[Uncorrectable errors]\n");
return IRQ_HANDLED;
}
WARN_ON(1);
return IRQ_NONE;
}
static const struct edac_device_prv_data ocramecc_data = { static const struct edac_device_prv_data ocramecc_data = {
.setup = altr_check_ecc_deps, .setup = altr_check_ecc_deps,
.ce_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_SERR), .ce_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_SERR),