Commit e4c00c9b authored by Zijun Hu's avatar Zijun Hu Committed by Rob Herring (Arm)
Browse files

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: bd6f2fd5 ("of: Support parsing phandle argument lists through a nexus node")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarZijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20250109-of_core_fix-v4-1-db8a72415b8c@quicinc.com


Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
parent 55e6502e

drivers/of/base.c

+1 −1
Original line number Diff line number Diff line
@@ -1536,7 +1536,6 @@ int of_parse_phandle_with_args_map(const struct device_node *np, 
		 * specifier into the out_args structure, keeping the

		 * bits specified in <list>-map-pass-thru.

		 */

		match_array = map - new_size;

		for (i = 0; i < new_size; i++) {

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

			}



			initial_match_array[i] = val;

			out_args->args[i] = be32_to_cpu(val);

		}

		out_args->args_count = list_size = new_size;