EmbeddedPkg/FdtLib: Update FdtLib to v1.4.5

Update the FdtLib so that new APIs provided by FdtLib like
fdt_address_cells, fdt_size_cells etc. can be used.

Reference code:
https://git.kernel.org/pub/scm/utils/dtc/dtc.git/tree/libfdt?h=v1.4.5

Cc: Leif Lindholm <leif.lindholm@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

1 files changed, 30 insertions, 20 deletions

diff --git a/EmbeddedPkg/Library/FdtLib/fdt_rw.c b/EmbeddedPkg/Library/FdtLib/fdt_rw.c
index 7a2bcf3d07..863f2b2e0f 100644
--- a/EmbeddedPkg/Library/FdtLib/fdt_rw.c
+++ b/EmbeddedPkg/Library/FdtLib/fdt_rw.c
@@ -84,9 +84,9 @@ static int _fdt_rw_check_header(void *fdt)
 

 #define FDT_RW_CHECK_HEADER(fdt) \

 	{ \

-		int err; \

-		if ((err = _fdt_rw_check_header(fdt)) != 0) \

-			return err; \

+		int __err; \

+		if ((__err = _fdt_rw_check_header(fdt)) != 0) \

+			return __err; \

 	}

 

 static inline int _fdt_data_size(void *fdt)

@@ -101,6 +101,8 @@ static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen)
 

 	if (((p + oldlen) < p) || ((p + oldlen) > end))

 		return -FDT_ERR_BADOFFSET;

+	if ((p < (char *)fdt) || ((end - oldlen + newlen) < (char *)fdt))

+		return -FDT_ERR_BADOFFSET;

 	if ((end - oldlen + newlen) > ((char *)fdt + fdt_totalsize(fdt)))

 		return -FDT_ERR_NOSPACE;

 	memmove(p + newlen, p + oldlen, end - p - oldlen);

@@ -126,8 +128,7 @@ static int _fdt_splice_struct(void *fdt, void *p,
 	int delta = newlen - oldlen;

 	int err;

 

-	err = _fdt_splice(fdt, p, oldlen, newlen);

-	if (err)

+	if ((err = _fdt_splice(fdt, p, oldlen, newlen)))

 		return err;

 

 	fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta);

@@ -141,8 +142,7 @@ static int _fdt_splice_string(void *fdt, int newlen)
 		+ fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);

 	int err;

 

-	err = _fdt_splice(fdt, p, 0, newlen);

-	if (err)

+	if ((err = _fdt_splice(fdt, p, 0, newlen)))

 		return err;

 

 	fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) + newlen);

@@ -191,17 +191,13 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)
 int fdt_del_mem_rsv(void *fdt, int n)

 {

 	struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n);

-	int err;

 

 	FDT_RW_CHECK_HEADER(fdt);

 

 	if (n >= fdt_num_mem_rsv(fdt))

 		return -FDT_ERR_NOTFOUND;

 

-	err = _fdt_splice_mem_rsv(fdt, re, 1, 0);

-	if (err)

-		return err;

-	return 0;

+	return _fdt_splice_mem_rsv(fdt, re, 1, 0);

 }

 

 static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,

@@ -211,12 +207,11 @@ static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,
 	int err;

 

 	*prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);

-	if (! (*prop))

+	if (!*prop)

 		return oldlen;

 

-	err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen),

-	              FDT_TAGALIGN(len));

-	if (err)

+	if ((err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen),

+				      FDT_TAGALIGN(len))))

 		return err;

 

 	(*prop)->len = cpu_to_fdt32(len);

@@ -274,8 +269,8 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name)
 	return 0;

 }

 

-int fdt_setprop(void *fdt, int nodeoffset, const char *name,

-		const void *val, int len)

+int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name,

+			    int len, void **prop_data)

 {

 	struct fdt_property *prop;

 	int err;

@@ -288,7 +283,22 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name,
 	if (err)

 		return err;

 

-	memcpy(prop->data, val, len);

+	*prop_data = prop->data;

+	return 0;

+}

+

+int fdt_setprop(void *fdt, int nodeoffset, const char *name,

+		const void *val, int len)

+{

+	void *prop_data;

+	int err;

+

+	err = fdt_setprop_placeholder(fdt, nodeoffset, name, len, &prop_data);

+	if (err)

+		return err;

+

+	if (len)

+		memcpy(prop_data, val, len);

 	return 0;

 }

 

@@ -327,7 +337,7 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name)
 	FDT_RW_CHECK_HEADER(fdt);

 

 	prop = fdt_get_property_w(fdt, nodeoffset, name, &len);

-	if (! prop)

+	if (!prop)

 		return len;

 

 	proplen = sizeof(*prop) + FDT_TAGALIGN(len);