Repository navigation
Conversation
The device tree checks reject aliases with '_'. 372e69a ("kboot: Use new ACIO aliases") let the ACIO, PCIe adapter and NHI lookups fall back to the hyphenated spelling, but dt_set_pcie_tunables() still looks only for usb4_N_pcie. A board that names its PCIe-C node usb4-N-pcie, as the J813's rear USB4 port wants to, gets no PCIe-C tunables. Fall back to usb4-N-pcie the same way. The underscored alias stays first, so existing device trees are unaffected. The test runs the production function against real FDTs with either spelling, both, and the old one. Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
Describe ACIO1, its mailbox and LSTX pin, and the PCIe-C tunnel. Populate both DARTs under their powered parents. Use connector port 4 so the existing DisplayPort alternate-mode route can retain port 3. Name the PCIe-C tunable alias usb4-1-pcie, as t6040-usb4.dtsi does; aura looks it up under that spelling since aurora-silicon/aura#302. Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
|
This also affects a board in |
|
J616s (T6040) row with this PR stacked on current main, as an aura-try Stage 2 trial on the production kernel: the production Stage 2 logs |
Describe ACIO1, its mailbox and LSTX pin, and the PCIe-C tunnel. Populate both DARTs under their powered parents. Use connector port 4 so the existing DisplayPort alternate-mode route can retain port 3. Name the PCIe-C tunable alias usb4-1-pcie, as t6040-usb4.dtsi does; aura looks it up under that spelling since aurora-silicon/aura#302. Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The device tree checks reject aliases containing
_. 372e69a ("kboot: Use new ACIO aliases") made the ACIO, PCIe adapter and NHI lookups fall back to the hyphenated names, butdt_set_pcie_tunables()still looks only forusb4_N_pcie. A board that names its PCIe-C nodeusb4-N-pciegets no PCIe-C tunables.This came up on the J813's rear USB4 port, aurora-silicon/linux#2142. Its DT needs the underscored alias for these tunables, and
dt-checksfails on it as a new warning. With this change the DT can useusb4-1-pcie.Change
usb4_N_pciefirst, thenusb4-N-pcie, the same way as the other three lookups. Existing device trees with the underscored alias are unaffected.test_usb4_alias_fallback.pygets a second test. It runs the productiondt_set_pcie_tunables()against real FDTs with only the hyphenated alias, with both spellings, and with only the underscored one, and records which alias eachdt_copy_pciec_tunables()call receives. The test fails on main, at the hyphen-only case, and passes with this change.Checks
USE_CLANG=1 BUILDSTD=1).clang-format --dry-run --Werror src/kboot.cis clean.tools/stage1_size.sh clang: stage1 headroom is 17968 B before and after, and the other flavours are unchanged too.pytest tests/python: 744 passed, 29 skipped, 3 failed. The same 3 fail on main 3d517e6 in this environment:test_dcp_iboot_wire,test_external_dependency_groupandtest_xnuboot_layout.cc @Acelogic @DjDeveloperr @RyanTheTide @LiamRay10