diff options
author | Thor Thayer <tthayer@opensource.altera.com> | 2016-06-22 09:58:53 -0400 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2016-06-24 05:58:43 -0400 |
commit | 2b083d65ff11e02b967d9f6e68aea7722eba9ea4 (patch) | |
tree | 1e3259cd887fbf4860fca38b6e515575b4796d67 | |
parent | 44ec9b307ee7392fe187caa71fcb886526efde1d (diff) |
EDAC, altera: Add panic flag check to A10 IRQ
In preparation for additional memory module ECCs, the IRQ function will
check a panic flag before doing a kernel panic on double bit errors.
OCRAM uncorrectable errors cause a panic because sleep/resume functions
and FPGA contents during sleep are stored in OCRAM.
ECCs on peripheral FIFO buffers will not cause a kernel panic on DBERRs
because the packet can be retried and therefore recovered.
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-3-git-send-email-tthayer@opensource.altera.com
Signed-off-by: Borislav Petkov <bp@suse.de>
-rw-r--r-- | drivers/edac/altera_edac.c | 9 | ||||
-rw-r--r-- | drivers/edac/altera_edac.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 453e92c786c8..dcedc4a8cd12 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c | |||
@@ -897,7 +897,8 @@ static irqreturn_t altr_edac_a10_ecc_irq(int irq, void *dev_id) | |||
897 | writel(ALTR_A10_ECC_DERRPENA, | 897 | writel(ALTR_A10_ECC_DERRPENA, |
898 | base + ALTR_A10_ECC_INTSTAT_OFST); | 898 | base + ALTR_A10_ECC_INTSTAT_OFST); |
899 | edac_device_handle_ue(dci->edac_dev, 0, 0, dci->edac_dev_name); | 899 | edac_device_handle_ue(dci->edac_dev, 0, 0, dci->edac_dev_name); |
900 | panic("\nEDAC:ECC_DEVICE[Uncorrectable errors]\n"); | 900 | if (dci->data->panic) |
901 | panic("\nEDAC:ECC_DEVICE[Uncorrectable errors]\n"); | ||
901 | 902 | ||
902 | return IRQ_HANDLED; | 903 | return IRQ_HANDLED; |
903 | } | 904 | } |
@@ -936,6 +937,12 @@ static const struct edac_device_prv_data a10_ocramecc_data = { | |||
936 | .set_err_ofst = ALTR_A10_ECC_INTTEST_OFST, | 937 | .set_err_ofst = ALTR_A10_ECC_INTTEST_OFST, |
937 | .ecc_irq_handler = altr_edac_a10_ecc_irq, | 938 | .ecc_irq_handler = altr_edac_a10_ecc_irq, |
938 | .inject_fops = &altr_edac_a10_device_inject_fops, | 939 | .inject_fops = &altr_edac_a10_device_inject_fops, |
940 | /* | ||
941 | * OCRAM panic on uncorrectable error because sleep/resume | ||
942 | * functions and FPGA contents are stored in OCRAM. Prefer | ||
943 | * a kernel panic over executing/loading corrupted data. | ||
944 | */ | ||
945 | .panic = true, | ||
939 | }; | 946 | }; |
940 | 947 | ||
941 | #endif /* CONFIG_EDAC_ALTERA_OCRAM */ | 948 | #endif /* CONFIG_EDAC_ALTERA_OCRAM */ |
diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h index 62b0fa010f95..cf4e8cb1d120 100644 --- a/drivers/edac/altera_edac.h +++ b/drivers/edac/altera_edac.h | |||
@@ -298,6 +298,7 @@ struct edac_device_prv_data { | |||
298 | irqreturn_t (*ecc_irq_handler)(int irq, void *dev_id); | 298 | irqreturn_t (*ecc_irq_handler)(int irq, void *dev_id); |
299 | int trig_alloc_sz; | 299 | int trig_alloc_sz; |
300 | const struct file_operations *inject_fops; | 300 | const struct file_operations *inject_fops; |
301 | bool panic; | ||
301 | }; | 302 | }; |
302 | 303 | ||
303 | struct altr_edac_device_dev { | 304 | struct altr_edac_device_dev { |