1 From fe78e259c356ef883528c5ec3527c714a5966c0c Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Thu, 14 Jun 2018 15:07:26 +0100
4 Subject: [PATCH] of: configfs: Use of_overlay_fdt_apply API call
6 The published API to the dynamic overlay application mechanism now
7 takes a Flattened Device Tree blob as input so that it can manage the
8 lifetime of the unflattened tree. Conveniently, the new API call -
9 of_overlay_fdt_apply - is virtually a drop-in replacement for
10 create_overlay, which can now be deleted.
12 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
14 drivers/of/configfs.c | 47 +++++++------------------------------------
15 1 file changed, 7 insertions(+), 40 deletions(-)
17 --- a/drivers/of/configfs.c
18 +++ b/drivers/of/configfs.c
19 @@ -40,41 +40,6 @@ struct cfs_overlay_item {
23 -static int create_overlay(struct cfs_overlay_item *overlay, void *blob)
27 - /* unflatten the tree */
28 - of_fdt_unflatten_tree(blob, NULL, &overlay->overlay);
29 - if (overlay->overlay == NULL) {
30 - pr_err("%s: failed to unflatten tree\n", __func__);
34 - pr_debug("%s: unflattened OK\n", __func__);
36 - /* mark it as detached */
37 - of_node_set_flag(overlay->overlay, OF_DETACHED);
39 - /* perform resolution */
40 - err = of_resolve_phandles(overlay->overlay);
42 - pr_err("%s: Failed to resolve tree\n", __func__);
45 - pr_debug("%s: resolved OK\n", __func__);
47 - err = of_overlay_apply(overlay->overlay, &overlay->ov_id);
49 - pr_err("%s: Failed to create overlay (err=%d)\n",
58 static inline struct cfs_overlay_item *to_cfs_overlay_item(
59 struct config_item *item)
61 @@ -115,7 +80,8 @@ static ssize_t cfs_overlay_item_path_sto
65 - err = create_overlay(overlay, (void *)overlay->fw->data);
66 + err = of_overlay_fdt_apply((void *)overlay->fw->data,
67 + (u32)overlay->fw->size, &overlay->ov_id);
71 @@ -136,7 +102,7 @@ static ssize_t cfs_overlay_item_status_s
72 struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
74 return sprintf(page, "%s\n",
75 - overlay->ov_id >= 0 ? "applied" : "unapplied");
76 + overlay->ov_id > 0 ? "applied" : "unapplied");
79 CONFIGFS_ATTR(cfs_overlay_item_, path);
80 @@ -188,7 +154,8 @@ ssize_t cfs_overlay_item_dtbo_write(stru
82 overlay->dtbo_size = count;
84 - err = create_overlay(overlay, overlay->dtbo);
85 + err = of_overlay_fdt_apply(overlay->dtbo, overlay->dtbo_size,
90 @@ -198,6 +165,7 @@ out_err:
93 overlay->dtbo_size = 0;
98 @@ -213,7 +181,7 @@ static void cfs_overlay_release(struct c
100 struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
102 - if (overlay->ov_id >= 0)
103 + if (overlay->ov_id > 0)
104 of_overlay_remove(&overlay->ov_id);
106 release_firmware(overlay->fw);
107 @@ -241,7 +209,6 @@ static struct config_item *cfs_overlay_g
108 overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
110 return ERR_PTR(-ENOMEM);
111 - overlay->ov_id = -1;
113 config_item_init_type_name(&overlay->item, name, &cfs_overlay_type);
114 return &overlay->item;