EDAC, altera: Disable IRQs while injecting SDRAM errors (90e493d7) · Commits · 戴 / test

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 <tthayer@opensource.altera.com> Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/1476906827-9412-1-git-send-email-tthayer@opensource.altera.com Signed-off-by:

Borislav Petkov <bp@suse.de>

drivers/edac/altera_edac.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -153,13 +153,17 @@ static ssize_t altr_sdr_mc_err_inject_write(struct file *file,
	if (count == 3) {		if (count == 3) {
	edac_printk(KERN_ALERT, EDAC_MC,		edac_printk(KERN_ALERT, EDAC_MC,
	"Inject Double bit error\n");		"Inject Double bit error\n");
			local_irq_disable();
	regmap_write(drvdata->mc_vbase, priv->ce_ue_trgr_offset,		regmap_write(drvdata->mc_vbase, priv->ce_ue_trgr_offset,
	(read_reg \| priv->ue_set_mask));		(read_reg \| priv->ue_set_mask));
			local_irq_enable();
	} else {		} else {
	edac_printk(KERN_ALERT, EDAC_MC,		edac_printk(KERN_ALERT, EDAC_MC,
	"Inject Single bit error\n");		"Inject Single bit error\n");
			local_irq_disable();
	regmap_write(drvdata->mc_vbase, priv->ce_ue_trgr_offset,		regmap_write(drvdata->mc_vbase, priv->ce_ue_trgr_offset,
	(read_reg \| priv->ce_set_mask));		(read_reg \| priv->ce_set_mask));
			local_irq_enable();
	}		}

	ptemp[0] = 0x5A5A5A5A;		ptemp[0] = 0x5A5A5A5A;

Admin message