Skip to content

bluetooth: handle dynamic M.2 controllers (GH#533) #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vnarapar merged 1 commit into from
Aug 13, 2026
Merged

bluetooth: handle dynamic M.2 controllers (GH#533) #534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions Runner/suites/Connectivity/Bluetooth/BT_FW_KMD_Service/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,30 @@ else
fi

# ---------- DT node / compatible ----------
# ---------- DT node / compatible ----------
# M.2 E-key Bluetooth devices can be instantiated dynamically by pwrseq-pcie-m2,
# so absence of a static qcom,wcn*-bt node is not a functional failure. Keep DT
# discovery as topology evidence and let the runtime checks below own the verdict.
if dt_confirm_node_or_compatible_all \
"qcom,wcn3950-bt" \
"qcom,wcn7850-bt" \
"qcom,wcn6855-bt" \
"qcom,wcn6750-bt" \
"qcom,bluetooth"
"qcom,bluetooth" \
"pcie-m2-e-connector"
then
log_pass "DT node/compatible for BT present (at least one entry matched)."
log_pass "DT node/compatible for BT or an M.2 E-key connector is present."
else
log_fail "DT node/compatible for BT NOT found."
inc_fail
dt_runtime_adapter=""
if command -v bt_select_usable_adapter >/dev/null 2>&1; then
dt_runtime_adapter="$(bt_select_usable_adapter 2>/dev/null || true)"
fi

if [ -n "$dt_runtime_adapter" ] && bt_adapter_is_usable "$dt_runtime_adapter"; then
log_warn "No static BT DT node or M.2 E-key connector found, operational HCI adapter $dt_runtime_adapter confirms runtime Bluetooth availability (GH#533)."
else
log_warn "No static BT DT node or M.2 E-key connector found, deferring the verdict to the authoritative KMD, HCI, service, firmware, and controller checks below (GH#533)."
fi
inc_warn
fi

# ---------- Firmware presence ----------
Expand Down Expand Up @@ -189,7 +201,7 @@ if command -v btfwloaded >/dev/null 2>&1; then
esac
else
# No SKIP: continue test, just warn.
log_warn "btfwloaded() helper not available; firmware-load kernel-log validation not performed."
log_warn "btfwloaded() helper not available, firmware-load kernel-log validation not performed."
inc_warn
fi

Expand Down
Loading