sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/memtest'

This commit is contained in:
Sascha Hauer 2014-05-05 11:05:51 +02:00
parent f8327af20c e013b93977
commit 4626972921
2 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
commands/memtest.c
View File

@ -74,34 +74,25 @@ static int request_memtest_regions(struct list_head *list)
continue; continue;
} }
r = list_first_entry(&bank->res->children,
struct resource, sibling);
start = PAGE_ALIGN(bank->res->start);
end = PAGE_ALIGN_DOWN(r->start);
r_prev = r;
if (start != end) {
size = end - start;
ret = alloc_memtest_region(list, start, size);
if (ret < 0)
return ret;
}
/* /*
* We assume that the regions are sorted in this list * We assume that the regions are sorted in this list
* So the first element has start boundary on bank->res->start * So the first element has start boundary on bank->res->start
* and the last element hast end boundary on bank->res->end * and the last element hast end boundary on bank->res->end.
*
* Between used regions. Start from second entry.
*/ */
list_for_each_entry(r, &bank->res->children, sibling) { list_for_each_entry_from(r, &bank->res->children, sibling) {
/*
* Do on head element for bank boundary
*/
if (r->sibling.prev == &bank->res->children) {
/*
* remember last used element
*/
start = PAGE_ALIGN(bank->res->start);
end = PAGE_ALIGN_DOWN(r->start);
r_prev = r;
if (start == end)
continue;
size = end - start;
ret = alloc_memtest_region(list, start, size);
if (ret < 0)
return ret;
continue;
}
/*
* Between used regions
*/
start = PAGE_ALIGN(r_prev->end); start = PAGE_ALIGN(r_prev->end);
end = PAGE_ALIGN_DOWN(r->start); end = PAGE_ALIGN_DOWN(r->start);
r_prev = r; r_prev = r;
@ -112,21 +103,20 @@ static int request_memtest_regions(struct list_head *list)
ret = alloc_memtest_region(list, start, size); ret = alloc_memtest_region(list, start, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
}
if (list_is_last(&r->sibling, &bank->res->children)) { /*
/* * Do on head element for bank boundary.
* Do on head element for bank boundary */
*/ r = list_last_entry(&bank->res->children,
start = PAGE_ALIGN(r->end); struct resource, sibling);
end = PAGE_ALIGN_DOWN(bank->res->end) - 1; start = PAGE_ALIGN(r->end);
size = end - start + 1; end = PAGE_ALIGN_DOWN(bank->res->end) - 1;
if (start >= end) size = end - start + 1;
continue; if (start < end) {
ret = alloc_memtest_region(list, start, size);
ret = alloc_memtest_region(list, start, size); if (ret < 0)
if (ret < 0) return ret;
return ret;
}
} }
} }
@ -232,12 +222,12 @@ out:
if (ret == -EINTR) if (ret == -EINTR)
printf("\n"); printf("\n");
printf("Memtest failed.\n"); printf("Memtest failed. Error: %d\n", ret);
return 1; return 1;
} else {
printf("Memtest successful.\n");
return 0;
} }
printf("Memtest successful.\n");
return 0;
} }
static const __maybe_unused char cmd_memtest_help[] = static const __maybe_unused char cmd_memtest_help[] =

4
common/memtest.c
View File

@ -1,7 +1,7 @@
/* /*
* memory_test.c * memtest.c
* *
* Copyright (c) 2013 Alexander Aring <aar@pengutronix.de>, Pengutronix * Copyright (C) 2013 Alexander Aring <aar@pengutronix.de>, Pengutronix
* *
* (C) Copyright 2000 * (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.