From: Sean Wang <[email protected]>
Use readx_poll_timeout instead of open coding to poll the hardware reset
status until it is done.
Signed-off-by: Sean Wang <[email protected]>
---
drivers/bluetooth/btusb.c | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index c3daba17de7f..4dc9cae3e937 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2318,8 +2318,6 @@ static int btusb_send_frame_intel(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
static void btusb_mtk_wmt_recv(struct urb *urb)
{
@@ -2690,6 +2688,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;
+}
+
static int btusb_mtk_setup(struct hci_dev *hdev)
{
struct btusb_data *data = hci_get_drvdata(hdev);
@@ -2879,7 +2887,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;
/* It's MediaTek specific bluetooth reset mechanism via USB */
if (test_and_set_bit(BTUSB_HW_RESET_ACTIVE, &data->flags)) {
@@ -2910,18 +2918,14 @@ static void btusb_mtk_cmd_timeout(struct hci_dev *hdev)
btusb_mtk_uhw_reg_write(data, MTK_BT_SUBSYS_RST, 0);
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;
- }
+ err = readx_poll_timeout(btusb_mtk_reset_done, hdev, val,
+ val & MTK_BT_RST_DONE,
+ 100000, 1000000);
+ if (err < 0)
+ bt_dev_err(hdev, "Reset timeout");
- bt_dev_dbg(hdev, "Polling Bluetooth Reset CR");
- retry++;
- msleep(MTK_BT_RESET_WAIT_MS);
- } while (retry < MTK_BT_RESET_NUM_TRIES);
+ if (val & MTK_BT_RST_DONE)
+ bt_dev_dbg(hdev, "Bluetooth Reset Successfully");
btusb_mtk_id_get(data, 0x70010200, &val);
if (!val)
--
2.25.1
From: Jing Cai <[email protected]>
Introduce btmtk_reset_work which can be called whenever the firmware abort,
HCI command timeout, other fatal error happen.
Co-developed-by: Sean Wang <[email protected]>
Signed-off-by: Sean Wang <[email protected]>
Signed-off-by: Jing Cai <[email protected]>
---
drivers/bluetooth/btmtk.c | 16 ++++++
drivers/bluetooth/btmtk.h | 14 +++++
drivers/bluetooth/btusb.c | 114 ++++++++++++++++++++------------------
3 files changed, 90 insertions(+), 54 deletions(-)
diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index 809762d64fc6..77df7b5c3ef3 100644
--- a/drivers/bluetooth/btmtk.c
+++ b/drivers/bluetooth/btmtk.c
@@ -53,6 +53,8 @@ struct btmtk_section_map {
};
} __packed;
+static struct btmtk_reset_work reset_work;
+
int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,
wmt_cmd_sync_func_t wmt_cmd_sync)
{
@@ -280,6 +282,20 @@ int btmtk_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
}
EXPORT_SYMBOL_GPL(btmtk_set_bdaddr);
+void btmtk_init_reset_work(struct hci_dev *hdev, work_func_t func)
+{
+ reset_work.hdev = hdev;
+ INIT_WORK(&reset_work.work, func);
+}
+EXPORT_SYMBOL_GPL(btmtk_init_reset_work);
+
+void btmtk_reset_sync(struct hci_dev *hdev)
+{
+ schedule_work(&reset_work.work);
+ flush_work(&reset_work.work);
+}
+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);
diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h
index 2a88ea8e475e..22d39f637652 100644
--- a/drivers/bluetooth/btmtk.h
+++ b/drivers/bluetooth/btmtk.h
@@ -119,6 +119,11 @@ struct btmtk_hci_wmt_params {
u32 *status;
};
+struct btmtk_reset_work {
+ struct hci_dev *hdev;
+ struct work_struct work;
+};
+
typedef int (*wmt_cmd_sync_func_t)(struct hci_dev *,
struct btmtk_hci_wmt_params *);
@@ -131,6 +136,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_init_reset_work(struct hci_dev *hdev, work_func_t func);
+void btmtk_reset_sync(struct hci_dev *hdev);
#else
static inline int btmtk_set_bdaddr(struct hci_dev *hdev,
@@ -151,4 +158,11 @@ static int btmtk_setup_firmware(struct hci_dev *hdev, const char *fwname,
return -EOPNOTSUPP;
}
+static void btmtk_init_reset_work(struct hci_dev *hdev, work_func_t func)
+{
+}
+
+static void btmtk_reset_sync(struct hci_dev *hdev)
+{
+}
#endif
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 4dc9cae3e937..653f57a98233 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2698,6 +2698,63 @@ static u32 btusb_mtk_reset_done(struct hci_dev *hdev)
return val;
}
+static void btusb_mtk_reset_work(struct work_struct *work)
+{
+ struct btmtk_reset_work *info = container_of(work,
+ struct btmtk_reset_work,
+ work);
+ struct hci_dev *hdev = info->hdev;
+ struct btusb_data *data = hci_get_drvdata(hdev);
+ 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;
+ }
+
+ err = usb_autopm_get_interface(data->intf);
+ if (err < 0)
+ return;
+
+ btusb_stop_traffic(data);
+ usb_kill_anchored_urbs(&data->tx_anchor);
+
+ /* It's Device EndPoint Reset Option Register */
+ bt_dev_dbg(hdev, "Initiating reset mechanism via uhw");
+ btusb_mtk_uhw_reg_write(data, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT);
+ btusb_mtk_uhw_reg_read(data, MTK_BT_WDT_STATUS, &val);
+
+ /* Reset the bluetooth chip via USB interface. */
+ btusb_mtk_uhw_reg_write(data, MTK_BT_SUBSYS_RST, 1);
+ btusb_mtk_uhw_reg_write(data, MTK_UDMA_INT_STA_BT, 0x000000FF);
+ btusb_mtk_uhw_reg_read(data, MTK_UDMA_INT_STA_BT, &val);
+ btusb_mtk_uhw_reg_write(data, MTK_UDMA_INT_STA_BT1, 0x000000FF);
+ btusb_mtk_uhw_reg_read(data, MTK_UDMA_INT_STA_BT1, &val);
+ /* MT7921 need to delay 20ms between toggle reset bit */
+ msleep(20);
+ btusb_mtk_uhw_reg_write(data, MTK_BT_SUBSYS_RST, 0);
+ btusb_mtk_uhw_reg_read(data, MTK_BT_SUBSYS_RST, &val);
+
+ err = readx_poll_timeout(btusb_mtk_reset_done, hdev, val,
+ val & MTK_BT_RST_DONE,
+ 100000, 1000000);
+ if (err < 0)
+ bt_dev_err(hdev, "Reset timeout");
+
+ if (val & MTK_BT_RST_DONE)
+ bt_dev_err(hdev, "Bluetooth Reset Successfully");
+
+ btusb_mtk_id_get(data, 0x70010200, &val);
+ if (!val)
+ bt_dev_err(hdev, "Can't get device id, subsys reset fail.");
+
+ usb_queue_reset_device(data->intf);
+
+ clear_bit(BTUSB_HW_RESET_ACTIVE, &data->flags);
+}
+
static int btusb_mtk_setup(struct hci_dev *hdev)
{
struct btusb_data *data = hci_get_drvdata(hdev);
@@ -2734,6 +2791,8 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
}
}
+ btmtk_init_reset_work(hdev, btusb_mtk_reset_work);
+
switch (dev_id) {
case 0x7663:
fwname = FIRMWARE_MT7663;
@@ -2883,59 +2942,6 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev)
return 0;
}
-static void btusb_mtk_cmd_timeout(struct hci_dev *hdev)
-{
- struct btusb_data *data = hci_get_drvdata(hdev);
- 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;
- }
-
- err = usb_autopm_get_interface(data->intf);
- if (err < 0)
- return;
-
- btusb_stop_traffic(data);
- usb_kill_anchored_urbs(&data->tx_anchor);
-
- /* It's Device EndPoint Reset Option Register */
- bt_dev_dbg(hdev, "Initiating reset mechanism via uhw");
- btusb_mtk_uhw_reg_write(data, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT);
- btusb_mtk_uhw_reg_read(data, MTK_BT_WDT_STATUS, &val);
-
- /* Reset the bluetooth chip via USB interface. */
- btusb_mtk_uhw_reg_write(data, MTK_BT_SUBSYS_RST, 1);
- btusb_mtk_uhw_reg_write(data, MTK_UDMA_INT_STA_BT, 0x000000FF);
- btusb_mtk_uhw_reg_read(data, MTK_UDMA_INT_STA_BT, &val);
- btusb_mtk_uhw_reg_write(data, MTK_UDMA_INT_STA_BT1, 0x000000FF);
- btusb_mtk_uhw_reg_read(data, MTK_UDMA_INT_STA_BT1, &val);
- /* MT7921 need to delay 20ms between toggle reset bit */
- msleep(20);
- btusb_mtk_uhw_reg_write(data, MTK_BT_SUBSYS_RST, 0);
- btusb_mtk_uhw_reg_read(data, MTK_BT_SUBSYS_RST, &val);
-
- err = readx_poll_timeout(btusb_mtk_reset_done, hdev, val,
- val & MTK_BT_RST_DONE,
- 100000, 1000000);
- if (err < 0)
- bt_dev_err(hdev, "Reset timeout");
-
- if (val & MTK_BT_RST_DONE)
- bt_dev_dbg(hdev, "Bluetooth Reset Successfully");
-
- btusb_mtk_id_get(data, 0x70010200, &val);
- if (!val)
- bt_dev_err(hdev, "Can't get device id, subsys reset fail.");
-
- usb_queue_reset_device(data->intf);
-
- clear_bit(BTUSB_HW_RESET_ACTIVE, &data->flags);
-}
-
static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb)
{
struct btusb_data *data = hci_get_drvdata(hdev);
@@ -3859,7 +3865,7 @@ static int btusb_probe(struct usb_interface *intf,
hdev->setup = btusb_mtk_setup;
hdev->shutdown = btusb_mtk_shutdown;
hdev->manufacturer = 70;
- hdev->cmd_timeout = btusb_mtk_cmd_timeout;
+ hdev->cmd_timeout = btmtk_reset_sync;
hdev->set_bdaddr = btmtk_set_bdaddr;
set_bit(HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN, &hdev->quirks);
set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
--
2.25.1
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.
Co-developed-by: Sean Wang <[email protected]>
Signed-off-by: Sean Wang <[email protected]>
Signed-off-by: Jing Cai <[email protected]>
---
The patch need to work on the top of the patch provided from Manish Mandlik
in https://patchwork.kernel.org/project/bluetooth/patch/20220809083112.v4.3.Iaf638bb9f885f5880ab1b4e7ae2f73dd53a54661@changeid/
---
drivers/bluetooth/btmtk.c | 124 ++++++++++++++++++++++++++++++++++++++
drivers/bluetooth/btmtk.h | 13 ++++
drivers/bluetooth/btusb.c | 11 ++++
3 files changed, 148 insertions(+)
diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index 77df7b5c3ef3..2835ae28ae35 100644
--- a/drivers/bluetooth/btmtk.c
+++ b/drivers/bluetooth/btmtk.c
@@ -18,6 +18,14 @@
#define MTK_FW_ROM_PATCH_SEC_MAP_SIZE 64
#define MTK_SEC_MAP_COMMON_SIZE 12
#define MTK_SEC_MAP_NEED_SEND_SIZE 52
+#define MTK_DRIVER_NAME_LEN 16
+#define MTK_COREDUMP_END "coredump end"
+
+enum {
+ BTMTK_COREDUMP_INIT,
+ BTMTK_COREDUMP_DISABLED,
+ BTMTK_COREDUMP_ACTIVE,
+};
struct btmtk_patch_header {
u8 datetime[16];
@@ -53,8 +61,65 @@ struct btmtk_section_map {
};
} __packed;
+static struct btmtk_coredump_info {
+ struct hci_dev *hdev;
+ char driver_name[MTK_DRIVER_NAME_LEN];
+ u32 dev_id;
+ u32 fw_version;
+ int state;
+} coredump_info;
+
static struct btmtk_reset_work reset_work;
+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 int btmtk_coredump_hdr(struct hci_dev *hdev, char *buf, size_t size)
+{
+ char *ptr = buf;
+ size_t rem = size;
+ size_t read = 0;
+
+ read = snprintf(ptr, rem, "Controller Name: 0x%X\n", coredump_info.dev_id);
+ rem -= read;
+ ptr += read;
+
+ read = snprintf(ptr, rem, "Firmware Version: 0x%X\n", coredump_info.fw_version);
+ rem -= read;
+ ptr += read;
+
+ read = snprintf(ptr, rem, "Driver: %s\n", coredump_info.driver_name);
+ rem -= read;
+ ptr += read;
+
+ read = snprintf(ptr, rem, "Vendor: MediaTek\n");
+ rem -= read;
+ ptr += read;
+
+ return size - rem;
+}
+
+static void btmtk_coredump_notify(struct hci_dev *hdev, int state)
+{
+ switch (state) {
+ case HCI_DEVCOREDUMP_ACTIVE:
+ coredump_info.state = BTMTK_COREDUMP_ACTIVE;
+ break;
+ case HCI_DEVCOREDUMP_TIMEOUT:
+ case HCI_DEVCOREDUMP_ABORT:
+ case HCI_DEVCOREDUMP_DONE:
+ coredump_info.state = BTMTK_COREDUMP_INIT;
+ btmtk_reset_sync(coredump_info.hdev);
+ break;
+ }
+}
+
int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,
wmt_cmd_sync_func_t wmt_cmd_sync)
{
@@ -296,6 +361,65 @@ void btmtk_reset_sync(struct hci_dev *hdev)
}
EXPORT_SYMBOL_GPL(btmtk_reset_sync);
+void btmtk_register_coredump(struct hci_dev *hdev, u32 dev_id,
+ const char *name, u32 fw_version)
+{
+ if (!IS_ENABLED(CONFIG_DEV_COREDUMP))
+ return;
+
+ coredump_info.hdev = hdev;
+ coredump_info.dev_id = dev_id;
+ coredump_info.fw_version = fw_version;
+ coredump_info.state = BTMTK_COREDUMP_INIT;
+ strncpy(coredump_info.driver_name, name, MTK_DRIVER_NAME_LEN - 1);
+
+ hci_devcoredump_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)
+{
+ int err;
+
+ if (!IS_ENABLED(CONFIG_DEV_COREDUMP))
+ return 0;
+
+ switch (coredump_info.state) {
+ case BTMTK_COREDUMP_DISABLED:
+ err = -EINVAL;
+ break;
+ case BTMTK_COREDUMP_INIT:
+ err = hci_devcoredump_init(hdev, 1024000);
+ if (err < 0)
+ break;
+ /* It is supposed coredump can be done within 5 seconds */
+ schedule_delayed_work(&hdev->dump.dump_timeout,
+ msecs_to_jiffies(5000));
+ fallthrough;
+ case BTMTK_COREDUMP_ACTIVE:
+ default:
+ err = hci_devcoredump_append(hdev, skb);
+ if (err < 0)
+ break;
+
+ if (skb->len > 12 &&
+ !strncmp((char *)&skb->data[skb->len - 13],
+ MTK_COREDUMP_END, 12))
+ hci_devcoredump_complete(hdev);
+
+ break;
+ }
+
+ if (err < 0) {
+ coredump_info.state = BTMTK_COREDUMP_DISABLED;
+ 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);
diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h
index 22d39f637652..faf941ce7ca2 100644
--- a/drivers/bluetooth/btmtk.h
+++ b/drivers/bluetooth/btmtk.h
@@ -138,6 +138,9 @@ int btmtk_setup_firmware(struct hci_dev *hdev, const char *fwname,
wmt_cmd_sync_func_t wmt_cmd_sync);
void btmtk_init_reset_work(struct hci_dev *hdev, work_func_t func);
void btmtk_reset_sync(struct hci_dev *hdev);
+void btmtk_register_coredump(struct hci_dev *hdev, u32 dev_id, 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,
@@ -165,4 +168,14 @@ static void btmtk_init_reset_work(struct hci_dev *hdev, work_func_t func)
static void btmtk_reset_sync(struct hci_dev *hdev)
{
}
+
+void btmtk_register_coredump(struct hci_dev *hdev, u32 dev_id, const char *name,
+ u32 fw_version)
+{
+}
+
+static int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)
+{
+ return -EOPNOTSUPP;
+}
#endif
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index dc86726c8271..e37919f46331 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2796,6 +2796,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
}
btmtk_init_reset_work(hdev, btusb_mtk_reset_work);
+ btmtk_register_coredump(hdev, dev_id, btusb_driver.name, fw_version);
switch (dev_id) {
case 0x7663:
@@ -2950,6 +2951,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 */
@@ -2957,6 +2959,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 */
--
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=676354
---Test result---
Test Summary:
CheckPatch PASS 5.17 seconds
GitLint FAIL 1.94 seconds
SubjectPrefix PASS 1.26 seconds
BuildKernel FAIL 46.70 seconds
BuildKernel32 FAIL 40.93 seconds
Incremental Build with patchesERROR 0.19 seconds
TestRunner: Setup PASS 684.69 seconds
TestRunner: l2cap-tester PASS 21.12 seconds
TestRunner: iso-tester PASS 21.32 seconds
TestRunner: bnep-tester PASS 8.21 seconds
TestRunner: mgmt-tester PASS 132.98 seconds
TestRunner: rfcomm-tester PASS 12.65 seconds
TestRunner: sco-tester PASS 12.08 seconds
TestRunner: smp-tester PASS 12.00 seconds
TestRunner: userchan-tester PASS 8.63 seconds
Details
##############################
Test: GitLint - FAIL - 1.94 seconds
Run gitlint with rule in .gitlint
[4/4] Bluetooth: btusb: mediatek: add MediaTek devcoredump support
19: B1 Line exceeds max length (127>80): "in https://patchwork.kernel.org/project/bluetooth/patch/20220809083112.v4.3.Iaf638bb9f885f5880ab1b4e7ae2f73dd53a54661@changeid/"
##############################
Test: BuildKernel - FAIL - 46.70 seconds
Build Kernel with minimal configuration supports Bluetooth
drivers/bluetooth/btmtk.c: In function ‘btmtk_coredump_notify’:
drivers/bluetooth/btmtk.c:111:7: error: ‘HCI_DEVCOREDUMP_ACTIVE’ undeclared (first use in this function); did you mean ‘BTMTK_COREDUMP_ACTIVE’?
111 | case HCI_DEVCOREDUMP_ACTIVE:
| ^~~~~~~~~~~~~~~~~~~~~~
| BTMTK_COREDUMP_ACTIVE
drivers/bluetooth/btmtk.c:111:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/bluetooth/btmtk.c:114:7: error: ‘HCI_DEVCOREDUMP_TIMEOUT’ undeclared (first use in this function); did you mean ‘HCI_DISCONN_TIMEOUT’?
114 | case HCI_DEVCOREDUMP_TIMEOUT:
| ^~~~~~~~~~~~~~~~~~~~~~~
| HCI_DISCONN_TIMEOUT
drivers/bluetooth/btmtk.c:115:7: error: ‘HCI_DEVCOREDUMP_ABORT’ undeclared (first use in this function)
115 | case HCI_DEVCOREDUMP_ABORT:
| ^~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c:116:7: error: ‘HCI_DEVCOREDUMP_DONE’ undeclared (first use in this function)
116 | case HCI_DEVCOREDUMP_DONE:
| ^~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c: In function ‘btmtk_register_coredump’:
drivers/bluetooth/btmtk.c:376:2: error: implicit declaration of function ‘hci_devcoredump_register’ [-Werror=implicit-function-declaration]
376 | hci_devcoredump_register(hdev, btmtk_coredump, btmtk_coredump_hdr,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c: In function ‘btmtk_process_coredump’:
drivers/bluetooth/btmtk.c:393:9: error: implicit declaration of function ‘hci_devcoredump_init’ [-Werror=implicit-function-declaration]
393 | err = hci_devcoredump_init(hdev, 1024000);
| ^~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c:397:30: error: ‘struct hci_dev’ has no member named ‘dump’
397 | schedule_delayed_work(&hdev->dump.dump_timeout,
| ^~
drivers/bluetooth/btmtk.c:402:9: error: implicit declaration of function ‘hci_devcoredump_append’ [-Werror=implicit-function-declaration]
402 | err = hci_devcoredump_append(hdev, skb);
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c:409:4: error: implicit declaration of function ‘hci_devcoredump_complete’ [-Werror=implicit-function-declaration]
409 | hci_devcoredump_complete(hdev);
| ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/btmtk.o] Error 1
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1855: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL - 40.93 seconds
Build 32bit Kernel with minimal configuration supports Bluetooth
drivers/bluetooth/btmtk.c: In function ‘btmtk_coredump_notify’:
drivers/bluetooth/btmtk.c:111:7: error: ‘HCI_DEVCOREDUMP_ACTIVE’ undeclared (first use in this function); did you mean ‘BTMTK_COREDUMP_ACTIVE’?
111 | case HCI_DEVCOREDUMP_ACTIVE:
| ^~~~~~~~~~~~~~~~~~~~~~
| BTMTK_COREDUMP_ACTIVE
drivers/bluetooth/btmtk.c:111:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/bluetooth/btmtk.c:114:7: error: ‘HCI_DEVCOREDUMP_TIMEOUT’ undeclared (first use in this function); did you mean ‘HCI_DISCONN_TIMEOUT’?
114 | case HCI_DEVCOREDUMP_TIMEOUT:
| ^~~~~~~~~~~~~~~~~~~~~~~
| HCI_DISCONN_TIMEOUT
drivers/bluetooth/btmtk.c:115:7: error: ‘HCI_DEVCOREDUMP_ABORT’ undeclared (first use in this function)
115 | case HCI_DEVCOREDUMP_ABORT:
| ^~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c:116:7: error: ‘HCI_DEVCOREDUMP_DONE’ undeclared (first use in this function)
116 | case HCI_DEVCOREDUMP_DONE:
| ^~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c: In function ‘btmtk_register_coredump’:
drivers/bluetooth/btmtk.c:376:2: error: implicit declaration of function ‘hci_devcoredump_register’ [-Werror=implicit-function-declaration]
376 | hci_devcoredump_register(hdev, btmtk_coredump, btmtk_coredump_hdr,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c: In function ‘btmtk_process_coredump’:
drivers/bluetooth/btmtk.c:393:9: error: implicit declaration of function ‘hci_devcoredump_init’ [-Werror=implicit-function-declaration]
393 | err = hci_devcoredump_init(hdev, 1024000);
| ^~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c:397:30: error: ‘struct hci_dev’ has no member named ‘dump’
397 | schedule_delayed_work(&hdev->dump.dump_timeout,
| ^~
drivers/bluetooth/btmtk.c:402:9: error: implicit declaration of function ‘hci_devcoredump_append’ [-Werror=implicit-function-declaration]
402 | err = hci_devcoredump_append(hdev, skb);
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c:409:4: error: implicit declaration of function ‘hci_devcoredump_complete’ [-Werror=implicit-function-declaration]
409 | hci_devcoredump_complete(hdev);
| ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/btmtk.o] Error 1
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1855: drivers] Error 2
##############################
Test: Incremental Build with patches - SKIPPED - 0.19 seconds
Incremental build per patch in the series
buildkernel failed
---
Regards,
Linux Bluetooth
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on bluetooth/master]
[also build test ERROR on bluetooth-next/master linus/master v6.0-rc5 next-20220912]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/sean-wang-mediatek-com/Bluetooth-btusb-mediatek-use-readx_poll_timeout-instead-of-open-coding/20220913-062200
base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git master
config: arc-randconfig-r043-20220912 (https://download.01.org/0day-ci/archive/20220913/[email protected]/config)
compiler: arc-elf-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/d478461e2fd5fdd8d505c00c7864a421170a54bb
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review sean-wang-mediatek-com/Bluetooth-btusb-mediatek-use-readx_poll_timeout-instead-of-open-coding/20220913-062200
git checkout d478461e2fd5fdd8d505c00c7864a421170a54bb
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash drivers/bluetooth/
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
drivers/bluetooth/btmtk.c: In function 'btmtk_coredump_notify':
>> drivers/bluetooth/btmtk.c:111:14: error: 'HCI_DEVCOREDUMP_ACTIVE' undeclared (first use in this function); did you mean 'BTMTK_COREDUMP_ACTIVE'?
111 | case HCI_DEVCOREDUMP_ACTIVE:
| ^~~~~~~~~~~~~~~~~~~~~~
| BTMTK_COREDUMP_ACTIVE
drivers/bluetooth/btmtk.c:111:14: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/bluetooth/btmtk.c:114:14: error: 'HCI_DEVCOREDUMP_TIMEOUT' undeclared (first use in this function); did you mean 'HCI_LE_CONN_TIMEOUT'?
114 | case HCI_DEVCOREDUMP_TIMEOUT:
| ^~~~~~~~~~~~~~~~~~~~~~~
| HCI_LE_CONN_TIMEOUT
>> drivers/bluetooth/btmtk.c:115:14: error: 'HCI_DEVCOREDUMP_ABORT' undeclared (first use in this function)
115 | case HCI_DEVCOREDUMP_ABORT:
| ^~~~~~~~~~~~~~~~~~~~~
>> drivers/bluetooth/btmtk.c:116:14: error: 'HCI_DEVCOREDUMP_DONE' undeclared (first use in this function)
116 | case HCI_DEVCOREDUMP_DONE:
| ^~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c: In function 'btmtk_register_coredump':
>> drivers/bluetooth/btmtk.c:376:9: error: implicit declaration of function 'hci_devcoredump_register' [-Werror=implicit-function-declaration]
376 | hci_devcoredump_register(hdev, btmtk_coredump, btmtk_coredump_hdr,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btmtk.c: In function 'btmtk_process_coredump':
>> drivers/bluetooth/btmtk.c:393:23: error: implicit declaration of function 'hci_devcoredump_init' [-Werror=implicit-function-declaration]
393 | err = hci_devcoredump_init(hdev, 1024000);
| ^~~~~~~~~~~~~~~~~~~~
>> drivers/bluetooth/btmtk.c:397:44: error: 'struct hci_dev' has no member named 'dump'
397 | schedule_delayed_work(&hdev->dump.dump_timeout,
| ^~
>> drivers/bluetooth/btmtk.c:402:23: error: implicit declaration of function 'hci_devcoredump_append' [-Werror=implicit-function-declaration]
402 | err = hci_devcoredump_append(hdev, skb);
| ^~~~~~~~~~~~~~~~~~~~~~
>> drivers/bluetooth/btmtk.c:409:25: error: implicit declaration of function 'hci_devcoredump_complete' [-Werror=implicit-function-declaration]
409 | hci_devcoredump_complete(hdev);
| ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +111 drivers/bluetooth/btmtk.c
107
108 static void btmtk_coredump_notify(struct hci_dev *hdev, int state)
109 {
110 switch (state) {
> 111 case HCI_DEVCOREDUMP_ACTIVE:
112 coredump_info.state = BTMTK_COREDUMP_ACTIVE;
113 break;
> 114 case HCI_DEVCOREDUMP_TIMEOUT:
> 115 case HCI_DEVCOREDUMP_ABORT:
> 116 case HCI_DEVCOREDUMP_DONE:
117 coredump_info.state = BTMTK_COREDUMP_INIT;
118 btmtk_reset_sync(coredump_info.hdev);
119 break;
120 }
121 }
122
--
0-DAY CI Kernel Test Service
https://01.org/lkp
Il 13/09/22 00:18, [email protected] ha scritto:
> From: Sean Wang <[email protected]>
>
> Use readx_poll_timeout instead of open coding to poll the hardware reset
> status until it is done.
>
> Signed-off-by: Sean Wang <[email protected]>
Hello Sean, thanks for the patch!
However, there's something to improve...
> ---
> drivers/bluetooth/btusb.c | 32 ++++++++++++++++++--------------
> 1 file changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index c3daba17de7f..4dc9cae3e937 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
..snip..
> @@ -2910,18 +2918,14 @@ static void btusb_mtk_cmd_timeout(struct hci_dev *hdev)
> btusb_mtk_uhw_reg_write(data, MTK_BT_SUBSYS_RST, 0);
> 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;
> - }
> + err = readx_poll_timeout(btusb_mtk_reset_done, hdev, val,
> + val & MTK_BT_RST_DONE,
> + 100000, 1000000);
I agree with using readx_poll_timeout() instead of open coding the same, but
there's a catch: this macro uses usleep_range(), which is meant to be used
for sleeping less than ~20ms.
Even the kerneldoc at include/linux/iopoll.h advertises that:
* @sleep_us: Maximum time to sleep between reads in us (0
* tight-loops). Should be less than ~20ms since usleep_range
* is used (see Documentation/timers/timers-howto.rst).
So, if there's any reason for which you can't sleep for less than 100ms
per iteration, I'm afraid that you can't use readx_poll_timeout()...
...otherwise, please change sleep_us to 20000 and keep the timeout at 1 sec.
Regards,
Angelo
> + if (err < 0)
> + bt_dev_err(hdev, "Reset timeout");
>
> - bt_dev_dbg(hdev, "Polling Bluetooth Reset CR");
> - retry++;
> - msleep(MTK_BT_RESET_WAIT_MS);
> - } while (retry < MTK_BT_RESET_NUM_TRIES);
> + if (val & MTK_BT_RST_DONE)
> + bt_dev_dbg(hdev, "Bluetooth Reset Successfully");
>
> btusb_mtk_id_get(data, 0x70010200, &val);
> if (!val)
Hi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on bluetooth/master]
[also build test WARNING on bluetooth-next/master linus/master v6.0-rc5 next-20220912]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/sean-wang-mediatek-com/Bluetooth-btusb-mediatek-use-readx_poll_timeout-instead-of-open-coding/20220913-062200
base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git master
config: m68k-randconfig-r033-20220911 (https://download.01.org/0day-ci/archive/20220913/[email protected]/config)
compiler: m68k-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/d478461e2fd5fdd8d505c00c7864a421170a54bb
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review sean-wang-mediatek-com/Bluetooth-btusb-mediatek-use-readx_poll_timeout-instead-of-open-coding/20220913-062200
git checkout d478461e2fd5fdd8d505c00c7864a421170a54bb
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash drivers/
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
In file included from drivers/bluetooth/btusb.c:28:
>> drivers/bluetooth/btmtk.h:172:6: warning: no previous prototype for 'btmtk_register_coredump' [-Wmissing-prototypes]
172 | void btmtk_register_coredump(struct hci_dev *hdev, u32 dev_id, const char *name,
| ^~~~~~~~~~~~~~~~~~~~~~~
vim +/btmtk_register_coredump +172 drivers/bluetooth/btmtk.h
171
> 172 void btmtk_register_coredump(struct hci_dev *hdev, u32 dev_id, const char *name,
173 u32 fw_version)
174 {
175 }
176
--
0-DAY CI Kernel Test Service
https://01.org/lkp
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on bluetooth/master]
[also build test ERROR on bluetooth-next/master linus/master v6.0-rc5 next-20220912]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/sean-wang-mediatek-com/Bluetooth-btusb-mediatek-use-readx_poll_timeout-instead-of-open-coding/20220913-062200
base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git master
config: i386-randconfig-a016-20220912 (https://download.01.org/0day-ci/archive/20220913/[email protected]/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/d478461e2fd5fdd8d505c00c7864a421170a54bb
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review sean-wang-mediatek-com/Bluetooth-btusb-mediatek-use-readx_poll_timeout-instead-of-open-coding/20220913-062200
git checkout d478461e2fd5fdd8d505c00c7864a421170a54bb
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/bluetooth/
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
>> drivers/bluetooth/btmtk.c:111:7: error: use of undeclared identifier 'HCI_DEVCOREDUMP_ACTIVE'; did you mean 'BTMTK_COREDUMP_ACTIVE'?
case HCI_DEVCOREDUMP_ACTIVE:
^~~~~~~~~~~~~~~~~~~~~~
BTMTK_COREDUMP_ACTIVE
drivers/bluetooth/btmtk.c:27:2: note: 'BTMTK_COREDUMP_ACTIVE' declared here
BTMTK_COREDUMP_ACTIVE,
^
>> drivers/bluetooth/btmtk.c:114:7: error: use of undeclared identifier 'HCI_DEVCOREDUMP_TIMEOUT'
case HCI_DEVCOREDUMP_TIMEOUT:
^
>> drivers/bluetooth/btmtk.c:115:7: error: use of undeclared identifier 'HCI_DEVCOREDUMP_ABORT'
case HCI_DEVCOREDUMP_ABORT:
^
>> drivers/bluetooth/btmtk.c:116:7: error: use of undeclared identifier 'HCI_DEVCOREDUMP_DONE'
case HCI_DEVCOREDUMP_DONE:
^
>> drivers/bluetooth/btmtk.c:376:2: error: implicit declaration of function 'hci_devcoredump_register' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
hci_devcoredump_register(hdev, btmtk_coredump, btmtk_coredump_hdr,
^
>> drivers/bluetooth/btmtk.c:393:9: error: implicit declaration of function 'hci_devcoredump_init' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
err = hci_devcoredump_init(hdev, 1024000);
^
>> drivers/bluetooth/btmtk.c:397:32: error: no member named 'dump' in 'struct hci_dev'
schedule_delayed_work(&hdev->dump.dump_timeout,
~~~~ ^
>> drivers/bluetooth/btmtk.c:402:9: error: implicit declaration of function 'hci_devcoredump_append' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
err = hci_devcoredump_append(hdev, skb);
^
drivers/bluetooth/btmtk.c:402:9: note: did you mean 'hci_devcoredump_init'?
drivers/bluetooth/btmtk.c:393:9: note: 'hci_devcoredump_init' declared here
err = hci_devcoredump_init(hdev, 1024000);
^
>> drivers/bluetooth/btmtk.c:409:4: error: implicit declaration of function 'hci_devcoredump_complete' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
hci_devcoredump_complete(hdev);
^
drivers/bluetooth/btmtk.c:409:4: note: did you mean 'hci_devcoredump_append'?
drivers/bluetooth/btmtk.c:402:9: note: 'hci_devcoredump_append' declared here
err = hci_devcoredump_append(hdev, skb);
^
9 errors generated.
vim +111 drivers/bluetooth/btmtk.c
107
108 static void btmtk_coredump_notify(struct hci_dev *hdev, int state)
109 {
110 switch (state) {
> 111 case HCI_DEVCOREDUMP_ACTIVE:
112 coredump_info.state = BTMTK_COREDUMP_ACTIVE;
113 break;
> 114 case HCI_DEVCOREDUMP_TIMEOUT:
> 115 case HCI_DEVCOREDUMP_ABORT:
> 116 case HCI_DEVCOREDUMP_DONE:
117 coredump_info.state = BTMTK_COREDUMP_INIT;
118 btmtk_reset_sync(coredump_info.hdev);
119 break;
120 }
121 }
122
--
0-DAY CI Kernel Test Service
https://01.org/lkp
HI Angelo,
On Tue, Sep 13, 2022 at 1:04 AM AngeloGioacchino Del Regno
<[email protected]> wrote:
>
> Il 13/09/22 00:18, [email protected] ha scritto:
> > From: Sean Wang <[email protected]>
> >
> > Use readx_poll_timeout instead of open coding to poll the hardware reset
> > status until it is done.
> >
> > Signed-off-by: Sean Wang <[email protected]>
>
> Hello Sean, thanks for the patch!
> However, there's something to improve...
>
> > ---
> > drivers/bluetooth/btusb.c | 32 ++++++++++++++++++--------------
> > 1 file changed, 18 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> > index c3daba17de7f..4dc9cae3e937 100644
> > --- a/drivers/bluetooth/btusb.c
> > +++ b/drivers/bluetooth/btusb.c
>
> ..snip..
>
> > @@ -2910,18 +2918,14 @@ static void btusb_mtk_cmd_timeout(struct hci_dev *hdev)
> > btusb_mtk_uhw_reg_write(data, MTK_BT_SUBSYS_RST, 0);
> > 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;
> > - }
> > + err = readx_poll_timeout(btusb_mtk_reset_done, hdev, val,
> > + val & MTK_BT_RST_DONE,
> > + 100000, 1000000);
>
> I agree with using readx_poll_timeout() instead of open coding the same, but
> there's a catch: this macro uses usleep_range(), which is meant to be used
> for sleeping less than ~20ms.
>
> Even the kerneldoc at include/linux/iopoll.h advertises that:
>
> * @sleep_us: Maximum time to sleep between reads in us (0
> * tight-loops). Should be less than ~20ms since usleep_range
> * is used (see Documentation/timers/timers-howto.rst).
>
> So, if there's any reason for which you can't sleep for less than 100ms
> per iteration, I'm afraid that you can't use readx_poll_timeout()...
> ...otherwise, please change sleep_us to 20000 and keep the timeout at 1 sec.
>
It should be able to be done with polling in 20ms until 1 sec expires
or it is done. It increases some cost in the bus transaction
interacting with the device, but it seemed fine for me because the
code path is cold, it is only working in the device reset which should
rarely happen, and only involves when it is really necessary. That is
a nice catch. I was trying not to break the existing logic
but overlooked the requirements of the API.
Sean
> Regards,
> Angelo
>
> > + if (err < 0)
> > + bt_dev_err(hdev, "Reset timeout");
> >
> > - bt_dev_dbg(hdev, "Polling Bluetooth Reset CR");
> > - retry++;
> > - msleep(MTK_BT_RESET_WAIT_MS);
> > - } while (retry < MTK_BT_RESET_NUM_TRIES);
> > + if (val & MTK_BT_RST_DONE)
> > + bt_dev_dbg(hdev, "Bluetooth Reset Successfully");
> >
> > btusb_mtk_id_get(data, 0x70010200, &val);
> > if (!val)
>