diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-01 08:58:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-01 08:58:31 -0700 |
| commit | 9bebf9f9d5db910ab3bd285749ee0f869d39c642 (patch) | |
| tree | 626877c7665a2f98cbf584bcfa31bf7fa1086c68 | |
| parent | Merge tag 'for-linus' of https://github.com/openrisc/linux (diff) | |
| parent | EDAC/altera: Use correct write width with the INTTEST register (diff) | |
| download | wireguard-linux-9bebf9f9d5db910ab3bd285749ee0f869d39c642.tar.xz wireguard-linux-9bebf9f9d5db910ab3bd285749ee0f869d39c642.zip | |
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
| -rw-r--r-- | drivers/edac/altera_edac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 20333608b983..cae52c654a15 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -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); |