From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753293AbbJQRP7 (ORCPT ); Sat, 17 Oct 2015 13:15:59 -0400 Received: from h1446028.stratoserver.net ([85.214.92.142]:59607 "EHLO mail.ahsoftware.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932247AbbJQRP5 (ORCPT ); Sat, 17 Oct 2015 13:15:57 -0400 From: Alexander Holler To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Andrew Morton , Greg Kroah-Hartman , Russell King , Grant Likely , Alexander Holler Subject: [PATCH 07/14] dtc: deps: introduce new (virtual) property no-dependencies Date: Sat, 17 Oct 2015 19:14:20 +0200 Message-Id: <1445102067-11519-8-git-send-email-holler@ahsoftware.de> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1445102067-11519-1-git-send-email-holler@ahsoftware.de> References: <1445102067-11519-1-git-send-email-holler@ahsoftware.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In some cases it makes sense to handle some phandles not as dependencies. This is escpecially true for 'remote-endpoint' properties, because these otherwise introducing dependency cycles into the graph. To avoid these, one end of each remote-endpoint pairs has not to be handled as a dependency. The syntax is like foo { remote-endpoint = <&bar>; }; bar { remote-endpoint = <&foo>; no-dependencies = <&foo>; }; Without that 'no-dependencies' property dtc would automatically add a dependency to foo to the property 'dependencies' of the node bar. But with that 'no-dependencies' it will not automatically add the listed dependencies. The property 'no-dependencies' is virtual property and will not be added to any output file. Signed-off-by: Alexander Holler --- scripts/dtc/dependencies.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/scripts/dtc/dependencies.c b/scripts/dtc/dependencies.c index dd4658c..77d5c54 100644 --- a/scripts/dtc/dependencies.c +++ b/scripts/dtc/dependencies.c @@ -44,6 +44,23 @@ static bool is_parent_of(struct node *node1, struct node *node2) } +static bool is_no_dependency(struct node *dt, struct property *prop, cell_t ph) +{ + struct node *node; + unsigned i; + cell_t *cell = (cell_t *)(prop->val.val); + + for (i = 0; i < prop->val.len/4; ++i) { + node = get_node_by_phandle(dt, cpu_to_fdt32(*cell++)); + if (node) { + node = find_compatible_not_disabled(node); + if (node && get_node_phandle(dt, node) == ph) + return true; + } + } + return false; +} + static void add_deps(struct node *dt, struct node *node, struct property *prop) { struct marker *m = prop->val.markers; @@ -73,6 +90,10 @@ static void add_deps(struct node *dt, struct node *node, struct property *prop) is_parent_of(target, source)) continue; phandle = get_node_phandle(dt, target); + prop_deps = get_property(node, "no-dependencies"); + if (prop_deps && is_no_dependency(dt, prop_deps, phandle)) + /* avoid adding non-dependencies */ + continue; prop_deps = get_property(source, "dependencies"); if (!prop_deps) { add_property(source, @@ -102,7 +123,19 @@ static void process_nodes_props(struct node *dt, struct node *node) process_nodes_props(dt, child); } +static void del_prop_no_dependencies(struct node *node) +{ + struct node *child; + + if (!node) + return; + delete_property_by_name(node, "no-dependencies"); + for_each_child(node, child) + del_prop_no_dependencies(child); +} + void add_dependencies(struct boot_info *bi) { process_nodes_props(bi->dt, bi->dt); + del_prop_no_dependencies(bi->dt); } -- 2.1.0