Bluetooth: btusb: mediatek: readx_poll_timeout replaces open coding
Subsystems (2)
PATCH v8 1/3 Bluetooth: btusb: mediatek: readx_poll_timeout replaces open coding
From: Sean Wang <[email protected]>
Use readx_poll_timeout instead of open coding to poll the hardware reset status until it is done.
---
v2: use 20ms as the unit to poll according to the requirement of
readx_poll_timeout
v3: refine btusb_mtk_reset_done and drop the necessary error check
in btusb_mtk_cmd_timeout
v4, v5, v6 and v7: rebase onto the latest codebase
v8: fixed GitLint failure
--- drivers/bluetooth/btusb.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/bluetooth/btusb.c +15 -15
@@ -2657,8 +2657,6 @@ static int btusb_recv_event_realtek(struct hci_dev *hdev, struct sk_buff *skb)#define MTK_EP_RST_OPT 0x74011890#define MTK_EP_RST_IN_OUT_OPT 0x00010001#define MTK_BT_RST_DONE 0x00000100 -#define MTK_BT_RESET_WAIT_MS 100 -#define MTK_BT_RESET_NUM_TRIES 10#define MTK_BT_RESET_REG_CONNV3 0x70028610#define MTK_BT_READ_DEV_ID 0x70010200
@@ -3032,6 +3030,16 @@ static int btusb_mtk_id_get(struct btusb_data *data, u32 reg, u32 *id)return btusb_mtk_reg_read (data, reg, id); } +static u32 btusb_mtk_reset_done (struct hci_dev *hdev) +{ +struct btusb_data *data =hci_get_drvdata (hdev); +u32 val =0 ; + +btusb_mtk_uhw_reg_read (data,MTK_BT_MISC , &val); + +return val &MTK_BT_RST_DONE ; +} +static int btusb_mtk_setup (struct hci_dev *hdev) {struct btusb_data *data =hci_get_drvdata (hdev);
@@ -3232,7 +3240,7 @@ static void btusb_mtk_cmd_timeout(struct hci_dev *hdev) {struct btusb_data *data =hci_get_drvdata (hdev);u32 val; -int err, retry =0 ; +int err;struct btmediatek_data *mediatek;/* It's MediaTek specific bluetooth reset mechanism via USB */
@@ -3284,18 +3292,10 @@ static void btusb_mtk_cmd_timeout(struct hci_dev *hdev)btusb_mtk_uhw_reg_read (data,MTK_BT_SUBSYS_RST , &val); } -/* Poll the register until reset is completed */ -do { -btusb_mtk_uhw_reg_read (data,MTK_BT_MISC , &val); -if (val &MTK_BT_RST_DONE ) { -bt_dev_dbg (hdev,"Bluetooth Reset Successfully" ); -break ; - } - -bt_dev_dbg (hdev,"Polling Bluetooth Reset CR" ); - retry++; -msleep (MTK_BT_RESET_WAIT_MS ); - }while (retry <MTK_BT_RESET_NUM_TRIES ); + err =readx_poll_timeout (btusb_mtk_reset_done, hdev, val, + val &MTK_BT_RST_DONE ,20000 ,1000000 ); +if (err <0 ) +bt_dev_err (hdev,"Reset timeout" );btusb_mtk_id_get (data,0x70010200 , &val);if (!val)
Signature · 1 line
2.25.1
PATCH v8 2/3 Bluetooth: btmtk: introduce btmtk reset work
From: Jing Cai <[email protected]>
Introduce btmtk_reset_work which can be called whenever the firmware abort, HCI command timeout, other fatal error happen.
---
v2, v3, v4: rebase onto the latest codebase
v5: reset the device on hdev basis and use hci_cmd_sync_queue to
schedule reset work
v6 and v7: rebase onto the latest codebase
v8: drop _work suffix
--- drivers/bluetooth/btmtk.c | 15 ++++ drivers/bluetooth/btmtk.h | 8 +++ drivers/bluetooth/btusb.c | 145 +++++++++++++++++++------------------- 3 files changed, 97 insertions(+), 71 deletions(-)
drivers/bluetooth/btmtk.c +15 -0
@@ -285,6 +285,21 @@ int btmtk_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) }EXPORT_SYMBOL_GPL (btmtk_set_bdaddr); +void btmtk_reset_sync (struct hci_dev *hdev) +{ +struct btmediatek_data *reset_work =hci_get_priv (hdev); +int err; + +hci_dev_lock (hdev); + + err =hci_cmd_sync_queue (hdev, reset_work->reset_sync,NULL ,NULL ); +if (err) +bt_dev_err (hdev,"failed to reset (%d)" , err); + +hci_dev_unlock (hdev); +} +EXPORT_SYMBOL_GPL (btmtk_reset_sync); +MODULE_AUTHOR ("Sean Wang <[email protected]>" );MODULE_AUTHOR ("Mark Chen <[email protected]>" );MODULE_DESCRIPTION ("Bluetooth support for MediaTek devices ver " VERSION );
drivers/bluetooth/btmtk.h +8 -0
@@ -120,8 +120,11 @@ struct btmtk_hci_wmt_params {u32 *status; }; +typedef int (*btmtk_reset_sync_func_t )(struct hci_dev *,void *); +struct btmediatek_data {u32 dev_id; +btmtk_reset_sync_func_t reset_sync; }; typedef int (*wmt_cmd_sync_func_t)(struct hci_dev *,
@@ -136,6 +139,8 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,int btmtk_setup_firmware (struct hci_dev *hdev,const char *fwname,wmt_cmd_sync_func_t wmt_cmd_sync); + +void btmtk_reset_sync (struct hci_dev *hdev);#else static inline int btmtk_set_bdaddr(struct hci_dev *hdev,
@@ -156,4 +161,7 @@ static int btmtk_setup_firmware(struct hci_dev *hdev, const char *fwname, return -EOPNOTSUPP; } +static void btmtk_reset_sync (struct hci_dev *hdev) +{ +}#endif
drivers/bluetooth/btusb.c +74 -71
169 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v8 3/3 Bluetooth: btusb: mediatek: add MediaTek devcoredump support
In reply to [email protected]From: Jing Cai <[email protected]>
This patch implement function .coredump() and dmp_hdr() in btusb driver for MediaTek controller. FW core dump was triggered by FW specific event to show something unexpected happened in the controller.
The driver would be responsible for collecting and uploading the device core dump pieces in hci driver using core dump API. Once we finished the whole process, the driver would reset the controller to recover the kind of fatal error.
---
v2, v3: rebase onto the latest codebase
v4: update the newest API usage for the coredump which was already
into the upstream
v5: support devcoredump on hdev basis
v6: reuse the coredump state HCI_DEVCOREDUMP_* in driver
and drop the driver name copying
v7: rebase onto the latest codebase and refine the check if
we are reaching the end of the coredump
v8: rebase onto the latest tree
--- drivers/bluetooth/btmtk.c | 112 ++++++++++++++++++++++++++++++++++++++ drivers/bluetooth/btmtk.h | 28 ++++++++++ drivers/bluetooth/btusb.c | 14 +++++ 3 files changed, 154 insertions(+)
drivers/bluetooth/btmtk.c +112 -0
@@ -53,6 +53,56 @@ struct btmtk_section_map { }; } __packed; +static void btmtk_coredump (struct hci_dev *hdev) +{ +int err; + + err =__hci_cmd_send (hdev,0xfd5b ,0 ,NULL ); +if (err <0 ) +bt_dev_err (hdev,"Coredump failed (%d)" , err); +} + +static void btmtk_coredump_hdr (struct hci_dev *hdev,struct sk_buff *skb) +{ +struct btmediatek_data *data =hci_get_priv (hdev); +char buf[80 ]; + +snprintf (buf,sizeof (buf),"Controller Name: 0x%X\n" , + data->dev_id); +skb_put_data (skb, buf,strlen (buf)); + +snprintf (buf,sizeof (buf),"Firmware Version: 0x%X\n" , + data->cd_info.fw_version); +skb_put_data (skb, buf,strlen (buf)); + +snprintf (buf,sizeof (buf),"Driver: %s\n" , + data->cd_info.driver_name); +skb_put_data (skb, buf,strlen (buf)); + +snprintf (buf,sizeof (buf),"Vendor: MediaTek\n" ); +skb_put_data (skb, buf,strlen (buf)); +} + +static void btmtk_coredump_notify (struct hci_dev *hdev,int state) +{ +struct btmediatek_data *data =hci_get_priv (hdev); + +switch (state) { +case HCI_DEVCOREDUMP_IDLE : + data->cd_info.state =HCI_DEVCOREDUMP_IDLE ; +break ; +case HCI_DEVCOREDUMP_ACTIVE : + data->cd_info.state =HCI_DEVCOREDUMP_ACTIVE ; +break ; +case HCI_DEVCOREDUMP_TIMEOUT : +case HCI_DEVCOREDUMP_ABORT : +case HCI_DEVCOREDUMP_DONE : + data->cd_info.state =HCI_DEVCOREDUMP_IDLE ; +btmtk_reset_sync (hdev); +break ; + } +} +int btmtk_setup_firmware_79xx (struct hci_dev *hdev,const char *fwname,wmt_cmd_sync_func_t wmt_cmd_sync) {
@@ -300,6 +350,68 @@ void btmtk_reset_sync(struct hci_dev *hdev) }EXPORT_SYMBOL_GPL (btmtk_reset_sync); +int btmtk_register_coredump (struct hci_dev *hdev,const char *name, +u32 fw_version) +{ +struct btmediatek_data *data =hci_get_priv (hdev); + +if (!IS_ENABLED (CONFIG_DEV_COREDUMP )) +return -EOPNOTSUPP ; + + data->cd_info.fw_version = fw_version; + data->cd_info.state =HCI_DEVCOREDUMP_IDLE ; + data->cd_info.driver_name = name; + +return hci_devcd_register (hdev, btmtk_coredump, btmtk_coredump_hdr, + btmtk_coredump_notify); +} +EXPORT_SYMBOL_GPL (btmtk_register_coredump); + +int btmtk_process_coredump (struct hci_dev *hdev,struct sk_buff *skb) +{ +struct btmediatek_data *data =hci_get_priv (hdev); +int err; + +if (!IS_ENABLED (CONFIG_DEV_COREDUMP )) +return 0 ; + +switch (data->cd_info.state) { +case HCI_DEVCOREDUMP_IDLE : + err =hci_devcd_init (hdev,MTK_COREDUMP_SIZE ); +if (err <0 ) +break ; + data->cd_info.cnt =0 ; + +/* It is supposed coredump can be done within 5 seconds */ +schedule_delayed_work (&hdev->dump.dump_timeout, +msecs_to_jiffies (5000 )); + fallthrough; +case HCI_DEVCOREDUMP_ACTIVE : +default : + err =hci_devcd_append (hdev, skb); +if (err <0 ) +break ; + data->cd_info.cnt++; + +/* Mediatek coredump data would be more than MTK_COREDUMP_NUM */ +if (data->cd_info.cnt >MTK_COREDUMP_NUM && + skb->len >sizeof (MTK_COREDUMP_END ) && + !memcmp ((char *)&skb->data[skb->len -sizeof (MTK_COREDUMP_END )], +MTK_COREDUMP_END ,sizeof (MTK_COREDUMP_END ) -1 )) { +bt_dev_info (hdev,"Mediatek coredump end" ); +hci_devcd_complete (hdev); + } + +break ; + } + +if (err <0 ) +kfree_skb (skb); + +return err; +} +EXPORT_SYMBOL_GPL (btmtk_process_coredump); +MODULE_AUTHOR ("Sean Wang <[email protected]>" );MODULE_AUTHOR ("Mark Chen <[email protected]>" );MODULE_DESCRIPTION ("Bluetooth support for MediaTek devices ver " VERSION );
drivers/bluetooth/btmtk.h +28 -0
@@ -22,6 +22,10 @@#define MT7921_DLSTATUS 0x7c053c10#define BT_DL_STATE BIT(1) +#define MTK_COREDUMP_SIZE (1024 * 1000) +#define MTK_COREDUMP_END "coredump end" +#define MTK_COREDUMP_NUM 255 +enum {BTMTK_WMT_PATCH_DWNLD =0x1 ,BTMTK_WMT_TEST =0x2 ,
@@ -122,9 +126,17 @@ struct btmtk_hci_wmt_params {typedef int (*btmtk_reset_sync_func_t )(struct hci_dev *,void *); +struct btmtk_coredump_info { +const char *driver_name; +u32 fw_version; +u16 cnt; +int state; +}; +struct btmediatek_data {u32 dev_id;btmtk_reset_sync_func_t reset_sync; +struct btmtk_coredump_info cd_info; }; typedef int (*wmt_cmd_sync_func_t)(struct hci_dev *,
@@ -141,6 +153,11 @@ int btmtk_setup_firmware(struct hci_dev *hdev, const char *fwname, wmt_cmd_sync_func_t wmt_cmd_sync);void btmtk_reset_sync (struct hci_dev *hdev); + +int btmtk_register_coredump (struct hci_dev *hdev,const char *name, +u32 fw_version); + +int btmtk_process_coredump (struct hci_dev *hdev,struct sk_buff *skb);#else static inline int btmtk_set_bdaddr(struct hci_dev *hdev,
@@ -164,4 +181,15 @@ static int btmtk_setup_firmware(struct hci_dev *hdev, const char *fwname,static void btmtk_reset_sync (struct hci_dev *hdev) { } + +static int btmtk_register_coredump (struct hci_dev *hdev,const char *name, +u32 fw_version) +{ +return -EOPNOTSUPP ; +} + +static int btmtk_process_coredump (struct hci_dev *hdev,struct sk_buff *skb) +{ +return -EOPNOTSUPP ; +}#endif
drivers/bluetooth/btusb.c +14 -0
@@ -3153,6 +3153,10 @@ static int btusb_mtk_setup(struct hci_dev *hdev) mediatek->dev_id = dev_id; mediatek->reset_sync = btusb_mtk_reset; + err =btmtk_register_coredump (hdev, btusb_driver.name, fw_version); +if (err <0 ) +bt_dev_err (hdev,"Failed to register coredump (%d)" , err); +switch (dev_id) {case 0x7663 : fwname =FIRMWARE_MT7663 ;
@@ -3313,6 +3317,7 @@ static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb) {struct btusb_data *data =hci_get_drvdata (hdev);u16 handle =le16_to_cpu (hci_acl_hdr (skb)->handle); +struct sk_buff *skb_cd;switch (handle) {case 0xfc6f :/* Firmware dump from device */
@@ -3320,6 +3325,15 @@ static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb)* suspend and thus disable auto-suspend. */ usb_disable_autosuspend (data->udev); + +/* We need to forward the diagnostic packet to userspace daemon +* for backward compatibility, so we have to clone the packet +* extraly for the in-kernel coredump support. +*/ + skb_cd =skb_clone (skb,GFP_ATOMIC ); +if (skb_cd) +btmtk_process_coredump (hdev, skb_cd); + fallthrough;case 0x05ff :/* Firmware debug logging 1 */ case 0x05fe :/* Firmware debug logging 2 */
Signature · 1 line
2.25.1
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=761063
---Test result---
Test Summary:
CheckPatch PASS 3.64 seconds GitLint PASS 1.09 seconds SubjectPrefix PASS 0.39 seconds BuildKernel PASS 40.35 seconds CheckAllWarning PASS 45.14 seconds CheckSparse PASS 48.92 seconds CheckSmatch PASS 131.41 seconds BuildKernel32 PASS 37.59 seconds TestRunnerSetup PASS 550.92 seconds TestRunner_l2cap-tester PASS 19.57 seconds TestRunner_iso-tester PASS 29.10 seconds TestRunner_bnep-tester PASS 6.53 seconds TestRunner_mgmt-tester PASS 148.01 seconds TestRunner_rfcomm-tester PASS 10.65 seconds TestRunner_sco-tester PASS 9.74 seconds TestRunner_ioctl-tester PASS 11.31 seconds TestRunner_mesh-tester PASS 8.35 seconds TestRunner_smp-tester PASS 9.46 seconds TestRunner_userchan-tester PASS 6.88 seconds IncrementalBuild PASS 48.56 seconds
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Thu, 29 Jun 2023 06:54:55 +0800 you wrote:
From: Sean Wang <[email protected]>
Use
readx_poll_timeoutinstead of open coding to poll the hardware reset status until it is done.Signed-off-by Sean Wang <[email protected]>[...]
Here is the summary with links:
- [v8,1/3] Bluetooth: btusb: mediatek: readx_poll_timeout replaces open coding
https://git.kernel.org/bluetooth/bluetooth-next/c/c56e5f834e13 - [v8,2/3] Bluetooth: btmtk: introduce btmtk reset work https://git.kernel.org/bluetooth/bluetooth-next/c/ed2e80b8b6a7 - [v8,3/3] Bluetooth: btusb: mediatek: add MediaTek devcoredump support https://git.kernel.org/bluetooth/bluetooth-next/c/872f8c253cb9
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html