summaryrefslogtreecommitdiff
path: root/drivers/of/unittest-data/overlay_8.dts
diff options
context:
space:
mode:
authorFrank Rowand <frank.rowand@sony.com>2018-02-12 11:19:42 +0300
committerFrank Rowand <frowand.list@gmail.com>2018-03-04 11:29:24 +0300
commit39a751a4cb7e4798f0ce1169ec92de4a1aae39e3 (patch)
tree6946dd93cc2f4bdbe1a3c1b6ae64aa6b566be114 /drivers/of/unittest-data/overlay_8.dts
parent581e929018ce078d0ce0b02780de2f61e858903b (diff)
downloadlinux-39a751a4cb7e4798f0ce1169ec92de4a1aae39e3.tar.xz
of: change overlay apply input data from unflattened to FDT
Move duplicating and unflattening of an overlay flattened devicetree (FDT) into the overlay application code. To accomplish this, of_overlay_apply() is replaced by of_overlay_fdt_apply(). The copy of the FDT (aka "duplicate FDT") now belongs to devicetree code, which is thus responsible for freeing the duplicate FDT. The caller of of_overlay_fdt_apply() remains responsible for freeing the original FDT. The unflattened devicetree now belongs to devicetree code, which is thus responsible for freeing the unflattened devicetree. These ownership changes prevent early freeing of the duplicated FDT or the unflattened devicetree, which could result in use after free errors. of_overlay_fdt_apply() is a private function for the anticipated overlay loader. Update unittest.c to use of_overlay_fdt_apply() instead of of_overlay_apply(). Move overlay fragments from artificial locations in drivers/of/unittest-data/tests-overlay.dtsi into one devicetree source file per overlay. This led to changes in drivers/of/unitest-data/Makefile and drivers/of/unitest.c. - Add overlay directives to the overlay devicetree source files so that dtc will compile them as true overlays into one FDT data chunk per overlay. - Set CFLAGS for drivers/of/unittest-data/testcases.dts so that symbols will be generated for overlay resolution of overlays that are no longer artificially contained in testcases.dts - Unflatten and apply each unittest overlay FDT using of_overlay_fdt_apply(). - Enable the of_resolve_phandles() check for whether the unflattened overlay is detached. This check was previously disabled because the overlays from tests-overlay.dtsi were not unflattened into detached trees. - Other changes to unittest.c infrastructure to manage multiple test FDTs built into the kernel image (access by name instead of arbitrary number). - of_unittest_overlay_high_level(): previously unused code to add properties from the overlay_base devicetree to the live tree was triggered by the restructuring of tests-overlay.dtsi and thus testcases.dts. This exposed two bugs: (1) the need to dup a property before adding it, and (2) property 'name' is auto-generated in the unflatten code and thus will be a duplicate in the __symbols__ node - do not treat this duplicate as an error. Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Diffstat (limited to 'drivers/of/unittest-data/overlay_8.dts')
-rw-r--r--drivers/of/unittest-data/overlay_8.dts15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/of/unittest-data/overlay_8.dts b/drivers/of/unittest-data/overlay_8.dts
new file mode 100644
index 000000000000..5b21c53945a9
--- /dev/null
+++ b/drivers/of/unittest-data/overlay_8.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+/plugin/;
+
+/ {
+ /* overlay_8 */
+ /* overlays 8, 9, 10, 11 application and removal in bad sequence */
+
+ fragment@0 {
+ target-path = "/testcase-data/overlay-node/test-bus/test-unittest8";
+ __overlay__ {
+ status = "okay";
+ };
+ };
+};