diff options
| -rw-r--r-- | commands/memtest.c | 9 | ||||
| -rw-r--r-- | common/memtest.c | 36 | ||||
| -rw-r--r-- | include/memtest.h | 4 |
3 files changed, 11 insertions, 38 deletions
diff --git a/commands/memtest.c b/commands/memtest.c index db9e3dbb01..ccccc9c19e 100644 --- a/commands/memtest.c +++ b/commands/memtest.c @@ -41,7 +41,14 @@ static int __do_memtest(struct list_head *memtest_regions, remap_range((void *)r->r->start, r->r->end - r->r->start + 1, cache_flag); - ret = mem_test(r->r->start, r->r->end, bus_only); + ret = mem_test_bus_integrity(r->r->start, r->r->end); + if (ret < 0) + return ret; + + if (bus_only) + continue; + + ret = mem_test_moving_inversions(r->r->start, r->r->end); if (ret < 0) return ret; printf("done.\n\n"); diff --git a/common/memtest.c b/common/memtest.c index 467eea546d..4a84dc3b54 100644 --- a/common/memtest.c +++ b/common/memtest.c @@ -331,8 +331,7 @@ int mem_test_bus_integrity(resource_size_t _start, return 0; } -int mem_test_dram(resource_size_t _start, - resource_size_t _end) +int mem_test_moving_inversions(resource_size_t _start, resource_size_t _end) { volatile resource_size_t *start, num_words, offset, temp, anti_pattern; @@ -438,36 +437,3 @@ int mem_test_dram(resource_size_t _start, return 0; } - -/* - * Perform a memory test. The complete test - * loops until interrupted by ctrl-c. - * - * Prameters: - * start: start address for memory test. - * end: end address of memory test. - * bus_only: skip integrity check and do only a address/data bus - * testing. - * - * Return value can be -EINVAL for invalid parameter or -EINTR - * if memory test was interrupted. - */ -int mem_test(resource_size_t _start, - resource_size_t _end, int bus_only) -{ - int ret; - - ret = mem_test_bus_integrity(_start, _end); - - if (ret < 0) - return ret; - - /* - * We tested only the bus if != 0 - * leaving here - */ - if (!bus_only) - ret = mem_test_dram(_start, _end); - - return ret; -} diff --git a/include/memtest.h b/include/memtest.h index 1c67a73e74..3979d651d6 100644 --- a/include/memtest.h +++ b/include/memtest.h @@ -11,7 +11,7 @@ struct mem_test_resource { int mem_test_request_regions(struct list_head *list); void mem_test_release_regions(struct list_head *list); -int mem_test(resource_size_t _start, - resource_size_t _end, int bus_only); +int mem_test_bus_integrity(resource_size_t _start, resource_size_t _end); +int mem_test_moving_inversions(resource_size_t _start, resource_size_t _end); #endif /* __MEMTEST_H */ |