korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 14:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86: memtest: introduce array to select memtest patterns

Browse Source 
Impact: code cleanup

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Andreas Herrmann 2009-02-25 11:27:27 +01:00 committed by Ingo Molnar
parent 40823f737e
commit 6d74171bf7
1 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
arch/x86/mm/memtest.c
View File

@ -9,48 +9,25 @@
#include <asm/e820.h> #include <asm/e820.h>
#define _MAX_MEM_PATTERNS 4 static u64 patterns[] __initdata = {
0,
0xffffffffffffffffULL,
0x5555555555555555ULL,
0xaaaaaaaaaaaaaaaaULL,
};
static void __init memtest(unsigned long start_phys, unsigned long size, static void __init memtest(unsigned long start_phys, unsigned long size,
unsigned pattern) u64 pattern)
{ {
unsigned long i; unsigned long i;
unsigned long *start; u64 *start;
unsigned long start_bad; unsigned long start_bad;
unsigned long last_bad; unsigned long last_bad;
unsigned long val;
unsigned long start_phys_aligned; unsigned long start_phys_aligned;
unsigned long count; unsigned long count;
unsigned long incr; unsigned long incr;
pattern = pattern % _MAX_MEM_PATTERNS; incr = sizeof(pattern);
switch (pattern) {
case 0:
val = 0UL;
break;
case 1:
val = -1UL;
break;
case 2:
#ifdef CONFIG_X86_64
val = 0x5555555555555555UL;
#else
val = 0x55555555UL;
#endif
break;
case 3:
#ifdef CONFIG_X86_64
val = 0xaaaaaaaaaaaaaaaaUL;
#else
val = 0xaaaaaaaaUL;
#endif
break;
default:
return;
}
incr = sizeof(unsigned long);
start_phys_aligned = ALIGN(start_phys, incr); start_phys_aligned = ALIGN(start_phys, incr);
count = (size - (start_phys_aligned - start_phys))/incr; count = (size - (start_phys_aligned - start_phys))/incr;
start = __va(start_phys_aligned); start = __va(start_phys_aligned);
@ -58,15 +35,16 @@ static void __init memtest(unsigned long start_phys, unsigned long size,
last_bad = 0; last_bad = 0;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
start[i] = val; start[i] = pattern;
for (i = 0; i < count; i++, start++, start_phys_aligned += incr) { for (i = 0; i < count; i++, start++, start_phys_aligned += incr) {
if (*start != val) { if (*start != pattern) {
if (start_phys_aligned == last_bad + incr) { if (start_phys_aligned == last_bad + incr) {
last_bad += incr; last_bad += incr;
} else { } else {
if (start_bad) { if (start_bad) {
printk(KERN_CONT "\n %016lx bad mem addr %010lx - %010lx reserved", printk(KERN_CONT "\n %016llx bad mem addr %010lx - %010lx reserved",
val, start_bad, last_bad + incr); (unsigned long long) pattern,
start_bad, last_bad + incr);
reserve_early(start_bad, last_bad + incr, "BAD RAM"); reserve_early(start_bad, last_bad + incr, "BAD RAM");
} }
start_bad = last_bad = start_phys_aligned; start_bad = last_bad = start_phys_aligned;
@ -74,8 +52,9 @@ static void __init memtest(unsigned long start_phys, unsigned long size,
} }
} }
if (start_bad) { if (start_bad) {
printk(KERN_CONT "\n %016lx bad mem addr %010lx - %010lx reserved", printk(KERN_CONT "\n %016llx bad mem addr %010lx - %010lx reserved",
val, start_bad, last_bad + incr); (unsigned long long) pattern, start_bad,
last_bad + incr);
reserve_early(start_bad, last_bad + incr, "BAD RAM"); reserve_early(start_bad, last_bad + incr, "BAD RAM");
} }
} }
@ -95,13 +74,16 @@ early_param("memtest", parse_memtest);
void __init early_memtest(unsigned long start, unsigned long end) void __init early_memtest(unsigned long start, unsigned long end)
{ {
u64 t_start, t_size; u64 t_start, t_size;
unsigned pattern; unsigned int i;
u64 pattern;
if (!memtest_pattern) if (!memtest_pattern)
return; return;
printk(KERN_INFO "early_memtest: pattern num %d", memtest_pattern); printk(KERN_INFO "early_memtest: pattern num %d", memtest_pattern);
for (pattern = 0; pattern < memtest_pattern; pattern++) { for (i = 0; i < memtest_pattern; i++) {
unsigned int idx = i % ARRAY_SIZE(patterns);
pattern = patterns[idx];
t_start = start; t_start = start;
t_size = 0; t_size = 0;
while (t_start < end) { while (t_start < end) {
@ -115,8 +97,7 @@ void __init early_memtest(unsigned long start, unsigned long end)
printk(KERN_CONT "\n %010llx - %010llx pattern %d", printk(KERN_CONT "\n %010llx - %010llx pattern %d",
(unsigned long long)t_start, (unsigned long long)t_start,
(unsigned long long)t_start + t_size, (unsigned long long)t_start + t_size, idx);
pattern % _MAX_MEM_PATTERNS);
memtest(t_start, t_size, pattern); memtest(t_start, t_size, pattern);