bluetooth: Refine MT6639 CHIPID workaround and firmware path

jetm · jetm · commit 7d0095db4a3a · 2026-03-26T16:11:51.000-06:00
The initial MT6639 support used an overly broad workaround for boards
that return 0x0000 from the CHIPID register: it forced dev_id to 0x6639
unconditionally whenever a zero was read. This risks misidentifying
future chips that may also return zero from the same register. Similarly,
the firmware path used the mt6639 directory name rather than following
the established WiFi firmware naming convention.

Scope the zero-CHIPID workaround to a known list of MT6639 USB VID/PID
pairs, extracted into a module-level table so it can be referenced from
both the detection and any future matching sites. Update the firmware
directory to mt7927 to align with the WiFi-side convention. These
changes also update the patch commit IDs to reflect the revised
implementation, keeping the applied tree consistent with the reworked
patch series.

Signed-off-by: Javier Tia &lt;floss@jetm.me&gt;
diff --git a/mt6639-bt-01-add-mt6639-mt7927-bluetooth-support.patch b/mt6639-bt-01-add-mt6639-mt7927-bluetooth-support.patch
@@ -9,12 +9,15 @@ Three changes are needed to support MT6639:
 
 1. CHIPID workaround: On some boards the BT USB MMIO register reads
    0x0000 for dev_id, causing the driver to skip the 0x6639 init path.
-   Force dev_id to 0x6639 when it reads zero, matching the equivalent
-   WiFi-side workaround that forces chip=0x7927.
+   Force dev_id to 0x6639 only when the USB VID/PID matches a known
+   MT6639 device, avoiding misdetection if a future chip also reads
+   zero. This follows the WiFi-side pattern that uses PCI device IDs
+   to scope the same workaround.
 
 2. Firmware naming: MT6639 uses firmware version prefix "2_1" instead of
    "1_1" used by MT7925 and other variants. The firmware path is
-   mediatek/mt6639/BT_RAM_CODE_MT6639_2_1_hdr.bin.
+   mediatek/mt7927/BT_RAM_CODE_MT6639_2_1_hdr.bin, using the mt7927
+   directory to match the WiFi firmware convention.
 
 3. Section filtering: The MT6639 firmware binary contains 9 sections, but
    only sections with (dlmodecrctype & 0xff) == 0x01 are Bluetooth-related.
@@ -30,12 +33,31 @@ Link: https://github.com/openwrt/mt76/issues/927
 Reported-by: Ryan Gilbert <xelnaga@gmail.com>
 Signed-off-by: Javier Tia <floss@jetm.me>
 
-519527132da41202bab85679ef03319e3aa8763a
+4a0bc7139c3406b228e12f0e14963cdb59f908b6
 diff --git a/btmtk.c b/btmtk.c
-index a8c520d..e1193f9 100644
+index a8c520d..4df28a2 100644
 --- a/btmtk.c
 +++ b/btmtk.c
-@@ -114,3 +114,7 @@ void btmtk_fw_get_filename(char *buf, size_t size, u32 dev_id, u32 fw_ver,
+@@ -27,2 +27,18 @@
+ 
++/* Known MT6639 (MT7927) Bluetooth USB devices.
++ * Used to scope the zero-CHIPID workaround to real MT6639 hardware,
++ * since some boards return 0x0000 from the MMIO chip ID register.
++ */
++static const struct {
++	u16 vendor;
++	u16 product;
++} btmtk_mt6639_devs[] = {
++	{ 0x0489, 0xe13a },	/* ASUS ROG Crosshair X870E Hero */
++	{ 0x0489, 0xe0fa },	/* Lenovo Legion Pro 7 16ARX9 */
++	{ 0x0489, 0xe10f },	/* Gigabyte Z790 AORUS MASTER X */
++	{ 0x0489, 0xe110 },	/* MSI X870E Ace Max */
++	{ 0x0489, 0xe116 },	/* TP-Link Archer TBE550E */
++	{ 0x13d3, 0x3588 },	/* ASUS ROG STRIX X870E-E */
++};
++
+ struct btmtk_patch_header {
+@@ -114,3 +130,7 @@ void btmtk_fw_get_filename(char *buf, size_t size, u32 dev_id, u32 fw_ver,
  {
 -	if (dev_id == 0x7925)
 +	if (dev_id == 0x6639)
@@ -44,11 +66,11 @@ index a8c520d..e1193f9 100644
 +			 dev_id & 0xffff, (fw_ver & 0xff) + 1);
 +	else if (dev_id == 0x7925)
  		snprintf(buf, size,
-@@ -132,2 +136,3 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,
+@@ -132,2 +152,3 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,
  {
 +	struct btmtk_data *data = hci_get_priv(hdev);
  	struct btmtk_hci_wmt_params wmt_params;
-@@ -168,2 +173,10 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,
+@@ -168,2 +189,10 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,
  
 +		/* MT6639: only download sections where dlmode byte0 == 0x01,
 +		 * matching the Windows driver behavior which skips WiFi/other
@@ -59,36 +81,21 @@ index a8c520d..e1193f9 100644
 +			continue;
 +
  		if (dl_size > 0) {
-@@ -842,3 +855,3 @@ int btmtk_usb_subsys_reset(struct hci_dev *hdev, u32 dev_id)
+@@ -842,3 +871,3 @@ int btmtk_usb_subsys_reset(struct hci_dev *hdev, u32 dev_id)
  		msleep(100);
 -	} else if (dev_id == 0x7925) {
 +	} else if (dev_id == 0x7925 || dev_id == 0x6639) {
  		err = btmtk_usb_uhw_reg_read(hdev, MTK_BT_RESET_REG_CONNV3, &val);
-@@ -1312,2 +1325,35 @@ int btmtk_usb_setup(struct hci_dev *hdev)
+@@ -1312,2 +1341,20 @@ int btmtk_usb_setup(struct hci_dev *hdev)
  
-+	/* MT6639: some boards return CHIPID=0x0000 from the register read.
-+	 * Only force dev_id for known MT6639 USB devices to avoid
-+	 * misdetecting future chips that may also read zero.
-+	 */
 +	if (!dev_id) {
-+		static const struct {
-+			u16 vendor;
-+			u16 product;
-+		} mt6639_devs[] = {
-+			{ 0x0489, 0xe13a },
-+			{ 0x0489, 0xe0fa },
-+			{ 0x0489, 0xe10f },
-+			{ 0x0489, 0xe110 },
-+			{ 0x0489, 0xe116 },
-+			{ 0x13d3, 0x3588 },
-+		};
 +		u16 vid = le16_to_cpu(btmtk_data->udev->descriptor.idVendor);
 +		u16 pid = le16_to_cpu(btmtk_data->udev->descriptor.idProduct);
 +		int i;
 +
-+		for (i = 0; i < ARRAY_SIZE(mt6639_devs); i++) {
-+			if (vid == mt6639_devs[i].vendor &&
-+			    pid == mt6639_devs[i].product) {
++		for (i = 0; i < ARRAY_SIZE(btmtk_mt6639_devs); i++) {
++			if (vid == btmtk_mt6639_devs[i].vendor &&
++			    pid == btmtk_mt6639_devs[i].product) {
 +				dev_id = 0x6639;
 +				break;
 +			}
@@ -100,11 +107,11 @@ index a8c520d..e1193f9 100644
 +	}
 +
  	btmtk_data->dev_id = dev_id;
-@@ -1328,2 +1374,3 @@ int btmtk_usb_setup(struct hci_dev *hdev)
+@@ -1328,2 +1375,3 @@ int btmtk_usb_setup(struct hci_dev *hdev)
  	case 0x7961:
 +	case 0x6639:
  		btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id,
-@@ -1499 +1546,2 @@ MODULE_FIRMWARE(FIRMWARE_MT7961);
+@@ -1499 +1547,2 @@ MODULE_FIRMWARE(FIRMWARE_MT7961);
  MODULE_FIRMWARE(FIRMWARE_MT7925);
 +MODULE_FIRMWARE(FIRMWARE_MT7927);
 diff --git a/btmtk.h b/btmtk.h
diff --git a/mt6639-bt-02-fix-iso-interface-setup-for-single-alt-s.patch b/mt6639-bt-02-fix-iso-interface-setup-for-single-alt-s.patch
@@ -15,12 +15,12 @@ Signed-off-by: Javier Tia <floss@jetm.me>
 Reported-by: Ryan Gilbert <xelnaga@gmail.com>
 Tested-by: Ryan Gilbert <xelnaga@gmail.com>
 
-665a4b1e7b530d8a7b06dc6b735464210698863c
+5d7f0fce6c25f7a82ebf62528cb249dac874ffde
 diff --git a/btmtk.c b/btmtk.c
-index e1193f9..8f63708 100644
+index 4df28a2..32e0636 100644
 --- a/btmtk.c
 +++ b/btmtk.c
-@@ -1003,3 +1003,4 @@ static int __set_mtk_intr_interface(struct hci_dev *hdev)
+@@ -1019,3 +1019,4 @@ static int __set_mtk_intr_interface(struct hci_dev *hdev)
  
 -	err = usb_set_interface(btmtk_data->udev, MTK_ISO_IFNUM, 1);
 +	err = usb_set_interface(btmtk_data->udev, MTK_ISO_IFNUM,
diff --git a/mt6639-bt-03-add-mt7927-id-for-asus-rog-crosshair-x87.patch b/mt6639-bt-03-add-mt7927-id-for-asus-rog-crosshair-x87.patch
@@ -33,7 +33,7 @@ Link: https://github.com/openwrt/mt76/issues/927
 Signed-off-by: Javier Tia <floss@jetm.me>
 Tested-by: Jose Tiburcio Ribeiro Netto <jnetto@mineiro.io>
 
-65b6987921fa9d94cd78710546270361642eac87
+dce5b6b1963aed382878ab0ac1e826faba5272c1
 diff --git a/btusb.c b/btusb.c
 index a41bb1e..336d6e0 100644
 --- a/btusb.c
diff --git a/mt6639-bt-04-add-mt7927-id-for-lenovo-legion-pro-7-16.patch b/mt6639-bt-04-add-mt7927-id-for-lenovo-legion-pro-7-16.patch
@@ -33,7 +33,7 @@ Link: https://github.com/openwrt/mt76/issues/927
 Signed-off-by: Javier Tia <floss@jetm.me>
 Tested-by: Llewellyn Curran <melinko2003@gmail.com>
 
-633fed7d50d56701d4fdbd565fa42b8cc2395df5
+b25f9ab3a3a2ab18147c5930b0e5b3d3ea8b59dc
 diff --git a/btusb.c b/btusb.c
 index 336d6e0..83064d2 100644
 --- a/btusb.c
diff --git a/mt6639-bt-05-add-mt7927-id-for-gigabyte-z790-aorus-ma.patch b/mt6639-bt-05-add-mt7927-id-for-gigabyte-z790-aorus-ma.patch
@@ -34,7 +34,7 @@ Signed-off-by: Javier Tia <floss@jetm.me>
 Tested-by: Chapuis Dario <chapuisdario4@gmail.com>
 Tested-by: Evgeny Kapusta <3193631@gmail.com>
 
-42436173fc0c4398107a701ebfab1f6dfa9b772a
+7d15cc964cda5b8ed039df62ebf1b5c0cd32fd03
 diff --git a/btusb.c b/btusb.c
 index 83064d2..3e920ca 100644
 --- a/btusb.c
diff --git a/mt6639-bt-06-add-mt7927-id-for-msi-x870e-ace-max.patch b/mt6639-bt-06-add-mt7927-id-for-msi-x870e-ace-max.patch
@@ -33,7 +33,7 @@ Link: https://github.com/openwrt/mt76/issues/927
 Signed-off-by: Javier Tia <floss@jetm.me>
 Tested-by: Nitin Gurram <nitin.reddy88@gmail.com>
 
-fdd3d37a62febc50fab15d22701105d124dd9e59
+66f5cccbc1f44b29d12ab8a649404d9c24fc7355
 diff --git a/btusb.c b/btusb.c
 index 3e920ca..3e97603 100644
 --- a/btusb.c
diff --git a/mt6639-bt-07-add-mt7927-id-for-tp-link-archer-tbe550e.patch b/mt6639-bt-07-add-mt7927-id-for-tp-link-archer-tbe550e.patch
@@ -33,7 +33,7 @@ Link: https://github.com/openwrt/mt76/issues/927
 Signed-off-by: Javier Tia <floss@jetm.me>
 Tested-by: Thibaut FRANCOIS <tibo@humeurlibre.fr>
 
-3053cf761b0092cbe2d3ea06fd3f3a8cedd1f291
+7b3811cf04d2ed6bf30ecde571586f43117e5fd3
 diff --git a/btusb.c b/btusb.c
 index 3e97603..de9c3bf 100644
 --- a/btusb.c
diff --git a/mt6639-bt-08-add-mt7927-id-for-asus-x870e--proart-x87.patch b/mt6639-bt-08-add-mt7927-id-for-asus-x870e--proart-x87.patch
@@ -37,7 +37,7 @@ Signed-off-by: Javier Tia <floss@jetm.me>
 Tested-by: Jose Tiburcio Ribeiro Netto <jnetto@mineiro.io>
 Tested-by: Ivan Lubnin <lubnin.ivan@gmail.com>
 
-275ad6a62a0141e49e904e0168f6a00c20d177a7
+6037e5bb844c21d5e9a9c33236a4b8a6d7031eec
 diff --git a/btusb.c b/btusb.c
 index de9c3bf..e15695f 100644
 --- a/btusb.c
