Bluetooth: btusb: mediatek: refactor btusb_mtk_reset function
Subsystems (2)
PATCH v2 1/2 Bluetooth: btusb: mediatek: refactor btusb_mtk_reset function
From: "hao.qin" <[email protected]>
Extract function btusb_mtk_subsys_reset from btusb_mtk_reset for future handling of resetting bluetooth controller without USB reset.
---
V1 -> V2: refactor btusb_mtk_reset function
Link:
https://lore.kernel.org/all/[email protected]/
--- drivers/bluetooth/btusb.c | 45 +++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 18 deletions(-)
drivers/bluetooth/btusb.c +27 -18
@@ -2994,28 +2994,13 @@ static u32 btusb_mtk_reset_done(struct hci_dev *hdev)return val &MTK_BT_RST_DONE ; } -static int btusb_mtk_reset (struct hci_dev *hdev,void *rst_data) +static int btusb_mtk_subsys_reset (struct hci_dev *hdev,u32 dev_id) {struct btusb_data *data =hci_get_drvdata (hdev); -struct btmediatek_data *mediatek;u32 val;int err; -/* It's MediaTek specific bluetooth reset mechanism via USB */ -if (test_and_set_bit (BTUSB_HW_RESET_ACTIVE , &data->flags)) { -bt_dev_err (hdev,"last reset failed? Not resetting again" ); -return -EBUSY ; - } - - err =usb_autopm_get_interface (data->intf); -if (err <0 ) -return err; - -btusb_stop_traffic (data); -usb_kill_anchored_urbs (&data->tx_anchor); - mediatek =hci_get_priv (hdev); - -if (mediatek->dev_id ==0x7925 ) { +if (dev_id ==0x7925 ) {btusb_mtk_uhw_reg_read (data,MTK_BT_RESET_REG_CONNV3 , &val); val |= (1 <<5 );btusb_mtk_uhw_reg_write (data,MTK_BT_RESET_REG_CONNV3 , val);
@@ -3059,8 +3044,32 @@ static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)if (!val)bt_dev_err (hdev,"Can't get device id, subsys reset fail." ); -usb_queue_reset_device (data->intf); +return err; +} +static int btusb_mtk_reset (struct hci_dev *hdev,void *rst_data) +{ +struct btusb_data *data =hci_get_drvdata (hdev); +struct btmediatek_data *mediatek; +int err; + +/* It's MediaTek specific bluetooth reset mechanism via USB */ +if (test_and_set_bit (BTUSB_HW_RESET_ACTIVE , &data->flags)) { +bt_dev_err (hdev,"last reset failed? Not resetting again" ); +return -EBUSY ; + } + + err =usb_autopm_get_interface (data->intf); +if (err <0 ) +return err; + +btusb_stop_traffic (data); +usb_kill_anchored_urbs (&data->tx_anchor); + mediatek =hci_get_priv (hdev); + + err =btusb_mtk_subsys_reset (hdev, mediatek->dev_id); + +usb_queue_reset_device (data->intf);clear_bit (BTUSB_HW_RESET_ACTIVE , &data->flags);return err;
Signature · 1 line
2.18.0
PATCH v2 2/2 Bluetooth: btusb: mediatek: add a recovery method for MT7922 and MT7925
From: "hao.qin" <[email protected]>
For MT7922 and MT7925, add USB reset retry to recover from patch download failure, and perform a reset before patch download to avoid unexpected problems caused by unkonwn status of dongle.
--- drivers/bluetooth/btusb.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
drivers/bluetooth/btusb.c +24 -5
@@ -3000,17 +3000,26 @@ static int btusb_mtk_subsys_reset(struct hci_dev *hdev, u32 dev_id)u32 val;int err; -if (dev_id ==0x7925 ) { +if (dev_id ==0x7922 ) { +btusb_mtk_uhw_reg_read (data,MTK_BT_SUBSYS_RST , &val); + val |=0x00002020 ; +btusb_mtk_uhw_reg_write (data,MTK_BT_SUBSYS_RST , val); +btusb_mtk_uhw_reg_write (data,MTK_EP_RST_OPT ,0x00010001 ); +btusb_mtk_uhw_reg_read (data,MTK_BT_SUBSYS_RST , &val); + val |=BIT (0 ); +btusb_mtk_uhw_reg_write (data,MTK_BT_SUBSYS_RST , val); +msleep (100 ); + }else if (dev_id ==0x7925 ) {btusb_mtk_uhw_reg_read (data,MTK_BT_RESET_REG_CONNV3 , &val); - val |= (1 <<5 ); + val |=BIT (5 );btusb_mtk_uhw_reg_write (data,MTK_BT_RESET_REG_CONNV3 , val);btusb_mtk_uhw_reg_read (data,MTK_BT_RESET_REG_CONNV3 , &val); val &=0xFFFF00FF ; - val |= (1 <<13 ); + val |=BIT (13 );btusb_mtk_uhw_reg_write (data,MTK_BT_RESET_REG_CONNV3 , val);btusb_mtk_uhw_reg_write (data,MTK_EP_RST_OPT ,0x00010001 );btusb_mtk_uhw_reg_read (data,MTK_BT_RESET_REG_CONNV3 , &val); - val |= (1 <<0 ); + val |=BIT (0 );btusb_mtk_uhw_reg_write (data,MTK_BT_RESET_REG_CONNV3 , val);btusb_mtk_uhw_reg_write (data,MTK_UDMA_INT_STA_BT ,0x000000FF );btusb_mtk_uhw_reg_read (data,MTK_UDMA_INT_STA_BT , &val);
@@ -3040,6 +3049,9 @@ static int btusb_mtk_subsys_reset(struct hci_dev *hdev, u32 dev_id)if (err <0 )bt_dev_err (hdev,"Reset timeout" ); +if (dev_id ==0x7922 ) +btusb_mtk_uhw_reg_write (data,MTK_UDMA_INT_STA_BT ,0x000000FF ); +btusb_mtk_id_get (data,0x70010200 , &val);if (!val)bt_dev_err (hdev,"Can't get device id, subsys reset fail." );
@@ -3128,8 +3140,10 @@ static int btusb_mtk_setup(struct hci_dev *hdev) fwname =FIRMWARE_MT7668 ;break ;case 0x7922 : -case 0x7961 :case 0x7925 : +btusb_mtk_subsys_reset (hdev, dev_id); + fallthrough; +case 0x7961 :if (dev_id ==0x7925 ) snprintf(fw_bin_name, sizeof(fw_bin_name), "mediatek/mt%04x/BT_RAM_CODE_MT%04x_1_%x_hdr.bin",
@@ -3143,6 +3157,11 @@ static int btusb_mtk_setup(struct hci_dev *hdev) btusb_mtk_hci_wmt_sync);if (err <0 ) {bt_dev_err (hdev,"Failed to set up firmware (%d)" , err); +if (dev_id ==0x7922 || dev_id ==0x7925 ) { +btusb_stop_traffic (data); +usb_kill_anchored_urbs (&data->tx_anchor); +usb_queue_reset_device (data->intf); + }return err; }
Signature · 1 line
2.18.0
Re: [PATCH v2 2/2] Bluetooth: btusb: mediatek: add a recovery method for MT7922 and MT7925
Quoted 58 lines · Hao Qin
From: "hao.qin" <[email protected]>
For MT7922 and MT7925, add USB reset retry to recover from patch download failure, and perform a reset before patch download to avoid unexpected problems caused by unkonwn status of dongle.
Signed-off-by hao.qin <[email protected]>--- drivers/bluetooth/btusb.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)drivers/bluetooth/btusb.c +16
-4@@ -3000,17 +3000,26 @@ static int btusb_mtk_subsys_reset(struct hci_dev *hdev, u32 dev_id)u32 val;int err; -if (dev_id ==0x7925 ) { +if (dev_id ==0x7922 ) { +btusb_mtk_uhw_reg_read (data,MTK_BT_SUBSYS_RST , &val); + val |=0x00002020 ; +btusb_mtk_uhw_reg_write (data,MTK_BT_SUBSYS_RST , val); +btusb_mtk_uhw_reg_write (data,MTK_EP_RST_OPT ,0x00010001 ); +btusb_mtk_uhw_reg_read (data,MTK_BT_SUBSYS_RST , &val); + val |=BIT (0 ); +btusb_mtk_uhw_reg_write (data,MTK_BT_SUBSYS_RST , val); +msleep (100 ); + }else if (dev_id ==0x7925 ) {btusb_mtk_uhw_reg_read (data,MTK_BT_RESET_REG_CONNV3 , &val); - val |= (1 <<5 ); + val |=BIT (5 );btusb_mtk_uhw_reg_write (data,MTK_BT_RESET_REG_CONNV3 , val);btusb_mtk_uhw_reg_read (data,MTK_BT_RESET_REG_CONNV3 , &val); val &=0xFFFF00FF ; - val |= (1 <<13 ); + val |=BIT (13 );btusb_mtk_uhw_reg_write (data,MTK_BT_RESET_REG_CONNV3 , val);btusb_mtk_uhw_reg_write (data,MTK_EP_RST_OPT ,0x00010001 );btusb_mtk_uhw_reg_read (data,MTK_BT_RESET_REG_CONNV3 , &val); - val |= (1 <<0 ); + val |=BIT (0 );btusb_mtk_uhw_reg_write (data,MTK_BT_RESET_REG_CONNV3 , val);btusb_mtk_uhw_reg_write (data,MTK_UDMA_INT_STA_BT ,0x000000FF );btusb_mtk_uhw_reg_read (data,MTK_UDMA_INT_STA_BT , &val);@@ -3040,6 +3049,9 @@ static int btusb_mtk_subsys_reset(struct hci_dev *hdev, u32 dev_id)if (err <0 )bt_dev_err (hdev,"Reset timeout" ); +if (dev_id ==0x7922 ) +btusb_mtk_uhw_reg_write (data,MTK_UDMA_INT_STA_BT ,0x000000FF ); +btusb_mtk_id_get (data,0x70010200 , &val);if (!val)bt_dev_err (hdev,"Can't get device id, subsys reset fail." );
drivers/bluetooth/btusb.c static int btusb_mtk_setup(struct hci_dev *hdev) · line 3144
Quoted 6 lines
drivers/bluetooth/btusb.c +1
-1@@ -3128,8 +3140,10 @@ static int btusb_mtk_setup(struct hci_dev *hdev) fwname =FIRMWARE_MT7668 ;break ;case 0x7922 : -case 0x7961 :case 0x7925 : +btusb_mtk_subsys_reset (hdev, dev_id);
Is there any reason we cannot perform a subsystem reset for 0x7961? I believe it would enhance robustness under any circumstance, such as cold reboot, warm reboot, or suspension,
ensuring that the controller can be reset to its initial state
drivers/bluetooth/btusb.c static int btusb_mtk_setup(struct hci_dev *hdev) · line 3160
Quoted 10 lines
drivers/bluetooth/btusb.c +3
-0+fallthrough ; +case 0x7961 :if (dev_id ==0x7925 ) snprintf(fw_bin_name, sizeof(fw_bin_name), "mediatek/mt%04x/BT_RAM_CODE_MT%04x_1_%x_hdr.bin",@@ -3143,6 +3157,11 @@ static int btusb_mtk_setup(struct hci_dev *hdev) btusb_mtk_hci_wmt_sync);if (err <0 ) {bt_dev_err (hdev,"Failed to set up firmware (%d)" , err); +if (dev_id ==0x7922 || dev_id ==0x7925 ) {
Similarly, is there any reason we cannot apply the same approach for mt7961? Using a less specific condition would reduce maintenance effort in the future.
drivers/bluetooth/btusb.c static int btusb_mtk_setup(struct hci_dev *hdev) · line 3163
Quoted 3 lines
drivers/bluetooth/btusb.c +3
-0+btusb_stop_traffic (data); +usb_kill_anchored_urbs (&data->tx_anchor); +usb_queue_reset_device (data->intf);
If an error occurs during firmware download, I guess we can subsequently attempt to download the firmware again through several retries.
This helps the controller to autonomously recover from any potential errors and ensure we can complete the initialization process.
Quoted 8 lines
drivers/bluetooth/btusb.c +1
-1+ }return err; } --2.18.0
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=813831
---Test result---
Test Summary:
CheckPatch PASS 1.20 seconds GitLint PASS 0.68 seconds SubjectPrefix PASS 0.23 seconds BuildKernel PASS 28.23 seconds CheckAllWarning PASS 31.25 seconds CheckSparse PASS 36.46 seconds CheckSmatch PASS 99.93 seconds BuildKernel32 PASS 27.54 seconds TestRunnerSetup PASS 437.60 seconds TestRunner_l2cap-tester PASS 23.05 seconds TestRunner_iso-tester PASS 47.30 seconds TestRunner_bnep-tester PASS 6.85 seconds TestRunner_mgmt-tester FAIL 160.98 seconds TestRunner_rfcomm-tester PASS 10.80 seconds TestRunner_sco-tester PASS 14.39 seconds TestRunner_ioctl-tester PASS 12.03 seconds TestRunner_mesh-tester PASS 8.68 seconds TestRunner_smp-tester PASS 9.70 seconds TestRunner_userchan-tester PASS 7.10 seconds IncrementalBuild PASS 31.60 seconds
Details
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 497, Passed: 495 (99.6%), Failed: 1, Not Run: 1
Failed Test Cases
LL Privacy - Start Discovery 2 (Disable RL) Failed 0.269 seconds
---
Regards,
Linux Bluetooth
Quoted 9 lines · Hao Qin
From: "hao.qin" <[email protected]>
Extract function
btusb_mtk_subsys_resetfrombtusb_mtk_resetfor future handling of resetting bluetooth controller without USB reset.Signed-off-by hao.qin <[email protected]>
The patch doesn't modify any logic; it simply divides the existing logic into two parts,
each prepared to be called in a specific context. Thus, Acked-by:
Sean Wang <[email protected]>
Quoted 82 lines
---
V1 -> V2: refactorbtusb_mtk_resetfunctionLink:
https://lore.kernel.org/all/[email protected]/--- drivers/bluetooth/btusb.c | 45 +++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 18 deletions(-)drivers/bluetooth/btusb.c +27
-19@@ -2994,28 +2994,13 @@ static u32 btusb_mtk_reset_done(struct hci_dev *hdev)return val &MTK_BT_RST_DONE ; } -static int btusb_mtk_reset (struct hci_dev *hdev,void *rst_data) +static int btusb_mtk_subsys_reset (struct hci_dev *hdev,u32 dev_id) {struct btusb_data *data =hci_get_drvdata (hdev); -struct btmediatek_data *mediatek;u32 val;int err; -/* It's MediaTek specific bluetooth reset mechanism via USB */ -if (test_and_set_bit (BTUSB_HW_RESET_ACTIVE , &data->flags)) { -bt_dev_err (hdev,"last reset failed? Not resetting again" ); -return -EBUSY ; - } - - err =usb_autopm_get_interface (data->intf); -if (err <0 ) -return err; - -btusb_stop_traffic (data); -usb_kill_anchored_urbs (&data->tx_anchor); - mediatek =hci_get_priv (hdev); - -if (mediatek->dev_id ==0x7925 ) { +if (dev_id ==0x7925 ) {btusb_mtk_uhw_reg_read (data,MTK_BT_RESET_REG_CONNV3 , &val); val |= (1 <<5 );btusb_mtk_uhw_reg_write (data,MTK_BT_RESET_REG_CONNV3 , val);@@ -3059,8 +3044,32 @@ static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)if (!val)bt_dev_err (hdev,"Can't get device id, subsys reset fail." ); -usb_queue_reset_device (data->intf); +return err; +} +static int btusb_mtk_reset (struct hci_dev *hdev,void *rst_data) +{ +struct btusb_data *data =hci_get_drvdata (hdev); +struct btmediatek_data *mediatek; +int err; + +/* It's MediaTek specific bluetooth reset mechanism via USB */ +if (test_and_set_bit (BTUSB_HW_RESET_ACTIVE , &data->flags)) { +bt_dev_err (hdev,"last reset failed? Not resetting again" ); +return -EBUSY ; + } + + err =usb_autopm_get_interface (data->intf); +if (err <0 ) +return err; + +btusb_stop_traffic (data); +usb_kill_anchored_urbs (&data->tx_anchor); + mediatek =hci_get_priv (hdev); + + err =btusb_mtk_subsys_reset (hdev, mediatek->dev_id); + +usb_queue_reset_device (data->intf);clear_bit (BTUSB_HW_RESET_ACTIVE , &data->flags);return err; --2.18.0