diff options
author | Borislav Petkov <borislav.petkov@amd.com> | 2011-01-17 07:03:26 -0500 |
---|---|---|
committer | Borislav Petkov <borislav.petkov@amd.com> | 2011-03-17 09:46:22 -0400 |
commit | 355fba600549cfcfab227f928eab3ccae444ec8e (patch) | |
tree | c1b5b554fabcefc656a27c630a2f184d2197692c /drivers/edac | |
parent | 614ec9d8532cc6b2f6b471c399daffdfd1c32d03 (diff) |
amd64_edac: Beef up early exit reporting
Add paranoid checks for the sys address before going off and decoding
it.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'drivers/edac')
-rw-r--r-- | drivers/edac/amd64_edac.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 4bba43e7ee85..e4ad09110b96 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c | |||
@@ -1380,9 +1380,20 @@ static int f10_match_to_this_node(struct amd64_pvt *pvt, int range, | |||
1380 | debugf1("(range %d) SystemAddr= 0x%llx Limit=0x%llx\n", | 1380 | debugf1("(range %d) SystemAddr= 0x%llx Limit=0x%llx\n", |
1381 | range, sys_addr, get_dram_limit(pvt, range)); | 1381 | range, sys_addr, get_dram_limit(pvt, range)); |
1382 | 1382 | ||
1383 | if (dhar_valid(pvt) && | ||
1384 | dhar_base(pvt) <= sys_addr && | ||
1385 | sys_addr < BIT_64(32)) { | ||
1386 | amd64_warn("Huh? Address is in the MMIO hole: 0x%016llx\n", | ||
1387 | sys_addr); | ||
1388 | return -EINVAL; | ||
1389 | } | ||
1390 | |||
1383 | if (intlv_en && | 1391 | if (intlv_en && |
1384 | (intlv_sel != ((sys_addr >> 12) & intlv_en))) | 1392 | (intlv_sel != ((sys_addr >> 12) & intlv_en))) { |
1393 | amd64_warn("Botched intlv bits, en: 0x%x, sel: 0x%x\n", | ||
1394 | intlv_en, intlv_sel); | ||
1385 | return -EINVAL; | 1395 | return -EINVAL; |
1396 | } | ||
1386 | 1397 | ||
1387 | sys_addr = f10_swap_interleaved_region(pvt, sys_addr); | 1398 | sys_addr = f10_swap_interleaved_region(pvt, sys_addr); |
1388 | 1399 | ||