Skip to contentSkip to conversation

Bluetooth: btusb: Mediatek ISO interface claim/release adjustment

PATCH Superseded Chris Lu 2 participants 7 messages Sep 19, 2024 – Sep 23, 2024

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Chris Lu

author
#0 lore raw

v2 cover Bluetooth: btusb: Mediatek ISO interface claim/release adjustment

MediaTek performs some test on the platform which can support LE audio and ISO data transmission with kernel driver. We found the additional interface claim and release flow issue need some adjustment.

These patches mainly add a callback function within the usb_disconnect function to prevent a kernel panic caused by interfaces not being released when the BT USB dongle is physically removed. Additionally, the condition for claiming/releasing ISO usb interface have also been adjusted to make driver works as expected.

---
v2: fix commit message typo and over maximum chars per line warning.
---

Chris Lu (4):
Bluetooth: btusb: mediatek: move Bluetooth power off command position
Bluetooth: btusb: mediatek: add callback function in btusb_disconnect
Bluetooth: btusb: mediatek: add intf release flow when usb disconnect
Bluetooth: btusb: mediatek: change the conditions for ISO interface

 drivers/bluetooth/btusb.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH v2 1/4 Bluetooth: btusb: mediatek: move Bluetooth power off command position

Move MediaTek Bluetooth power off command before releasing usb ISO interface.

---
 drivers/bluetooth/btusb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/bluetooth/btusb.c +4 -1
index 6c9c761d5b93..6cf1729a8225 100644
@@ -2704,11 +2704,14 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev)
 {
 	struct btusb_data *data = hci_get_drvdata(hdev);
 	struct btmtk_data *btmtk_data = hci_get_priv(hdev);
+	int ret;
+
+	ret = btmtk_usb_shutdown(hdev);
 
 	if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
 		btusb_mtk_release_iso_intf(data);
 
-	return btmtk_usb_shutdown(hdev);
+	return ret;
 }
 
 #ifdef CONFIG_PM
Signature · 1 line
2.18.0
author
#2 lore raw

PATCH v2 2/4 Bluetooth: btusb: mediatek: add callback function in btusb_disconnect

In reply to Chris Lu

Add disconnect callback function in btusb_disconnect which is reserved for vendor specific usage before deregister hci in btusb_disconnect.

---
 drivers/bluetooth/btusb.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/bluetooth/btusb.c +4 -0
index 6cf1729a8225..dfc42bdc8aaf 100644
@@ -846,6 +846,7 @@ struct btusb_data {
 
 	int (*suspend)(struct hci_dev *hdev);
 	int (*resume)(struct hci_dev *hdev);
+	int (*disconnect)(struct hci_dev *hdev);
 
 	int oob_wake_irq;   /* irq for out-of-band wake-on-bt */
 	unsigned cmd_timeout_cnt;
@@ -4011,6 +4012,9 @@ static void btusb_disconnect(struct usb_interface *intf)
 	if (data->diag)
 		usb_set_intfdata(data->diag, NULL);
 
+	if (data->disconnect)
+		data->disconnect(hdev);
+
 	hci_unregister_dev(hdev);
 
 	if (intf == data->intf) {
Signature · 1 line
2.18.0
author
#3 lore raw

PATCH v2 3/4 Bluetooth: btusb: mediatek: add intf release flow when usb disconnect

In reply to Chris Lu

MediaTek claim an special usb intr interface for ISO data transmission. The interface need to be released before unregistering hci device when usb disconnect. Removing BT usb dongle without properly releasing the interface may cause Kernel panic while unregister hci device.

---
 drivers/bluetooth/btusb.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/bluetooth/btusb.c +7 -5
index dfc42bdc8aaf..37e67b451b34 100644
@@ -2614,9 +2614,9 @@ static void btusb_mtk_claim_iso_intf(struct btusb_data *data)
 	set_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags);
 }
 
-static void btusb_mtk_release_iso_intf(struct btusb_data *data)
+static int btusb_mtk_release_iso_intf(struct hci_dev *hdev)
 {
-	struct btmtk_data *btmtk_data = hci_get_priv(data->hdev);
+	struct btmtk_data *btmtk_data = hci_get_priv(hdev);
 
 	if (btmtk_data->isopkt_intf) {
 		usb_kill_anchored_urbs(&btmtk_data->isopkt_anchor);
@@ -2630,6 +2630,8 @@ static void btusb_mtk_release_iso_intf(struct btusb_data *data)
 	}
 
 	clear_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags);
+
+	return 0;
 }
 
 static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)
@@ -2649,7 +2651,7 @@ static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)
 		return err;
 
 	if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
-		btusb_mtk_release_iso_intf(data);
+		btusb_mtk_release_iso_intf(hdev);
 
 	btusb_stop_traffic(data);
 	usb_kill_anchored_urbs(&data->tx_anchor);
@@ -2703,14 +2705,13 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
 
 static int btusb_mtk_shutdown(struct hci_dev *hdev)
 {
-	struct btusb_data *data = hci_get_drvdata(hdev);
 	struct btmtk_data *btmtk_data = hci_get_priv(hdev);
 	int ret;
 
 	ret = btmtk_usb_shutdown(hdev);
 
 	if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
-		btusb_mtk_release_iso_intf(data);
+		btusb_mtk_release_iso_intf(hdev);
 
 	return ret;
 }
@@ -3824,6 +3825,7 @@ static int btusb_probe(struct usb_interface *intf,
 		data->recv_acl = btmtk_usb_recv_acl;
 		data->suspend = btmtk_usb_suspend;
 		data->resume = btmtk_usb_resume;
+		data->disconnect = btusb_mtk_release_iso_intf;
 	}
 
 	if (id->driver_info & BTUSB_SWAVE) {
Signature · 1 line
2.18.0
#4 lore raw

Re: [PATCH v2 3/4] Bluetooth: btusb: mediatek: add intf release flow when usb disconnect

Hi Chris,

Quoted 37 lines · Chris Lu

MediaTek claim an special usb intr interface for ISO data transmission. The interface need to be released before unregistering hci device when usb disconnect. Removing BT usb dongle without properly releasing the interface may cause Kernel panic while unregister hci device.

---
 drivers/bluetooth/btusb.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/bluetooth/btusb.c +4 -2
index dfc42bdc8aaf..37e67b451b34 100644
@@ -2614,9 +2614,9 @@ static void btusb_mtk_claim_iso_intf(struct btusb_data *data)
        set_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags);
 }
 
-static void btusb_mtk_release_iso_intf(struct btusb_data *data)
+static int btusb_mtk_release_iso_intf(struct hci_dev *hdev)
 {
-       struct btmtk_data *btmtk_data = hci_get_priv(data->hdev);
+       struct btmtk_data *btmtk_data = hci_get_priv(hdev);
 
        if (btmtk_data->isopkt_intf) {
                usb_kill_anchored_urbs(&btmtk_data->isopkt_anchor);
@@ -2630,6 +2630,8 @@ static void btusb_mtk_release_iso_intf(struct btusb_data *data)
        }
 
        clear_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags);
+
+       return 0;
 }
 
 static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)

drivers/bluetooth/btusb.c static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data) · line 2654

Quoted 5 lines
drivers/bluetooth/btusb.c +1 -1
@@ -2649,7 +2651,7 @@ static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)
                return err;
 
        if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
-               btusb_mtk_release_iso_intf(data);
+               btusb_mtk_release_iso_intf(hdev);

We can probably move the check for BTMTK_ISOPKT_RUNNING into btusb_mtk_release_iso_intf to avoid having to duplicate it whenever calling btusb_mtk_release_iso_intf.

Quoted 6 lines
drivers/bluetooth/btusb.c +0 -0
        btusb_stop_traffic(data);
        usb_kill_anchored_urbs(&data->tx_anchor);
@@ -2703,14 +2705,13 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
 
 static int btusb_mtk_shutdown(struct hci_dev *hdev)

drivers/bluetooth/btusb.c static int btusb_mtk_setup(struct hci_dev *hdev) · line 2714

Quoted 10 lines
drivers/bluetooth/btusb.c +1 -2
 {
-       struct btusb_data *data = hci_get_drvdata(hdev);
        struct btmtk_data *btmtk_data = hci_get_priv(hdev);
        int ret;
 
        ret = btmtk_usb_shutdown(hdev);
 
        if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
-               btusb_mtk_release_iso_intf(data);
+               btusb_mtk_release_iso_intf(hdev);

Ditto.

drivers/bluetooth/btusb.c static int btusb_probe(struct usb_interface *intf, · line 3828

Quoted 7 lines
drivers/bluetooth/btusb.c +1 -0
        return ret;
 }
@@ -3824,6 +3825,7 @@ static int btusb_probe(struct usb_interface *intf,
                data->recv_acl = btmtk_usb_recv_acl;
                data->suspend = btmtk_usb_suspend;
                data->resume = btmtk_usb_resume;
+               data->disconnect = btusb_mtk_release_iso_intf;

I'd wrap (e.g. btmtk_usb_disconnect) the call to btusb_mtk_release_iso_intf since that is only meant to release the ISO endpoint.

Quoted 6 lines
drivers/bluetooth/btusb.c +0 -1
        }
 
        if (id->driver_info & BTUSB_SWAVE) {
--

2.18.0

Signature · 1 line
Luiz Augusto von Dentz
#5 lore raw

Re: [PATCH v2 3/4] Bluetooth: btusb: mediatek: add intf release flow when usb disconnect

Hi Luiz,

Quoted 52 lines · Luiz Augusto von Dentz

External email : Please do not click links or open attachments until you have verified the sender or the content.
Hi Chris,

Quoted 2 lines · Chris Lu

MediaTek claim an special usb intr interface for ISO data

transmission.

Quoted 1 line

The interface need to be released before unregistering hci device

when

Quoted 1 line

usb disconnect. Removing BT usb dongle without properly releasing

the

drivers/bluetooth/btusb.c static void btusb_mtk_claim_iso_intf(struct

Quoted 12 lines

interface may cause Kernel panic while unregister hci device.

---
 drivers/bluetooth/btusb.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/bluetooth/btusb.c +0 -0
index dfc42bdc8aaf..37e67b451b34 100644
@@ -2614,9 +2614,9 @@ static void btusb_mtk_claim_iso_intf(struct

btusb_data *data)

drivers/bluetooth/btusb.c static void btusb_mtk_release_iso_intf(struct

Quoted 12 lines
drivers/bluetooth/btusb.c +2 -2
        set_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags);
 }
 
-static void btusb_mtk_release_iso_intf(struct btusb_data *data)
+static int btusb_mtk_release_iso_intf(struct hci_dev *hdev)
 {
-       struct btmtk_data *btmtk_data = hci_get_priv(data->hdev);
+       struct btmtk_data *btmtk_data = hci_get_priv(hdev);
 
        if (btmtk_data->isopkt_intf) {
                usb_kill_anchored_urbs(&btmtk_data->isopkt_anchor);
@@ -2630,6 +2630,8 @@ static void btusb_mtk_release_iso_intf(struct

btusb_data *data)

drivers/bluetooth/btusb.c static int btusb_mtk_reset(struct hci_dev

Quoted 9 lines
drivers/bluetooth/btusb.c +2 -0
        }
 
        clear_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags);
+
+       return 0;
 }
 
 static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)
@@ -2649,7 +2651,7 @@ static int btusb_mtk_reset(struct hci_dev

*hdev, void *rst_data)

Quoted 2 lines
drivers/bluetooth/btusb.c +0 -0
                return err;
 
Quoted 8 lines

drivers/bluetooth/btusb.c static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data) · line 2654

Quoted 3 lines
drivers/bluetooth/btusb.c +1 -1
        if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
-               btusb_mtk_release_iso_intf(data);
+               btusb_mtk_release_iso_intf(hdev);

We can probably move the check for BTMTK_ISOPKT_RUNNING into btusb_mtk_release_iso_intf to avoid having to duplicate it whenever calling btusb_mtk_release_iso_intf.

Yes, condition check here is redundant, Keep the check in btusb_mtk_release_iso_intf is better.

Quoted 12 lines

drivers/bluetooth/btusb.c static int btusb_mtk_setup(struct hci_dev

Quoted 4 lines
drivers/bluetooth/btusb.c +0 -0
        btusb_stop_traffic(data);
        usb_kill_anchored_urbs(&data->tx_anchor);
@@ -2703,14 +2705,13 @@ static int btusb_mtk_setup(struct hci_dev

*hdev)

Quoted 7 lines
drivers/bluetooth/btusb.c +0 -1
 static int btusb_mtk_shutdown(struct hci_dev *hdev)
 {
-       struct btusb_data *data = hci_get_drvdata(hdev);
        struct btmtk_data *btmtk_data = hci_get_priv(hdev);
        int ret;
 
Quoted 8 lines

drivers/bluetooth/btusb.c static int btusb_mtk_setup(struct hci_dev *hdev) · line 2714

Quoted 5 lines
drivers/bluetooth/btusb.c +1 -1
        ret = btmtk_usb_shutdown(hdev);
 
        if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
-               btusb_mtk_release_iso_intf(data);
+               btusb_mtk_release_iso_intf(hdev);

Ditto.

remove redundant check.

Quoted 9 lines

drivers/bluetooth/btusb.c static int btusb_probe(struct usb_interface

Quoted 3 lines
drivers/bluetooth/btusb.c +0 -0
        return ret;
 }
@@ -3824,6 +3825,7 @@ static int btusb_probe(struct usb_interface

*intf,

drivers/bluetooth/btusb.c static int btusb_probe(struct usb_interface *intf, · line 3828

Quoted 4 lines
drivers/bluetooth/btusb.c +1 -0
                data->recv_acl = btmtk_usb_recv_acl;
                data->suspend = btmtk_usb_suspend;
                data->resume = btmtk_usb_resume;
+               data->disconnect = btusb_mtk_release_iso_intf;
Quoted 5 lines

I'd wrap (e.g. btmtk_usb_disconnect) the call to btusb_mtk_release_iso_intf since that is only meant to release the ISO
endpoint.

Add a new function "btusb_mtk_disconnect". Since this function will use btusb_data which is defined in btusb.c only, I'll also define this function in btusb.c.

Thanks for your advice. I'll submit v3 later.

Best regards,
Chris Lu

Quoted 10 lines
Quoted 6 lines
drivers/bluetooth/btusb.c +0 -1
        }
 
        if (id->driver_info & BTUSB_SWAVE) {
--

2.18.0

Signature · 1 line
Luiz Augusto von Dentz
author
#6 lore raw

PATCH v2 4/4 Bluetooth: btusb: mediatek: change the conditions for ISO interface

In reply to Chris Lu

Change conditions for Bluetooth driver claiming and releasing usb ISO interface for MediaTek ISO data transmission.

---
 drivers/bluetooth/btusb.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/bluetooth/btusb.c +6 -5
index 37e67b451b34..bb28a9b2dc11 100644
@@ -2618,7 +2618,7 @@ static int btusb_mtk_release_iso_intf(struct hci_dev *hdev)
 {
 	struct btmtk_data *btmtk_data = hci_get_priv(hdev);
 
-	if (btmtk_data->isopkt_intf) {
+	if (test_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags)) {
 		usb_kill_anchored_urbs(&btmtk_data->isopkt_anchor);
 		clear_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags);
 
@@ -2650,7 +2650,7 @@ static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)
 	if (err < 0)
 		return err;
 
-	if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
+	if (test_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags))
 		btusb_mtk_release_iso_intf(hdev);
 
 	btusb_stop_traffic(data);
@@ -2696,9 +2696,10 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
 	btmtk_data->reset_sync = btusb_mtk_reset;
 
 	/* Claim ISO data interface and endpoint */
-	btmtk_data->isopkt_intf = usb_ifnum_to_if(data->udev, MTK_ISO_IFNUM);
-	if (btmtk_data->isopkt_intf)
+	if (!test_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags)) {
+		btmtk_data->isopkt_intf = usb_ifnum_to_if(data->udev, MTK_ISO_IFNUM);
 		btusb_mtk_claim_iso_intf(data);
+	}
 
 	return btmtk_usb_setup(hdev);
 }
@@ -2710,7 +2711,7 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev)
 
 	ret = btmtk_usb_shutdown(hdev);
 
-	if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
+	if (test_bit(BTMTK_ISOPKT_OVER_INTR, &btmtk_data->flags))
 		btusb_mtk_release_iso_intf(hdev);
 
 	return ret;
Signature · 1 line
2.18.0