Commit a8bf7527 authored by Rob Herring's avatar Rob Herring
Browse files

of: create unflatten_and_copy_device_tree 



Several architectures using DT support built-in dtb's in the init
section. These platforms need to copy the dtb from init since the
strings are referenced after unflattening. Every arch has their own
copying routine which do the same thing. Create a common function,
unflatten_and_copy_device_tree, to copy the dtb when unflattening the
dtb.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant Likely <grant.likely@linaro.org>
parent bbf28b50

drivers/of/fdt.c

+24 −0
Original line number Diff line number Diff line
@@ -802,6 +802,30 @@ void __init unflatten_device_tree(void) 
	of_alias_scan(early_init_dt_alloc_memory_arch);

}



/**

 * unflatten_and_copy_device_tree - copy and create tree of device_nodes from flat blob

 *

 * Copies and unflattens the device-tree passed by the firmware, creating the

 * tree of struct device_node. It also fills the "name" and "type"

 * pointers of the nodes so the normal device-tree walking functions

 * can be used. This should only be used when the FDT memory has not been

 * reserved such is the case when the FDT is built-in to the kernel init

 * section. If the FDT memory is reserved already then unflatten_device_tree

 * should be used instead.

 */

void __init unflatten_and_copy_device_tree(void)

{

	int size = __be32_to_cpu(initial_boot_params->totalsize);

	void *dt = early_init_dt_alloc_memory_arch(size,

		__alignof__(struct boot_param_header));



	if (dt) {

		memcpy(dt, initial_boot_params, size);

		initial_boot_params = dt;

	}

	unflatten_device_tree();

}



#endif /* CONFIG_OF_EARLY_FLATTREE */



/* Feed entire flattened device tree into the random pool */

include/linux/of_fdt.h

+2 −0
Original line number Diff line number Diff line
@@ -118,9 +118,11 @@ extern int early_init_dt_scan_root(unsigned long node, const char *uname, 


/* Other Prototypes */

extern void unflatten_device_tree(void);

extern void unflatten_and_copy_device_tree(void);

extern void early_init_devtree(void *);

#else /* CONFIG_OF_FLATTREE */

static inline void unflatten_device_tree(void) {}

static inline void unflatten_and_copy_device_tree(void) {}

#endif /* CONFIG_OF_FLATTREE */



#endif /* __ASSEMBLY__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE