Patchwork [GIT,PULL] EDAC fix for 5.0

login
register
mail settings
Submitter Boris Petkov
Date Jan. 27, 2019, 11:41 a.m.
Message ID <20190127114154.GB3916@zn.tnic>
Download mbox | patch
Permalink /patch/710475/
State New
Headers show

Comments

Boris Petkov - Jan. 27, 2019, 11:41 a.m.
Hi Linus,

please pull this single fix for Altera EDAC below.

Thx.

---
The following changes since commit 49a57857aeea06ca831043acbb0fa5e0f50602fd:

  Linux 5.0-rc3 (2019-01-21 13:14:44 +1300)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_fix_for_5.0

for you to fetch changes up to 245b6c6558128327d330549b23d09594c46f58df:

  EDAC, altera: Fix S10 persistent register offset (2019-01-24 17:13:59 +0100)

----------------------------------------------------------------
Fix persistent register offsets of altera_edac, from Thor Thayer.

----------------------------------------------------------------
Thor Thayer (1):
      EDAC, altera: Fix S10 persistent register offset

 drivers/edac/altera_edac.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
pr-tracker-bot@kernel.org - Jan. 27, 2019, 7:05 p.m.
The pull request you sent on Sun, 27 Jan 2019 12:41:54 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_fix_for_5.0

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/983542434e6beef911d5ae4488c49080a177e5e4

Thank you!

Patch

diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h
index 4213cb0bb2a7..f8664bac9fa8 100644
--- a/drivers/edac/altera_edac.h
+++ b/drivers/edac/altera_edac.h
@@ -295,8 +295,8 @@  struct altr_sdram_mc_data {
 #define S10_SYSMGR_ECC_INTSTAT_DERR_OFST  0xA0
 
 /* Sticky registers for Uncorrected Errors */
-#define S10_SYSMGR_UE_VAL_OFST            0x120
-#define S10_SYSMGR_UE_ADDR_OFST           0x124
+#define S10_SYSMGR_UE_VAL_OFST            0x220
+#define S10_SYSMGR_UE_ADDR_OFST           0x224
 
 #define S10_DDR0_IRQ_MASK                 BIT(16)