Commit 9bebf9f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_urgent_for_v6.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC fix from Borislav Petkov:
 "Limit a register write width in altera_edac to avoid hw errors"

* tag 'edac_urgent_for_v6.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/altera: Use correct write width with the INTTEST register
parents 82dad698 e5ef4cd2

drivers/edac/altera_edac.c

+3 −3
Original line number Diff line number Diff line
@@ -1746,9 +1746,9 @@ altr_edac_a10_device_trig(struct file *file, const char __user *user_buf, 


	local_irq_save(flags);

	if (trig_type == ALTR_UE_TRIGGER_CHAR)

		writel(priv->ue_set_mask, set_addr);

		writew(priv->ue_set_mask, set_addr);

	else

		writel(priv->ce_set_mask, set_addr);

		writew(priv->ce_set_mask, set_addr);



	/* Ensure the interrupt test bits are set */

	wmb();
@@ -1778,7 +1778,7 @@ altr_edac_a10_device_trig2(struct file *file, const char __user *user_buf, 


	local_irq_save(flags);

	if (trig_type == ALTR_UE_TRIGGER_CHAR) {

		writel(priv->ue_set_mask, set_addr);

		writew(priv->ue_set_mask, set_addr);

	} else {

		/* Setup read/write of 4 bytes */

		writel(ECC_WORD_WRITE, drvdata->base + ECC_BLK_DBYTECTRL_OFST);