summaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2010-12-06 16:20:25 +0100
committerBorislav Petkov <borislav.petkov@amd.com>2010-12-08 19:52:54 +0100
commite726f3c368e7c1919a7166ec09c5705759f1a69d (patch)
treef52fadab84c20e05afdd89cb620827ebccb37d1c /drivers/edac
parent76f04f2591e60fa76e70a2736965bc810bf1c764 (diff)
downloadop-kernel-dev-e726f3c368e7c1919a7166ec09c5705759f1a69d.zip
op-kernel-dev-e726f3c368e7c1919a7166ec09c5705759f1a69d.tar.gz
amd64_edac: Fix interleaving check
When matching error address to the range contained by one memory node, we're in valid range when node interleaving 1. is disabled, or 2. enabled and when the address bits we interleave on match the interleave selector on this node (see the "Node Interleaving" section in the BKDG for an enlightening example). Thus, when we early-exit, we need to reverse the compound logic statement properly. Cc: <stable@kernel.org> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/amd64_edac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 8521401..eca9ba1 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1572,7 +1572,7 @@ static int f10_match_to_this_node(struct amd64_pvt *pvt, int dram_range,
debugf1(" HoleOffset=0x%x HoleValid=0x%x IntlvSel=0x%x\n",
hole_off, hole_valid, intlv_sel);
- if (intlv_en ||
+ if (intlv_en &&
(intlv_sel != ((sys_addr >> 12) & intlv_en)))
return -EINVAL;
OpenPOWER on IntegriCloud