Patch "kselftest: dt: Ignore nodes that have ancestors disabled" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    kselftest: dt: Ignore nodes that have ancestors disabled

to the 6.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     kselftest-dt-ignore-nodes-that-have-ancestors-disabl.patch
and it can be found in the queue-6.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 629a3aa6d5219003faa87cf419ad0d9441eb0fb8
Author: Nícolas F. R. A. Prado <nfraprado@xxxxxxxxxxxxx>
Date:   Mon Jul 29 16:56:02 2024 -0400

    kselftest: dt: Ignore nodes that have ancestors disabled
    
    [ Upstream commit 05144ab7b7eaf531fc728fcb79dcf36b621ff42d ]
    
    Filter out nodes that have one of its ancestors disabled as they aren't
    expected to probe.
    
    This removes the following false-positive failures on the
    sc7180-trogdor-lazor-limozeen-nots-r5 platform:
    
    /soc@0/geniqup@8c0000/i2c@894000/proximity@28
    /soc@0/geniqup@ac0000/spi@a90000/ec@0
    /soc@0/remoteproc@62400000/glink-edge/apr
    /soc@0/remoteproc@62400000/glink-edge/apr/service@3
    /soc@0/remoteproc@62400000/glink-edge/apr/service@4
    /soc@0/remoteproc@62400000/glink-edge/apr/service@4/clock-controller
    /soc@0/remoteproc@62400000/glink-edge/apr/service@4/dais
    /soc@0/remoteproc@62400000/glink-edge/apr/service@7
    /soc@0/remoteproc@62400000/glink-edge/apr/service@7/dais
    /soc@0/remoteproc@62400000/glink-edge/apr/service@8
    /soc@0/remoteproc@62400000/glink-edge/apr/service@8/routing
    /soc@0/remoteproc@62400000/glink-edge/fastrpc
    /soc@0/remoteproc@62400000/glink-edge/fastrpc/compute-cb@3
    /soc@0/remoteproc@62400000/glink-edge/fastrpc/compute-cb@4
    /soc@0/remoteproc@62400000/glink-edge/fastrpc/compute-cb@5
    /soc@0/spmi@c440000/pmic@0/pon@800/pwrkey
    
    Fixes: 14571ab1ad21 ("kselftest: Add new test for detecting unprobed Devicetree devices")
    Signed-off-by: Nícolas F. R. A. Prado <nfraprado@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20240729-dt-kselftest-parent-disabled-v2-1-d7a001c4930d@xxxxxxxxxxxxx
    Signed-off-by: Rob Herring (Arm) <robh@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/dt/test_unprobed_devices.sh b/tools/testing/selftests/dt/test_unprobed_devices.sh
index 2d7e70c5ad2d3..5e3f42ef249ee 100755
--- a/tools/testing/selftests/dt/test_unprobed_devices.sh
+++ b/tools/testing/selftests/dt/test_unprobed_devices.sh
@@ -34,8 +34,21 @@ nodes_compatible=$(
 		# Check if node is available
 		if [[ -e "${node}"/status ]]; then
 			status=$(tr -d '\000' < "${node}"/status)
-			[[ "${status}" != "okay" && "${status}" != "ok" ]] && continue
+			if [[ "${status}" != "okay" && "${status}" != "ok" ]]; then
+				if [ -n "${disabled_nodes_regex}" ]; then
+					disabled_nodes_regex="${disabled_nodes_regex}|${node}"
+				else
+					disabled_nodes_regex="${node}"
+				fi
+				continue
+			fi
 		fi
+
+		# Ignore this node if one of its ancestors was disabled
+		if [ -n "${disabled_nodes_regex}" ]; then
+			echo "${node}" | grep -q -E "${disabled_nodes_regex}" && continue
+		fi
+
 		echo "${node}" | sed -e 's|\/proc\/device-tree||'
 	done | sort
 	)