From: Thor Thayer <ttha...@opensource.altera.com>

Disable IRQs while injecting SDRAM errors. The RT patches exposed
a spinlock deadlock where the spinlock taken for the regmap write
deadlocked with the IRQ clear regmap write.
Error injection is not normally enabled for ECC but only for
testing.

Signed-off-by: Thor Thayer <ttha...@opensource.altera.com>
---
 drivers/edac/altera_edac.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index 58d3e2b..6421cc3 100644
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -153,13 +153,17 @@ static ssize_t altr_sdr_mc_err_inject_write(struct file 
*file,
        if (count == 3) {
                edac_printk(KERN_ALERT, EDAC_MC,
                            "Inject Double bit error\n");
+               local_irq_disable();
                regmap_write(drvdata->mc_vbase, priv->ce_ue_trgr_offset,
                             (read_reg | priv->ue_set_mask));
+               local_irq_enable();
        } else {
                edac_printk(KERN_ALERT, EDAC_MC,
                            "Inject Single bit error\n");
+               local_irq_disable();
                regmap_write(drvdata->mc_vbase, priv->ce_ue_trgr_offset,
                             (read_reg | priv->ce_set_mask));
+               local_irq_enable();
        }
 
        ptemp[0] = 0x5A5A5A5A;
-- 
1.7.9.5

Reply via email to