Skip to content

Bluetooth: restore the MT7932 PCIe build rule and context analysis - #2

Open
niteria wants to merge 1 commit into
base/aurora-9127278from
fix/bt-mt7932-makefile
Open

niteria wants to merge 1 commit into
base/aurora-9127278from
fix/bt-mt7932-makefile

Conversation

@niteria

@niteria niteria commented Nov 6, 2026

Copy link
Copy Markdown
Owner

For review before sending upstream to aurora-silicon/linux. The base branch base/aurora-9127278 is the revision the Neo runs. Upstream integration/aurora HEAD (33bec40) still has the same Makefile, so the commit should apply there unchanged.

Problem. a03e01f ("Bluetooth: add J813 N1 native transport…", merged via aurora-silicon#998) rewrote drivers/bluetooth/Makefile from an older copy of the file. It dropped the J700 mt7932_bt_pcie rule, so CONFIG_BT_MTK7932_PCIE=m builds nothing, and it dropped CONTEXT_ANALYSIS := y. It also re-added three PCMCIA rules whose Kconfig symbols were removed in 794b5e7. Those are inert, so this PR leaves them for a separate cleanup.

Change. Restore the two dropped lines.

Tested on the Neo (J700), generation 36 = 9127278 plus this change as a local patch: mt7932_bt_pcie.ko is built and loads, neo-mt7932-bluetooth-admission succeeds, and bluetoothctl list shows the controller (hci0). Without it, the admission unit fails with Module mt7932_bt_pcie not found.

Open question for you. Restoring CONTEXT_ANALYSIS makes no difference with GCC, which is what we build with. With Clang it re-enables context analysis for all of drivers/bluetooth, which upstream had before a03e01f but which hasn't been checked since. If you'd rather send only the mt7932 rule, drop that line.

🤖 Generated with Claude Code

Commit a03e01f ("Bluetooth: add J813 N1 native transport and
encrypted connection bring-up") rewrote drivers/bluetooth/Makefile from
an older copy of the file. Besides its own additions it dropped:

- the mt7932_bt_pcie rule added by 1d4782c ("Bluetooth: add opt-in
  J700 MT7932 PCIe transport experiment"), so CONFIG_BT_MTK7932_PCIE=m
  builds nothing and the J700 Bluetooth function has no driver;
- CONTEXT_ANALYSIS := y from e01e99a ("Bluetooth: enable context
  analysis").

Restore both. The PCMCIA rules it re-added (dtl1_cs, bt3c_cs,
bluecard_cs) have no Kconfig symbols since 794b5e7 and are inert;
they are left for a separate cleanup.

Tested on J700 (MacBook Neo) at 9127278: mt7932_bt_pcie.ko is built
and loads, and the controller registers as hci0.

Signed-off-by: Bartosz Nitka <niteria@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@niteria

niteria commented Nov 6, 2026

Copy link
Copy Markdown
Owner Author

Sent upstream as aurora-silicon#1055 (rebased onto integration/aurora 33bec40, CONTEXT_ANALYSIS kept).

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.

1 participant