[v8,1/3] Bluetooth: btusb: mediatek: readx_poll_timeout replaces open coding

Commit Message

Sean Wang June 28, 2023, 10:54 p.m. UTC

From: Sean Wang <[e-mail]>

Use readx_poll_timeout instead of open coding to poll the hardware reset
status until it is done.

Signed-off-by: Sean Wang <[e-mail]>
---
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(-)

Comments

[e-mail] June 28, 2023, 11:37 p.m. UTC | #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

[e-mail] June 29, 2023, 7:24 p.m. UTC | #2

Hello:

This series was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Thu, 29 Jun 2023 06:54:55 +0800 you wrote:
> From: Sean Wang <[e-mail]>
> 
> Use readx_poll_timeout instead of open coding to poll the hardware reset
> status until it is done.
> 
> Signed-off-by: Sean Wang <[e-mail]>
> 
> [...]

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!

Patch

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index cb58691b63ca..4c38d1c0f059 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -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)