Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: memtest: adapt log messages

Browse source 
- print test pattern instead of pattern number,
- show pattern as stored in memory,
- use proper priority flags,
- consistent use of u64 throughout the code

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:28:58 +01:00 committed by Ingo Molnar
parent 7dad169e57
commit 570c9e69aa
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
arch/x86/mm/memtest.c
View file

@ -16,25 +16,22 @@ static u64 patterns[] __initdata = {
0xaaaaaaaaaaaaaaaaULL, 0xaaaaaaaaaaaaaaaaULL,
}; };
static void __init reserve_bad_mem(u64 pattern, unsigned long start_bad, static void __init reserve_bad_mem(u64 pattern, u64 start_bad, u64 end_bad)
unsigned long end_bad)
{ {
printk(KERN_CONT "\n %016llx bad mem addr " printk(KERN_INFO " %016llx bad mem addr %010llx - %010llx reserved\n",
"%010lx - %010lx reserved", (unsigned long long) pattern,
(unsigned long long) pattern, start_bad, end_bad); (unsigned long long) start_bad,
(unsigned long long) end_bad);
reserve_early(start_bad, end_bad, "BAD RAM"); reserve_early(start_bad, end_bad, "BAD RAM");
} }
static void __init memtest(unsigned long start_phys, unsigned long size, static void __init memtest(u64 pattern, u64 start_phys, u64 size)
u64 pattern)
{ {
unsigned long i; u64 i, count;
u64 *start; u64 *start;
unsigned long start_bad; u64 start_bad, last_bad;
unsigned long last_bad; u64 start_phys_aligned;
unsigned long start_phys_aligned; size_t incr;
unsigned long count;
unsigned long incr;
incr = sizeof(pattern); incr = sizeof(pattern);
start_phys_aligned = ALIGN(start_phys, incr); start_phys_aligned = ALIGN(start_phys, incr);
@ -81,7 +78,7 @@ void __init early_memtest(unsigned long start, unsigned long end)
if (!memtest_pattern) if (!memtest_pattern)
return; return;
printk(KERN_INFO "early_memtest: pattern num %d", memtest_pattern); printk(KERN_INFO "early_memtest: # of tests: %d\n", memtest_pattern);
for (i = 0; i < memtest_pattern; i++) { for (i = 0; i < memtest_pattern; i++) {
unsigned int idx = i % ARRAY_SIZE(patterns); unsigned int idx = i % ARRAY_SIZE(patterns);
pattern = patterns[idx]; pattern = patterns[idx];
@ -96,14 +93,13 @@ void __init early_memtest(unsigned long start, unsigned long end)
if (t_start + t_size > end) if (t_start + t_size > end)
t_size = end - t_start; t_size = end - t_start;
printk(KERN_CONT "\n %010llx - %010llx pattern %d", printk(KERN_INFO " %010llx - %010llx pattern %016llx\n",
(unsigned long long)t_start, (unsigned long long) t_start,
(unsigned long long)t_start + t_size, idx); (unsigned long long) t_start + t_size,
(unsigned long long) cpu_to_be64(pattern));
memtest(t_start, t_size, pattern); memtest(pattern, t_start, t_size);
t_start += t_size; t_start += t_size;
} }
} }
printk(KERN_CONT "\n");
} }