From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 03/10] common/memtest.c: Refactor mem_test() into three surbroutines
Date: Wed, 13 May 2015 19:54:20 -0700 [thread overview]
Message-ID: <1431572067-4038-3-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1431572067-4038-1-git-send-email-andrew.smirnov@gmail.com>
Original mem_test() was rather long an contained code to perform two
distinct operations. This patch moves that code into two separate
subroutines and converts mem_test into a high level interface that
calls the subroutines.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
common/memtest.c | 105 +++++++++++++++++++++++++++++++++++--------------------
1 file changed, 68 insertions(+), 37 deletions(-)
diff --git a/common/memtest.c b/common/memtest.c
index 9eda788..57e2ad9 100644
--- a/common/memtest.c
+++ b/common/memtest.c
@@ -28,35 +28,22 @@
#include <errno.h>
#include <memtest.h>
-static const resource_size_t bitpattern[] = {
- 0x00000001, /* single bit */
- 0x00000003, /* two adjacent bits */
- 0x00000007, /* three adjacent bits */
- 0x0000000F, /* four adjacent bits */
- 0x00000005, /* two non-adjacent bits */
- 0x00000015, /* three non-adjacent bits */
- 0x00000055, /* four non-adjacent bits */
- 0xAAAAAAAA, /* alternating 1/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 mem_test_bus_integrity(resource_size_t _start,
+ resource_size_t _end)
{
- volatile resource_size_t *start, *dummy, val, readback, offset,
- offset2, pattern, temp, anti_pattern, num_words;
+ static const resource_size_t bitpattern[] = {
+ 0x00000001, /* single bit */
+ 0x00000003, /* two adjacent bits */
+ 0x00000007, /* three adjacent bits */
+ 0x0000000F, /* four adjacent bits */
+ 0x00000005, /* two non-adjacent bits */
+ 0x00000015, /* three non-adjacent bits */
+ 0x00000055, /* four non-adjacent bits */
+ 0xAAAAAAAA, /* alternating 1/0 */
+ };
+
+ volatile resource_size_t *start, *dummy, num_words, val, readback, offset,
+ offset2, pattern, temp, anti_pattern;
int i;
_start = ALIGN(_start, sizeof(resource_size_t));
@@ -66,7 +53,7 @@ int mem_test(resource_size_t _start,
return -EINVAL;
start = (resource_size_t *)_start;
- /*
+ /*
* Point the dummy to start[1]
*/
dummy = start + 1;
@@ -227,15 +214,25 @@ int mem_test(resource_size_t _start,
start[offset2] = pattern;
}
- /*
- * We tested only the bus if != 0
- * leaving here
- */
- if (bus_only)
- return 0;
+ return 0;
+}
+
+int mem_test_dram(resource_size_t _start,
+ resource_size_t _end)
+{
+ volatile resource_size_t *start, num_words, offset, temp, anti_pattern;
+
+ _start = ALIGN(_start, sizeof(resource_size_t));
+ _end = ALIGN_DOWN(_end, sizeof(resource_size_t)) - 1;
+
+ if (_end <= _start)
+ return -EINVAL;
+
+ start = (resource_size_t *)_start;
+ num_words = (_end - _start + 1)/sizeof(resource_size_t);
printf("Starting integrity check of physicaly ram.\n"
- "Filling ram with patterns...\n");
+ "Filling ram with patterns...\n");
/*
* Description: Test the integrity of a physical
@@ -252,16 +249,17 @@ int mem_test(resource_size_t _start,
* Fill memory with a known pattern.
*/
init_progression_bar(num_words);
+
for (offset = 0; offset < num_words; offset++) {
/*
* Every 4K we update the progressbar.
*/
+
if (!(offset & (SZ_4K - 1))) {
if (ctrlc())
return -EINTR;
show_progress(offset);
}
-
start[offset] = offset + 1;
}
show_progress(offset);
@@ -326,3 +324,36 @@ int mem_test(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;
+}
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-05-14 2:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-14 2:54 [PATCH 01/10] common/memtest.c: Fix incorrect array boundary check Andrey Smirnov
2015-05-14 2:54 ` [PATCH 02/10] common/memtest.c: Do not omit offset of 0 from tests Andrey Smirnov
2015-05-14 2:54 ` Andrey Smirnov [this message]
2015-05-14 2:54 ` [PATCH 04/10] common/memtest.c: Distil common error reporting code Andrey Smirnov
2015-05-14 2:54 ` [PATCH 05/10] serial: i.MX: Write settings to a correct register Andrey Smirnov
2015-05-14 2:54 ` [PATCH 06/10] common: pbl: Allow boards to override hang() Andrey Smirnov
2015-05-15 5:25 ` Sascha Hauer
2015-05-23 18:13 ` Andrey Smirnov
2015-05-14 2:54 ` [PATCH 07/10] debug_ll: i.MX: Add support for input to DEBUG_LL Andrey Smirnov
2015-05-14 2:54 ` [PATCH 08/10] i.MX51: babbage: Add UART RXD pin configuration Andrey Smirnov
2015-05-14 2:54 ` [PATCH 09/10] pbl: Implement ctrlc() using getc_ll() Andrey Smirnov
2015-05-14 2:54 ` [PATCH 10/10] ARM: pbl: Add an option to validate DRAM Andrey Smirnov
2015-05-19 7:06 ` Sascha Hauer
2015-05-23 18:48 ` Andrey Smirnov
2015-05-23 20:44 ` Alexander Aring
2015-05-24 18:39 ` Andrey Smirnov
2015-05-26 6:57 ` Sascha Hauer
2015-06-01 13:09 ` Andrey Smirnov
2015-06-03 8:10 ` Sascha Hauer
2015-05-15 5:33 ` [PATCH 01/10] common/memtest.c: Fix incorrect array boundary check Sascha Hauer
2015-05-23 18:20 ` Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431572067-4038-3-git-send-email-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox