mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 1/2] memtest: Adjust code for 64-bit architectures
Date: Mon, 17 Sep 2018 22:03:42 -0700	[thread overview]
Message-ID: <20180918050343.19637-1-andrew.smirnov@gmail.com> (raw)

Make use of %pa specifier to avoid warnings when building against
64-bit CPU (specifically AArch64) as well as adjust a number of
patterns to be 64-bits wide.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 commands/memtest.c |  5 ++---
 common/memtest.c   | 35 ++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/commands/memtest.c b/commands/memtest.c
index 99d4864e7..403ab91f6 100644
--- a/commands/memtest.c
+++ b/commands/memtest.c
@@ -33,9 +33,8 @@ static int do_test_one_area(struct mem_test_resource *r, int bus_only,
 {
 	int ret;
 
-	printf("Testing memory space: "
-			"0x%08x -> 0x%08x:\n",
-			r->r->start,  r->r->end);
+	printf("Testing memory space: %pa -> %pa:\n",
+	       &r->r->start,  &r->r->end);
 
 	remap_range((void *)r->r->start, r->r->end -
 			r->r->start + 1, cache_flag);
diff --git a/common/memtest.c b/common/memtest.c
index 0fc204675..5c96d46e9 100644
--- a/common/memtest.c
+++ b/common/memtest.c
@@ -160,24 +160,29 @@ static void mem_test_report_failure(const char *failure_description,
 				    resource_size_t actual_value,
 				    volatile resource_size_t *address)
 {
+	/*
+	 * expected_value and actual_value below are not really
+	 * pointers, but we want them to be printed exactly the same
+	 * as pointers would, so we use %pa regardless
+	 */
 	printf("FAILURE (%s): "
-	       "expected 0x%08x, actual 0x%08x at address 0x%08x.\n",
-	       failure_description, expected_value, actual_value,
-	       (resource_size_t)address);
+	       "expected %pa, actual %pa at address %pa.\n",
+	       failure_description, &expected_value, &actual_value,
+	       &address);
 }
 
 int mem_test_bus_integrity(resource_size_t _start,
 			   resource_size_t _end)
 {
-	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 */
+	static const uint64_t bitpattern[] = {
+		0x0000000000000001ULL,	/* single bit */
+		0x0000000000000003ULL,	/* two adjacent bits */
+		0x0000000000000007ULL,	/* three adjacent bits */
+		0x000000000000000FULL,	/* four adjacent bits */
+		0x0000000000000005ULL,	/* two non-adjacent bits */
+		0x0000000000000015ULL,	/* three non-adjacent bits */
+		0x0000000000000055ULL,	/* four non-adjacent bits */
+		0xAAAAAAAAAAAAAAAAULL,	/* alternating 1/0 */
 	};
 
 	volatile resource_size_t *start, *dummy, num_words, val, readback, offset,
@@ -217,7 +222,7 @@ int mem_test_bus_integrity(resource_size_t _start,
 	 * pattern and ~pattern).
 	 */
 	for (i = 0; i < ARRAY_SIZE(bitpattern); i++) {
-		val = bitpattern[i];
+		val = (resource_size_t)bitpattern[i];
 
 		for (; val != 0; val <<= 1) {
 			*start = val;
@@ -282,8 +287,8 @@ int mem_test_bus_integrity(resource_size_t _start,
 	 *              01ffffff is perfect.
 	 */
 
-	pattern = 0xAAAAAAAA;
-	anti_pattern = 0x55555555;
+	pattern = (resource_size_t)0xAAAAAAAAAAAAAAAAULL;
+	anti_pattern = (resource_size_t)0x5555555555555555ULL;
 
 	/*
 	 * Write the default pattern at each of the
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2018-09-18  5:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-18  5:03 Andrey Smirnov [this message]
2018-09-18  5:03 ` [PATCH 2/2] memtest: Make use of resource_size() Andrey Smirnov
2018-09-19  7:32 ` [PATCH 1/2] memtest: Adjust code for 64-bit architectures Sascha Hauer

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=20180918050343.19637-1-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