Patchwork [U-Boot,v2,21/21] sandbox: Allow hash functions to work correctly

login
register
mail settings
Submitter Simon Glass
Date Feb. 20, 2013, 4:58 p.m.
Message ID <1361379515-23802-22-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/222128/
State Superseded, archived
Headers show

Comments

Simon Glass - Feb. 20, 2013, 4:58 p.m.
Use map_sysmem() so that hashing is possible on sandbox.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Rebase on top of earlier patches

 common/hash.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

Patch

diff --git a/common/hash.c b/common/hash.c
index 984cbe4..1c33ef7 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -28,6 +28,7 @@ 
 #include <hash.h>
 #include <sha1.h>
 #include <sha256.h>
+#include <asm/io.h>
 
 /*
  * These are the hash algorithms we support. Chips which support accelerated
@@ -112,10 +113,13 @@  static void store_result(struct hash_algo *algo, const u8 *sum,
 		str_ptr = '\0';
 		setenv(dest, str_output);
 	} else {
-		u8 *ptr;
+		ulong addr;
+		void *buf;
 
-		ptr = (u8 *)simple_strtoul(dest, NULL, 16);
-		memcpy(ptr, sum, algo->digest_size);
+		addr = simple_strtoul(dest, NULL, 16);
+		buf = map_sysmem(addr, algo->digest_size);
+		memcpy(buf, sum, algo->digest_size);
+		unmap_sysmem(buf);
 	}
 }
 
@@ -149,10 +153,12 @@  static int parse_verify_sum(struct hash_algo *algo, char *verify_str, u8 *vsum,
 	}
 
 	if (env_var) {
-		u8 *ptr;
+		ulong addr;
+		void *buf;
 
-		ptr = (u8 *)simple_strtoul(verify_str, NULL, 16);
-		memcpy(vsum, ptr, algo->digest_size);
+		addr = simple_strtoul(verify_str, NULL, 16);
+		buf = map_sysmem(addr, algo->digest_size);
+		memcpy(vsum, buf, algo->digest_size);
 	} else {
 		unsigned int i;
 		char *vsum_str;
@@ -223,6 +229,7 @@  int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
 		struct hash_algo *algo;
 		u8 output[HASH_MAX_DIGEST_SIZE];
 		u8 vsum[HASH_MAX_DIGEST_SIZE];
+		void *buf;
 
 		algo = find_hash_algo(algo_name);
 		if (!algo) {
@@ -236,8 +243,9 @@  int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
 			return 1;
 		}
 
-		algo->hash_func_ws((const unsigned char *)addr, len, output,
-				   algo->chunk_size);
+		buf = map_sysmem(addr, len);
+		algo->hash_func_ws(buf, len, output, algo->chunk_size);
+		unmap_sysmem(buf);
 
 		/* Try to avoid code bloat when verify is not needed */
 #ifdef CONFIG_HASH_VERIFY