Skip to content

Commit e4c00c9

Browse files
Zijun Hurobherring
authored andcommitted
of: Correct child specifier used as input of the 2nd nexus node
API of_parse_phandle_with_args_map() will use wrong input for nexus node Nexus_2 as shown below: Node_1 Nexus_1 Nexus_2 &Nexus_1,arg_1 -> arg_1,&Nexus_2,arg_2' -> &Nexus_2,arg_2 -> arg_2,... map-pass-thru=<...> Nexus_1's output arg_2 should be used as input of Nexus_2, but the API wrongly uses arg_2' instead which != arg_2 due to Nexus_1's map-pass-thru. Fix by always making @match_array point to @initial_match_array into which to store nexus output. Fixes: bd6f2fd ("of: Support parsing phandle argument lists through a nexus node") Cc: stable@vger.kernel.org Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com> Link: https://lore.kernel.org/r/20250109-of_core_fix-v4-1-db8a72415b8c@quicinc.com Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
1 parent 55e6502 commit e4c00c9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/of/base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,6 @@ int of_parse_phandle_with_args_map(const struct device_node *np,
15361536
* specifier into the out_args structure, keeping the
15371537
* bits specified in <list>-map-pass-thru.
15381538
*/
1539-
match_array = map - new_size;
15401539
for (i = 0; i < new_size; i++) {
15411540
__be32 val = *(map - new_size + i);
15421541

@@ -1545,6 +1544,7 @@ int of_parse_phandle_with_args_map(const struct device_node *np,
15451544
val |= cpu_to_be32(out_args->args[i]) & pass[i];
15461545
}
15471546

1547+
initial_match_array[i] = val;
15481548
out_args->args[i] = be32_to_cpu(val);
15491549
}
15501550
out_args->args_count = list_size = new_size;

0 commit comments

Comments
 (0)