Skip to contentSkip to conversation

Bluetooth: btmtksdio: Fix kernel oops in btmtksdio_interrupt

PATCH Applied [email protected] 3 participants 7 messages Mar 16, 2022 – Mar 17, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v5 1/5 Bluetooth: btmtksdio: Fix kernel oops in btmtksdio_interrupt

From: Yake Yang <[email protected]>

Fix the following kernel oops in btmtksdio_interrrupt

[   14.339134]  btmtksdio_interrupt+0x28/0x54
[   14.339139]  process_sdio_pending_irqs+0x68/0x1a0
[   14.339144]  sdio_irq_work+0x40/0x70
[   14.339154]  process_one_work+0x184/0x39c
[   14.339160]  worker_thread+0x228/0x3e8
[   14.339168]  kthread+0x148/0x3ac
[   14.339176]  ret_from_fork+0x10/0x30

That happened because hdev->power_on is already called before sdio_set_drvdata which btmtksdio_interrupt handler relies on is not properly set up.

The details are shown as the below: hci_register_dev would run queue_work(hdev->req_workqueue, &hdev->power_on) as WQ_HIGHPRI workqueue_struct to complete the power-on sequeunce and thus hci_power_on may run before sdio_set_drvdata is done in btmtksdio_probe.

The hci_dev_do_open in hci_power_on would initialize the device and enable the interrupt and thus it is possible that btmtksdio_interrupt is being called right before sdio_set_drvdata is filled out.

When btmtksdio_interrupt is being called and sdio_set_drvdata is not filled , the kernel oops is going to happen because btmtksdio_interrupt access an uninitialized pointer.

Fixes 9aebfd4a2200 ("Bluetooth: mediatek: add support for MediaTek MT7663S and MT7668S SDIO devices")

---
v4->v5: no change

---
 drivers/bluetooth/btmtksdio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bluetooth/btmtksdio.c +2 -2
index df3f9d090529..9644069cecbb 100644
@@ -1281,6 +1281,8 @@ static int btmtksdio_probe(struct sdio_func *func,
 	hdev->manufacturer = 70;
 	set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
 
+	sdio_set_drvdata(func, bdev);
+
 	err = hci_register_dev(hdev);
 	if (err < 0) {
 		dev_err(&func->dev, "Can't register HCI device\n");
@@ -1288,8 +1290,6 @@ static int btmtksdio_probe(struct sdio_func *func,
 		return err;
 	}
 
-	sdio_set_drvdata(func, bdev);
-
 	/* pm_runtime_enable would be done after the firmware is being
 	 * downloaded because the core layer probably already enables
 	 * runtime PM for this func such as the case host->caps &
Signature · 1 line
2.25.1
#1 lore raw

PATCH v5 2/5 Bluetooth: mt7921s: Set HCI_QUIRK_VALID_LE_STATES

From: Yake Yang <[email protected]>

The patch set HCI_QUIRK_VALID_LE_STATES to be consistent with the btusb for MT7921 and is required for the likes of experimental LE simultaneous roles.

---
v4->v5: no change

---
 drivers/bluetooth/btmtksdio.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/bluetooth/btmtksdio.c +3 -0
index 9644069cecbb..034e55278c56 100644
@@ -1070,6 +1070,9 @@ static int btmtksdio_setup(struct hci_dev *hdev)
 			}
 		}
 
+		/* Valid LE States quirk for MediaTek 7921 */
+		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);
+
 		break;
 	case 0x7663:
 	case 0x7668:
Signature · 1 line
2.25.1
#2 lore raw

PATCH v5 3/5 Bluetooth: mt7921s: Add .get_data_path_id

In reply to [email protected]

From: Yake Yang <[email protected]>

Add .get_data_path_id to fetch data_path_id for MT7921 to support HFP offload use case.

This is a preliminary patch to add the WBS support to the MT7921 driver.

---
v4->v5: no change

---
 drivers/bluetooth/btmtksdio.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/bluetooth/btmtksdio.c +14 -1
index 034e55278c56..4000a994fe2c 100644
@@ -936,6 +936,13 @@ static int btmtksdio_mtk_reg_write(struct hci_dev *hdev, u32 reg, u32 val, u32 m
 	return err;
 }
 
+static int btmtksdio_get_data_path_id(struct hci_dev *hdev, __u8 *data_path_id)
+{
+	/* uses 1 as data path id for all the usecases */
+	*data_path_id = 1;
+	return 0;
+}
+
 static int btmtksdio_sco_setting(struct hci_dev *hdev)
 {
 	const struct btmtk_sco sco_setting = {
@@ -968,7 +975,13 @@ static int btmtksdio_sco_setting(struct hci_dev *hdev)
 		return err;
 
 	val |= 0x00000101;
-	return btmtksdio_mtk_reg_write(hdev, MT7921_PINMUX_1, val, ~0);
+	err =  btmtksdio_mtk_reg_write(hdev, MT7921_PINMUX_1, val, ~0);
+	if (err < 0)
+		return err;
+
+	hdev->get_data_path_id = btmtksdio_get_data_path_id;
+
+	return err;
 }
 
 static int btmtksdio_reset_setting(struct hci_dev *hdev)
Signature · 1 line
2.25.1
#3 lore raw

PATCH v5 4/5 Bluetooth: mt7921s: Add .btmtk_get_codec_config_data

In reply to [email protected]

From: Yake Yang <[email protected]>

add .btmtk_get_codec_config_data to get codec configuration data.

In HFP offload usecase, controllers need to be set codec details before opening SCO. This callback function is used to fetch vendor specific codec config data.

This is a preliminary patch to add the WBS support to the MT7921 driver.

---
v4->v5: no change

---
 drivers/bluetooth/btmtksdio.c | 50 +++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
drivers/bluetooth/btmtksdio.c +50 -0
index 4000a994fe2c..c28eb9fc6176 100644
@@ -943,6 +943,55 @@ static int btmtksdio_get_data_path_id(struct hci_dev *hdev, __u8 *data_path_id)
 	return 0;
 }
 
+static int btmtksdio_get_codec_config_data(struct hci_dev *hdev,
+					   __u8 link, struct bt_codec *codec,
+					   __u8 *ven_len, __u8 **ven_data)
+{
+	int err = 0;
+
+	if (!ven_data || !ven_len)
+		return -EINVAL;
+
+	*ven_len = 0;
+	*ven_data = NULL;
+
+	if (link != ESCO_LINK) {
+		bt_dev_err(hdev, "Invalid link type(%u)", link);
+		return -EINVAL;
+	}
+
+	*ven_data = kmalloc(sizeof(__u8), GFP_KERNEL);
+	if (!ven_data) {
+		err = -ENOMEM;
+		goto error;
+	}
+
+	/* supports only CVSD and mSBC offload codecs */
+	switch (codec->id) {
+	case 0x02:
+		**ven_data = 0x00;
+		break;
+	case 0x05:
+		**ven_data = 0x01;
+		break;
+	default:
+		err = -EINVAL;
+		bt_dev_err(hdev, "Invalid codec id(%u)", codec->id);
+		goto error;
+	}
+	/* codec and its capabilities are pre-defined to ids
+	 * preset id = 0x00 represents CVSD codec with sampling rate 8K
+	 * preset id = 0x01 represents mSBC codec with sampling rate 16K
+	 */
+	*ven_len = sizeof(__u8);
+	return err;
+
+error:
+	kfree(*ven_data);
+	*ven_data = NULL;
+	return err;
+}
+
 static int btmtksdio_sco_setting(struct hci_dev *hdev)
 {
 	const struct btmtk_sco sco_setting = {
@@ -980,6 +1029,7 @@ static int btmtksdio_sco_setting(struct hci_dev *hdev)
 		return err;
 
 	hdev->get_data_path_id = btmtksdio_get_data_path_id;
+	hdev->get_codec_config_data = btmtksdio_get_codec_config_data;
 
 	return err;
 }
Signature · 1 line
2.25.1
#4 lore raw

PATCH v5 5/5 Bluetooth: mt7921s: Add WBS support

In reply to [email protected]

From: Yake Yang <[email protected]>

It is time to add wide band speech (WBS) support.

---
v4->v5: no change

---
 drivers/bluetooth/btmtksdio.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/bluetooth/btmtksdio.c +3 -0
index c28eb9fc6176..f3dc5881fff7 100644
@@ -1123,6 +1123,9 @@ static int btmtksdio_setup(struct hci_dev *hdev)
 			return err;
 		}
 
+		/* Enable WBS with mSBC codec */
+		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);
+
 		/* Enable GPIO reset mechanism */
 		if (bdev->reset) {
 			err = btmtksdio_reset_setting(hdev);
Signature · 1 line
2.25.1
#5 lore raw
In reply to [email protected]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=624053

---Test result---

Test Summary:

CheckPatch                    PASS      7.95 seconds
GitLint                       PASS      4.78 seconds
SubjectPrefix                 PASS      4.21 seconds
BuildKernel                   PASS      29.45 seconds
BuildKernel32                 PASS      26.38 seconds
Incremental Build with patchesPASS      60.34 seconds
TestRunner: Setup             PASS      469.68 seconds
TestRunner: l2cap-tester      PASS      15.98 seconds
TestRunner: bnep-tester       PASS      6.24 seconds
TestRunner: mgmt-tester       PASS      103.42 seconds
TestRunner: rfcomm-tester     PASS      8.11 seconds
TestRunner: sco-tester        PASS      7.87 seconds
TestRunner: smp-tester        PASS      7.85 seconds
TestRunner: userchan-tester   PASS      6.60 seconds

---
Regards,
Linux Bluetooth

#6 lore raw
In reply to [email protected]
This series was applied to bluetooth/bluetooth-next.git (master) by Marcel Holtmann <[email protected]>:

Hello:

This series was applied to bluetooth/bluetooth-next.git (master) by Marcel Holtmann <[email protected]>:

Quoted 12 lines · On Thu, 17 Mar 2022 07:15:19 +0800 you wrote:

From: Yake Yang <[email protected]>

Fix the following kernel oops in btmtksdio_interrrupt

[   14.339134]  btmtksdio_interrupt+0x28/0x54
[   14.339139]  process_sdio_pending_irqs+0x68/0x1a0
[   14.339144]  sdio_irq_work+0x40/0x70
[   14.339154]  process_one_work+0x184/0x39c
[   14.339160]  worker_thread+0x228/0x3e8
[   14.339168]  kthread+0x148/0x3ac
[   14.339176]  ret_from_fork+0x10/0x30
Quoted 1 line

[...]

Here is the summary with links:
- [v5,1/5] Bluetooth: btmtksdio: Fix kernel oops in btmtksdio_interrupt
https://git.kernel.org/bluetooth/bluetooth-next/c/496eab9dde9f
- [v5,2/5] Bluetooth: mt7921s: Set HCI_QUIRK_VALID_LE_STATES

    https://git.kernel.org/bluetooth/bluetooth-next/c/aeeb8ed27062
  - [v5,3/5] Bluetooth: mt7921s: Add .get_data_path_id
    https://git.kernel.org/bluetooth/bluetooth-next/c/c844ce71d5be
  - [v5,4/5] Bluetooth: mt7921s: Add .btmtk_get_codec_config_data
    https://git.kernel.org/bluetooth/bluetooth-next/c/3cabc5ca2c9d
  - [v5,5/5] Bluetooth: mt7921s: Add WBS support
    https://git.kernel.org/bluetooth/bluetooth-next/c/255a55aaccb1

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html