commit a5ea3a271bbaa10f03115ffe3f473a07ca95c5ab
author Julius Werner <jwerner@chromium.org> Tue May 07 17:38:12 2019 -0700
committer Patrick Georgi <pgeorgi@google.com> Thu May 23 08:44:34 2019 +0000
tree 072ddb0753caac8b7b82b0517e165c33a8d42b8d
parent b3f852fba3cfd4ebde8cd7a34df069ba4cebe7a1

device_tree: Use be32dec/be32enc where appropriate

This patch rewrites some of the device tree code to use the new
be32dec/be32enc helpers where they can make the code cleaner.

Change-Id: I437bbd6645a556ae9a0cfe6ea14638098e4c3606
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32860
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/lib/device_tree.c

diff --git a/src/lib/device_tree.c b/src/lib/device_tree.c
index 79561a6..8dbc510 100644
--- a/src/lib/device_tree.c
+++ b/src/lib/device_tree.c
@@ -56,7 +56,7 @@
 int fdt_node_name(const void *blob, uint32_t offset, const char **name)
 {
 	uint8_t *ptr = ((uint8_t *)blob) + offset;
-	if (be32toh(*(uint32_t *)ptr) != FDT_TOKEN_BEGIN_NODE)
+	if (be32dec(ptr) != FDT_TOKEN_BEGIN_NODE)
 		return 0;
 
 	ptr += 4;
@@ -358,14 +358,14 @@
 	uint8_t *dstruct = (uint8_t *)*struct_start;
 	uint8_t *dstrings = (uint8_t *)*strings_start;
 
-	*((uint32_t *)dstruct) = htobe32(FDT_TOKEN_PROPERTY);
+	be32enc(dstruct, FDT_TOKEN_PROPERTY);
 	dstruct += sizeof(uint32_t);
 
-	*((uint32_t *)dstruct) = htobe32(prop->prop.size);
+	be32enc(dstruct, prop->prop.size);
 	dstruct += sizeof(uint32_t);
 
 	uint32_t name_offset = (uintptr_t)dstrings - (uintptr_t)strings_base;
-	*((uint32_t *)dstruct) = htobe32(name_offset);
+	be32enc(dstruct, name_offset);
 	dstruct += sizeof(uint32_t);
 
 	strcpy((char *)dstrings, prop->prop.name);
@@ -385,7 +385,7 @@
 	uint8_t *dstruct = (uint8_t *)*struct_start;
 	uint8_t *dstrings = (uint8_t *)*strings_start;
 
-	*((uint32_t *)dstruct) = htobe32(FDT_TOKEN_BEGIN_NODE);
+	be32enc(dstruct, FDT_TOKEN_BEGIN_NODE);
 	dstruct += sizeof(uint32_t);
 
 	strcpy((char *)dstruct, node->name);
@@ -401,7 +401,7 @@
 		dt_flatten_node(child, (void **)&dstruct, strings_base,
 				(void **)&dstrings);
 
-	*((uint32_t *)dstruct) = htobe32(FDT_TOKEN_END_NODE);
+	be32enc(dstruct, FDT_TOKEN_END_NODE);
 	dstruct += sizeof(uint32_t);
 
 	*struct_start = dstruct;
@@ -489,9 +489,9 @@
 	struct device_tree_property *prop;
 	list_for_each(prop, node->properties, list_node) {
 		if (addrcp && !strcmp("#address-cells", prop->prop.name))
-			*addrcp = be32toh(*(u32 *)prop->prop.data);
+			*addrcp = be32dec(prop->prop.data);
 		if (sizecp && !strcmp("#size-cells", prop->prop.name))
-			*sizecp = be32toh(*(u32 *)prop->prop.data);
+			*sizecp = be32dec(prop->prop.data);
 	}
 }