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

memtest: Fix SDRAM size calculations 

Calculating the size and end of the test region as

  end = PAGE_ALIGN_DOWN(bank->res->end) - 1;
  size = end - start + 1;

is wrong. For an example resource of

  start = 0x80000000, end = 0x8fffffff

end results in:

  end = PAGE_ALIGN_DOWN(0x8fffffff) - 1 = 0x8fffefff

instead of 0x8fffffff. The size is then calculated to

  size = end - start + 1 = 0x8fffefff - 0x80000000 + 1 = 0x0ffff000

instead of 0x10000000

The correct way to do this is to calculate the real size and apply a
PAGE_ALIGN_DOWN afterwards:

  size = PAGE_ALIGN_DOWN(bank->res->end - start + 1) = 0x10000000

Fix this in three different places.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2015-01-26 09:59:32 +01:00
parent ec258b8bd0
commit 33ddaad19a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commands/memtest.c
View File

@ -60,8 +60,7 @@ static int request_memtest_regions(struct list_head *list)
*/
if (list_empty(&bank->res->children)) {
start = PAGE_ALIGN(bank->res->start);
end = PAGE_ALIGN_DOWN(bank->res->end) - 1;
size = end - start + 1;
size = PAGE_ALIGN_DOWN(bank->res->end - start + 1);
ret = alloc_memtest_region(list, start, size);
if (ret < 0)
@ -89,13 +88,13 @@ static int request_memtest_regions(struct list_head *list)
* Between used regions. Start from second entry.
*/
list_for_each_entry_from(r, &bank->res->children, sibling) {
start = PAGE_ALIGN(r_prev->end);
end = PAGE_ALIGN_DOWN(r->start);
start = PAGE_ALIGN(r_prev->end + 1);
end = r->start - 1;
r_prev = r;
if (start >= end)
continue;
size = end - start;
size = PAGE_ALIGN_DOWN(end - start + 1);
ret = alloc_memtest_region(list, start, size);
if (ret < 0)
return ret;
@ -107,8 +106,8 @@ static int request_memtest_regions(struct list_head *list)
r = list_last_entry(&bank->res->children,
struct resource, sibling);
start = PAGE_ALIGN(r->end);
end = PAGE_ALIGN_DOWN(bank->res->end) - 1;
size = end - start + 1;
end = bank->res->end;
size = PAGE_ALIGN_DOWN(end - start + 1);
if (start < end) {
ret = alloc_memtest_region(list, start, size);
if (ret < 0)