From 8ddb10eae0c0e6936c69b19c21aaa2f6e0433717 Mon Sep 17 00:00:00 2001 From: Chunhe Lan Date: Wed, 31 Aug 2011 10:36:32 +0800 Subject: fdt: Add a do_fixup_by_path_string() function The do_fixup_by_path_string() will set the specified node's property to the value contained in "status". It would just be an inline wrapper for do_fixup_by_path() that calls strlen on the argument. Signed-off-by: Chunhe Lan diff --git a/include/fdt_support.h b/include/fdt_support.h index 8f06aac..0091dc3 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -36,6 +36,13 @@ void do_fixup_by_path(void *fdt, const char *path, const char *prop, const void *val, int len, int create); void do_fixup_by_path_u32(void *fdt, const char *path, const char *prop, u32 val, int create); + +static inline void do_fixup_by_path_string(void *fdt, const char *path, + const char *prop, const char *status) +{ + do_fixup_by_path(fdt, path, prop, status, strlen(status) + 1, 1); +} + void do_fixup_by_prop(void *fdt, const char *pname, const void *pval, int plen, const char *prop, const void *val, int len, -- cgit v0.10.2 From 3c927cccdc930e15cc993e27ac3bee8e15682423 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Tue, 20 Sep 2011 18:24:34 -0500 Subject: fdt: check for fdt errors in fdt_create_phandle fdt_create_phandle() was ignoring errors from fdt_set_phandle(). If an error occurs, print an error message and return 0, which is an invalid phandle. We also need to change the return type for fdt_create_phandle() to indicate that it cannot return an error code. Signed-off-by: Timur Tabi diff --git a/common/fdt_support.c b/common/fdt_support.c index 46aa842..698abf7 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1241,15 +1241,22 @@ int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle) * @fdt: ptr to device tree * @nodeoffset: node to update */ -int fdt_create_phandle(void *fdt, int nodeoffset) +unsigned int fdt_create_phandle(void *fdt, int nodeoffset) { /* see if there is a phandle already */ int phandle = fdt_get_phandle(fdt, nodeoffset); /* if we got 0, means no phandle so create one */ if (phandle == 0) { + int ret; + phandle = fdt_alloc_phandle(fdt); - fdt_set_phandle(fdt, nodeoffset, phandle); + ret = fdt_set_phandle(fdt, nodeoffset, phandle); + if (ret < 0) { + printf("Can't set phandle %u: %s\n", phandle, + fdt_strerror(ret)); + return 0; + } } return phandle; diff --git a/include/fdt_support.h b/include/fdt_support.h index 0091dc3..4826eee 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -97,7 +97,7 @@ int fdt_node_offset_by_compat_reg(void *blob, const char *compat, phys_addr_t compat_off); int fdt_alloc_phandle(void *blob); int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle); -int fdt_create_phandle(void *fdt, int nodeoffset); +unsigned int fdt_create_phandle(void *fdt, int nodeoffset); int fdt_add_edid(void *blob, const char *compat, unsigned char *buf); int fdt_verify_alias_address(void *fdt, int anode, const char *alias, -- cgit v0.10.2 From 50bf17bd15d439b183a29bdb453b65217cfbef3b Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Tue, 20 Sep 2011 18:24:35 -0500 Subject: fdt: update fdt_alloc_phandle to use fdt_get_phandle The device tree compiler, dtc, can use "phandle" and/or "linux,phandle" properties to specify the phandle for any node. By default, it uses both, but "linux,phandle" is deprecated. One day, we'd like to stop using "linux,phandle", but U-boot needs to support both properties equally first. fdt_alloc_phandle() generates a unique phandle, but it was only checking the "linux,phandle" properties. Instead, we use fdt_get_phandle(), which checks both properties automatically. This ensures that we support dtbs that only use "phandle". The side-effect is that fdt_alloc_phandle() now takes twice as long, since it has to check for two properties instead of one in each node that it searches. Signed-off-by: Timur Tabi diff --git a/common/fdt_support.c b/common/fdt_support.c index 698abf7..abf6d53 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1182,14 +1182,11 @@ int fdt_node_offset_by_compat_reg(void *blob, const char *compat, */ int fdt_alloc_phandle(void *blob) { - int offset, len, phandle = 0; - const u32 *val; + int offset, phandle = 0; for (offset = fdt_next_node(blob, -1, NULL); offset >= 0; offset = fdt_next_node(blob, offset, NULL)) { - val = fdt_getprop(blob, offset, "linux,phandle", &len); - if (val) - phandle = max(*val, phandle); + phandle = max(phandle, fdt_get_phandle(blob, offset)); } return phandle + 1; -- cgit v0.10.2 From a2c1229c39e39d9a5ff90055d78b8de061943097 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Tue, 20 Sep 2011 18:24:36 -0500 Subject: powerpc/85xx: use fdt_create_phandle() to create the Fman firmware phandles Function fdt_create_phandle() conveniently creates new phandle properties using both "linux,phandle" and "phandle", so it should be used by all code that wants to create a phandle. The Fman firmware code, which embeds an Fman firmware into the device tree, was creating the phandle properties manually. Instead, change it to use fdt_create_phandle(). Signed-off-by: Timur Tabi diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index d20c94c..9d2d769 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -504,9 +504,8 @@ void fdt_fixup_fman_firmware(void *blob) fdt_strerror(rc)); return; } - phandle = fdt_alloc_phandle(blob); - rc = fdt_setprop_cell(blob, fwnode, "linux,phandle", phandle); - if (rc < 0) { + phandle = fdt_create_phandle(blob, fwnode); + if (!phandle) { char s[64]; fdt_get_path(blob, fwnode, s, sizeof(s)); printf("Could not add phandle property to node %s: %s\n", s, -- cgit v0.10.2