summaryrefslogtreecommitdiff
path: root/drivers/edac
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-05-14 18:11:24 (GMT)
committerScott Wood <scottwood@freescale.com>2014-05-14 18:12:24 (GMT)
commitffb069a30665ec06c05916355bc3252e33fc863b (patch)
treeba7b82696000c0f2983672d22966b83112da874e /drivers/edac
parent8d5cd1658cb0c97d5429124f9fb5caa88c460186 (diff)
parent3756888c2a2da9c7291d39cacd1184171111b49d (diff)
downloadlinux-fsl-qoriq-ffb069a30665ec06c05916355bc3252e33fc863b.tar.xz
Merge remote-tracking branch 'stable/linux-3.12.y' into sdk-v1.6.x
Signed-off-by: Scott Wood <scottwood@freescale.com> Conflicts: arch/sparc/Kconfig drivers/tty/tty_buffer.c
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/amd64_edac.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 3c9e4e9..d43a620 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1238,9 +1238,17 @@ static u8 f15_m30h_determine_channel(struct amd64_pvt *pvt, u64 sys_addr,
if (num_dcts_intlv == 2) {
select = (sys_addr >> 8) & 0x3;
channel = select ? 0x3 : 0;
- } else if (num_dcts_intlv == 4)
- channel = (sys_addr >> 8) & 0x7;
-
+ } else if (num_dcts_intlv == 4) {
+ u8 intlv_addr = dct_sel_interleave_addr(pvt);
+ switch (intlv_addr) {
+ case 0x4:
+ channel = (sys_addr >> 8) & 0x3;
+ break;
+ case 0x5:
+ channel = (sys_addr >> 9) & 0x3;
+ break;
+ }
+ }
return channel;
}