Skip to content

Revert "[Backport Wrynose] Disable FIT and pack dtb in UKI as temp workaround to enable lava test on IQ-X7181 EVK"#2501

Open
Shoudi Li (shoudil) wants to merge 1 commit into
qualcomm-linux:wrynosefrom
shoudil:revert-2451-backport-2419
Open

Revert "[Backport Wrynose] Disable FIT and pack dtb in UKI as temp workaround to enable lava test on IQ-X7181 EVK"#2501
Shoudi Li (shoudil) wants to merge 1 commit into
qualcomm-linux:wrynosefrom
shoudil:revert-2451-backport-2419

Conversation

@shoudil

@shoudil Shoudi Li (shoudil) commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Reverts #2451

Observed bootup issue from nightly build 605, the first nightly build after enable post merge lava test.

@shoudil

Copy link
Copy Markdown
Contributor Author

Verified on latest nightly build 609 (mainline and 2.0), bootup fine.

with:
build_id: "${{ inputs.build_id }}"
devices: "glymur-crd,iq-8275-evk,iq-9075-evk,iq-x7181-evk,kaanapali-mtp,qcm6490-idp,qcs615-ride,rb3gen2-core-kit,qcs8300-ride-sx,qcs9100-ride-sx,rb1-core-kit"
devices: "glymur-crd,iq-8275-evk,iq-9075-evk,kaanapali-mtp,qcm6490-idp,qcs615-ride,rb3gen2-core-kit,qcs8300-ride-sx,qcs9100-ride-sx,rb1-core-kit"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?


MACHINE_FEATURES += "efi pci"

QCOM_DTB_DEFAULT ?= "hamoa-iot-evk"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? No, we can't do that until QDL / LAVA setup is fixed to reflash SPI NOR

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is bootup regression issue on recent nightly catchall build (boot well on non-catchall). So suspect the FIT disable workaround merged initially. I will close this draft PR and create an issue to track.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Locally verified with this PR (revert #2451), able to bootup on catchall build. Dmitry Baryshkov (@lumag) any concern to pick this PR for release ?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please read the comment that you are replying to.

@shoudil Shoudi Li (shoudil) Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be some issue in DTB merge or deployment with ostree enabled. looks only the last dtb in KERNEL_DEVICETREE get packed in uki.

https://github.com/qualcomm-linux/meta-qcom/blob/master/conf/machine/iq-x7181-evk.conf#L11

On Catchall build:

$ ukify inspect uki.efi
.osrel:
size: 294 bytes
sha256: 2fb049e86555f9921b41679d3f56769cf58afa20a901331ed97efbc4b5646243
text:
ID=qcom-distro-catchall
NAME="Qualcomm Linux Reference Distro (SELinux-enabled) (OTA-enabled)"
VERSION="2.0"
VERSION_ID=2.0
PRETTY_NAME="Qualcomm Linux Reference Distro (SELinux-enabled) (OTA-enabled) 2.0"
CPE_NAME="cpe:/o:openembedded:qcom-distro-catchall:2.0"
BUILD_ID="local-20260619061508"
.dtb:
size: 2433 bytes
sha256: 33ba2ee368993b340d43633e5134c6d415d83c25c4e6209cf1d6bef184d5c237

$ sha256sum hamoa-iot-evk-camera-imx577.dtbo
33ba2ee368993b340d43633e5134c6d415d83c25c4e6209cf1d6bef184d5c237 hamoa-iot-evk-camera-imx577.dtbo
$ sha256sum hamoa-iot-evk.dtb
e85ee51557bff95a3df0a2ab4b747312bbe7b4a8abea3a196d77465db8c18818 hamoa-iot-evk.dtb

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again. We must be using UKI with the embedded DTB until the CI is fixed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get it, let me discuss with team how to move forward release with this temp workaround.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using UKI with embedded DTB has caused regression issues on Hamoa.

  1. catchall build boot up issue as describe in commit message.
  2. Upstream camera function is totally broken due to camera dtbo is not included in embedded DTB.
    In the meantime, it blocks below functions to be enabled. These two functions are important features that we planned to enable by end of June.
  3. CameraX which requires camerax dtbo.
  4. KVM which requires el2 dtbo.
    When will SPINOR flash issue be fixed in lava so we can use dtb partition on SPINOR in CI? This is a major blocker for all above issues.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the upstream camera, use the dtb with the .dtbo applied. No, this can't be merged before LAVA is upgraded. Please stop pinging here and there, the answer will be the same.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still issue there for camx and KVM enablement.

@github-actions

Copy link
Copy Markdown

Test run workflow

Test jobs for commit 15693bf

nodistro
Pass: 9 | Fail: 0 | Total: 9
qcom-distro_linux-qcom-next
Pass: 8 | Fail: 2 | Total: 10
qcom-distro
Pass: 7 | Fail: 1 | Total: 8

@test-reporting-app

test-reporting-app Bot commented Jun 22, 2026

Copy link
Copy Markdown

Test Results

   69 files   -    34    356 suites   - 253   6h 7m 30s ⏱️ + 15m 49s
  133 tests +    6    107 ✅  -    16   0 💤 ± 0  26 ❌ +22 
3 338 runs   - 2 457  3 245 ✅  - 2 472  38 💤  - 35  55 ❌ +50 

For more details on these failures, see this check.

Results for commit cac084b. ± Comparison against base commit ef0004d.

♻️ This comment has been updated with latest results.

@shoudil Shoudi Li (shoudil) marked this pull request as ready for review June 24, 2026 13:04
@lumag

Copy link
Copy Markdown
Contributor

It is still missing the SoB.

@shoudil Shoudi Li (shoudil) force-pushed the revert-2451-backport-2419 branch 2 times, most recently from 9a1e831 to a9a5500 Compare June 24, 2026 23:50
…rkaround to enable lava test on IQ-X7181 EVK"

Revert the workaround as it caused regression issues:
Boot up issue on catchall build as dtb merge not present in
ostree-kernel-initramfs recipe. For the features with dependency on
dtb overlays also get impacted, such as camera and kvm etc.

Signed-off-by: Shoudi Li <shoudil@qti.qualcomm.com>
@shoudil Shoudi Li (shoudil) force-pushed the revert-2451-backport-2419 branch from a9a5500 to cac084b Compare June 24, 2026 23:57
@shoudil

Copy link
Copy Markdown
Contributor Author

It is still missing the SoB.

Updated.

@github-actions

Copy link
Copy Markdown

Test run workflow

Test jobs for commit cac084b

nodistro
Pass: 9 | Fail: 0 | Total: 9
qcom-distro_linux-qcom-next
Pass: 234 | Fail: 0 | Total: 269
qcom-distro
Pass: 7 | Fail: 1 | Total: 8

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