Skip to content

assists: xlnx_overlay_pl_dt: Move amba_pl to amba rename after overlay tree construction#764

Merged
zeddii merged 1 commit into
devicetree-org:masterfrom
arthokal:defer-amba-rename
May 20, 2026
Merged

assists: xlnx_overlay_pl_dt: Move amba_pl to amba rename after overlay tree construction#764
zeddii merged 1 commit into
devicetree-org:masterfrom
arthokal:defer-amba-rename

Conversation

@arthokal
Copy link
Copy Markdown
Contributor

Issue:
When loading the generated overlay DT on the target, the kernel reports:
OF: resolver: node label 'amba_pl' not found in live devicetree symbols table

Root Cause:
This happens because lopper renames amba_pl to amba early in the flow, before the overlay tree is fully built. The generated overlay then contains inconsistent references that the kernel's OF resolver cannot resolve.

Fix:
Move the amba_pl to amba rename to happen after build_overlay_tree() completes, so all references to amba_pl remain valid during overlay tree construction.

Example Lopper command invocation:
LOPPER_DTC_FLAGS="-b 0 -@" ./lopper.py -O outdir -f --enhanced -i /proj/ssw_xhd/drivers/onkarh/to_aravind/updated_zocl.dtsi /proj/ssw_xhd/drivers/onkarh/to_aravind/apu_linux-chosen.dts system-top-no-pl.dts -- xlnx_overlay_pl_dt psv_cortexa72_0 full --firmware-name=gmio_async_xrt.pdi

…y tree construction

The amba_pl bus is part of the system-device-tree and can be referred via
overlay DT as well. Currently, lopper renames amba_pl to amba early in
the flow (inside prepare_amba_node and build_overlay_tree), before the
overlay tree is fully built. This causes the generated overlay to contain
inconsistent bus references, leading to errors at runtime when loading
the overlay on the target.

Fix this by moving the amba_pl to amba rename to happen after
build_overlay_tree() completes, so all references to amba_pl remain
valid during overlay tree construction.

Signed-off-by: Onkar Harsh <onkar.harsh@amd.com>
Signed-off-by: Aravind Thokala <aravind.thokala@amd.com>
@arthokal arthokal force-pushed the defer-amba-rename branch from 8e639e6 to 9e3ffde Compare May 18, 2026 16:50
@arthokal
Copy link
Copy Markdown
Contributor Author

@onkarharsh , @kedareswararao
Please review.

@arthokal arthokal changed the title assists: xlnx_overlay_pl_dt: Move the logic to rename amba_pl bus to amba at the last assists: xlnx_overlay_pl_dt: Move amba_pl to amba rename after overlay tree construction May 18, 2026
@onkarharsh
Copy link
Copy Markdown
Contributor

Looks good to me, it is co-authored.

@zeddii zeddii merged commit 622b736 into devicetree-org:master May 20, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants