Skip to content

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

Merged
notmysegv merged 1 commit into
aurora-silicon:integration/aurorafrom
niteria:upstream/bt-mt7932-makefile
Nov 7, 2026
Merged

notmysegv merged 1 commit into
aurora-silicon:integration/aurorafrom
niteria:upstream/bt-mt7932-makefile

Conversation

@niteria

@niteria niteria commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

a03e01f ("Bluetooth: add J813 N1 native transport and encrypted connection bring-up", #998) rewrote drivers/bluetooth/Makefile from an older copy of the file. In doing so it dropped two lines:

  • obj-$(CONFIG_BT_MTK7932_PCIE) += mt7932_bt_pcie.o (from 1d4782c). Since then, CONFIG_BT_MTK7932_PCIE=m builds nothing, and the J700 (MacBook Neo) Bluetooth function has no driver. Userspace that loads the module fails with Module mt7932_bt_pcie not found.
  • CONTEXT_ANALYSIS := y (from e01e99a).

This restores both. The PCMCIA rules that commit re-added (dtl1_cs, bt3c_cs, bluecard_cs) have had no Kconfig symbols since 794b5e7, so they're inert; I've left them for a separate cleanup.

aurora-wip is also missing the mt7932_bt_pcie rule. If it needs its own PR, I'm happy to send one.

Testing: J700 running 9127278 (its drivers/bluetooth/Makefile is identical to integration/aurora HEAD) with this change. mt7932_bt_pcie.ko is built and loads, and the controller registers as hci0 (bluetoothctl list shows it). Built with GCC 15.3, so context analysis itself, which is Clang-only, wasn't exercised.

🤖 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) on 9127278, whose Makefile is the same:
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>
@notmysegv

Copy link
Copy Markdown
Member

Stumbled upon this exact issue with this exact fix. Boot testing just to be sure, then happy to merge.

@notmysegv
notmysegv merged commit f9ce365 into aurora-silicon:integration/aurora Nov 7, 2026
1 check passed
notmysegv added a commit to aurora-silicon/alarm-aurora that referenced this pull request Nov 7, 2026
Move to f9ce365c, which includes aurora-silicon/linux#1055 and
restores the mt7932_bt_pcie module build rule. Refresh the resolved
configuration for the new shared EDAC requirement and bump pkgrel.

Assisted-by: LLM
Signed-off-by: Michal S. <michal_stopyra@icloud.com>
notmysegv added a commit to aurora-silicon/nixos-aurora that referenced this pull request Nov 7, 2026
Move to f9ce365c, which includes aurora-silicon/linux#1055 and
restores mt7932_bt_pcie.ko for the existing initrd module list.
Vendor the matching resolved ALARM configuration and provenance,
including the newly required Apple SoC EDAC driver.

Assisted-by: LLM
Signed-off-by: Michal S. <michal_stopyra@icloud.com>
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