ipq5018-nss: fix wifi node labels so ipq5018 DTBs build - #121
Open
AugustoAmaral wants to merge 1 commit into
Open
ipq5018-nss: fix wifi node labels so ipq5018 DTBs build#121AugustoAmaral wants to merge 1 commit into
AugustoAmaral wants to merge 1 commit into
Conversation
The three radio-priority blocks at the end of ipq5018-nss.dtsi reference
&wifi0, &wifi1 and &wifi2, and none of the three resolves on ipq5018:
- the internal radio label is &wifi (ipq5018.dtsi), so &wifi0 exists on
no board at all;
- &wifi1/&wifi2 are defined in ipq5018-qcn6122.dtsi, which every board
includes *after* ipq5018-nss.dtsi, and dtc requires a label to be
defined before it is referenced.
So the DTB build fails on every board that includes ipq5018-nss.dtsi:
gl-b3000, wrc-x3000gs2 and, through ipq5018-mx-base.dtsi, mr5500,
mx2000, mx5500, mx6200 and spnmx56.
Error: ipq5018-nss.dtsi:118.1-7 Label or path wifi0 not found
Error: ipq5018-nss.dtsi:123.1-7 Label or path wifi1 not found
Error: ipq5018-nss.dtsi:128.1-7 Label or path wifi2 not found
FATAL ERROR: Syntax error parsing input tree
Move the annotations to where the labels are defined rather than
dropping them: nss-radio-priority is what allocates the wifili thread
scheme in ath11k_nss_pdev_init(), so boards with an offloaded radio do
want it.
- the internal 2.4GHz radio keeps priority 0, now via &wifi in
ipq5018-nss.dtsi, which is the correct label on every ipq5018 board;
- the two QCN6122 instances keep priority 1, set directly in their
nodes in ipq5018-qcn6122.dtsi, so they resolve wherever that dtsi is
included and regardless of include order.
Boards whose 5GHz radio sits on PCIe (QCN9074/QCN9024) have no global
label for it and set nss-radio-priority in their own wifi@0,0 node
instead.
Note that boards including ipq5018-qcn6122.dtsi without enabling NSS now
carry nss-radio-priority on those nodes as well; the property is only
read on the NSS path, so it is inert there.
Build tested with dtc on 6.12: all seven affected boards now produce a
DTB, and gl-b3000 keeps the same three radios at the same priorities as
before.
Signed-off-by: Augusto Amaral <contact@augustoamaral.com>
This was referenced Aug 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The dtsi's three radio-priority blocks reference
&wifi0,&wifi1and&wifi2(ipq807x radio naming), and none of the three resolves on ipq5018:&wifi(ipq5018.dtsi), so&wifi0exists on no board at all;&wifi1/&wifi2are defined inipq5018-qcn6122.dtsi, which every board includes afteripq5018-nss.dtsi, and dtc requires a label to be defined before it is referenced.So the DTB build currently fails on every board that includes the dtsi — gl-b3000, wrc-x3000gs2 and, through
ipq5018-mx-base.dtsi, mr5500, mx2000, mx5500, mx6200 and spnmx56:Rather than dropping the annotations, this moves them to where the labels are defined.
nss-radio-priorityis what allocates the wifili thread scheme inath11k_nss_pdev_init(), so boards with an offloaded radio do want it:&wifiinipq5018-nss.dtsi— the correct label on every ipq5018 board;ipq5018-qcn6122.dtsi, so they resolve wherever that dtsi is included and regardless of include order.Boards whose 5 GHz radio sits on PCIe (QCN9074/QCN9024) have no global label for it and set
nss-radio-priorityin their ownwifi@0,0node instead — done for the AX6000 in the follow-up PR.Note: boards that include
ipq5018-qcn6122.dtsiwithout enabling NSS now carry the property on those nodes as well; it is only read on the NSS path, so it is inert there.Build tested with dtc on 6.12: all seven affected boards produce a DTB, and gl-b3000 keeps the same three radios at the same priorities as before. Thanks to @LS3434 for pushing back on the earlier version of this patch, which simply removed the blocks.
Re-opened as a new PR: the original was closed automatically by GitHub when my fork got detached. Same content, new fork.