Skip to content

Conversation

@smuppand
Copy link
Contributor

Stage custom iris_vpu.ko to /lib/modules/$(uname -r)/updates via video_ensure_moddir_install; run depmod.

Use video_find_module_file/video_insmod_with_deps; honor --ko-dir and --ko-prefer-custom only (no-op otherwise).

Silence helper stdout to avoid merged/duplicated log lines.

utils/lib_video.sh

Harden helpers (video_find_module_file, video_ensure_moddir_install, video_insmod_with_deps).

Fix ShellCheck: replace A && B || continue (SC2015), close if/fi, tidy minor warnings.

CI YAML

ShellCheck config touch-up; ensure depmod/modprobe available in PATH; keep logs as artifacts.

Introduce --clips-tar (and optional --clips-dest) to consume a pre-provisioned
media bundle locally. Extraction runs early and is honored even when --config
or --dir are used. If --clips-tar is present we skip the online early-fetch and
per-test fetch; the strict clip presence check remains unchanged.

- New flags: --clips-tar [/path/to/*.tar{,.gz,.xz,.zst,.bz2}|*.zip], --clips-dest DIR
- Destination resolution: --clips-dest > cfg dir > --dir > testcase dir
- Passthrough preserved in --stack both re-exec path
- No behavior change when flags are absent (net/TAR_URL flow intact)
- CI-friendly logs: “Extract custom clips tar → <dest>”

Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
@smuppand smuppand requested a review from abbajaj806 October 30, 2025 18:11
Switch test to provide a local media bundle via --clips-tar and rely on
run.sh’s default extraction path (no --clips-dest needed). Keep the upstream
(base) run free of custom ko args; add --ko-dir/--ko-prefer-custom for the
overlay (downstream) run and always pass --downstream-fw (harmless on non-Kodiak).

- Remove explicit --clips-dest (runner now defaults near cfg/testcase dir)
- Pass --clips-tar and --app only; no Wi-Fi/TAR_URL required
- Derive --platform from TARGET if set; otherwise let runner autodetect
- Echo constructed args for CI debugging; preserve step order and result upload

Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
…s, compressed .ko, altroot)

- Improve video_find_module_file() and video_insmod_with_deps() to reliably locate and load downstream modules across diverse layouts.
- Accept KO_DIRS entries as files or directories; try fast direct matches before bounded find (depth-limited).
- Support hyphen/underscore name variants and compressed modules (.ko.xz, .ko.gz, .ko.zst, .ko.bz2) in all search paths.
- Preserve preference order: modinfo -n → KO_DIRS (if KO_PREFER_CUSTOM=1) → KO_TREE/lib/modules/$KVER → /lib/modules/$KVER/updates → system tree → KO_DIRS (fallback when not preferred first). Log with video_log_resolve.
- Enhance insmod path:
  - Parse deps via modinfo -F depends, try modprobe -d "$KO_TREE" then regular modprobe, then direct insmod using resolved paths.
  - On-the-fly decompress compressed modules to /run/iris_mods/$KVER/ and insmod the decompressed artifact. Log with video_log_load_success.

Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
@smuppand smuppand changed the title Video: custom .ko install + quieter logs; ShellCheck fixes & CI tweak Video: custom .ko install + quieter logs, ShellCheck fixes & CI tweak Oct 31, 2025
Copy link
Contributor

@abbajaj806 abbajaj806 left a comment

Choose a reason for hiding this comment

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

LGTM

@abbajaj806 abbajaj806 merged commit 296abc9 into qualcomm-linux:main Oct 31, 2025
8 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.

2 participants