The original timeout setting for HCI Reset on shutdown is 10 seconds.
Since the HCI Reset processing time is soon, so decrease the timeout
to 2 seconds for HCI Reset on shutdown.

Signed-off-by: Hilda Wu <hildawu@realtek.com>
---
V1 -> V2: Modify commit message and summary
---
---
 drivers/bluetooth/btrtl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 2d95b3ea046d..7128a8a0ba25 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -1371,7 +1371,7 @@ int btrtl_shutdown_realtek(struct hci_dev *hdev)
 	/* According to the vendor driver, BT must be reset on close to avoid
 	 * firmware crash.
 	 */
-	skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT);
+	skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_CMD_TIMEOUT);
 	if (IS_ERR(skb)) {
 		ret = PTR_ERR(skb);
 		bt_dev_err(hdev, "HCI reset during shutdown failed");
-- 
2.34.1

Hi Hilda,

On Tue, Oct 1, 2024 at 3:43 AM Hilda Wu <hildawu@realtek.com> wrote:
>
> The original timeout setting for HCI Reset on shutdown is 10 seconds.
> Since the HCI Reset processing time is soon, so decrease the timeout
> to 2 seconds for HCI Reset on shutdown.

I guess you are saying that HCI Reset shouldn't take 10 seconds to
complete so instead use the default timeout for commands. I can update
the description myself if you agree to use the above sentence.

> Signed-off-by: Hilda Wu <hildawu@realtek.com>
> ---
> V1 -> V2: Modify commit message and summary
> ---
> ---
>  drivers/bluetooth/btrtl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
> index 2d95b3ea046d..7128a8a0ba25 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -1371,7 +1371,7 @@ int btrtl_shutdown_realtek(struct hci_dev *hdev)
>         /* According to the vendor driver, BT must be reset on close to avoid
>          * firmware crash.
>          */
> -       skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT);
> +       skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_CMD_TIMEOUT);
>         if (IS_ERR(skb)) {
>                 ret = PTR_ERR(skb);
>                 bt_dev_err(hdev, "HCI reset during shutdown failed");
> --
> 2.34.1
>


-- 
Luiz Augusto von Dentz

Hi Luiz,

Yes, please.
This is indeed what I want to express.
Thank you for your help.

Regards,
Hilda

-----Original Message-----
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com> 
Sent: Tuesday, October 1, 2024 11:29 PM
To: Hilda Wu <hildawu@realtek.com>
Cc: marcel@holtmann.org; linux-bluetooth@vger.kernel.org; linux-kernel@vger.kernel.org; alex_lu@realsil.com.cn; Max Chou <max.chou@realtek.com>; KidmanLee <kidman@realtek.com>; howardchung@google.com; apusaka@chromium.org; yinghsu@chromium.org; johnlai@google.com
Subject: Re: [PATCH v2] Bluetooth: btrtl: Decrease HCI_OP_RESET timeout from 10 s to 2 s


External mail.



Hi Hilda,

On Tue, Oct 1, 2024 at 3:43 AM Hilda Wu <hildawu@realtek.com> wrote:
>
> The original timeout setting for HCI Reset on shutdown is 10 seconds.
> Since the HCI Reset processing time is soon, so decrease the timeout 
> to 2 seconds for HCI Reset on shutdown.

I guess you are saying that HCI Reset shouldn't take 10 seconds to complete so instead use the default timeout for commands. I can update the description myself if you agree to use the above sentence.

> Signed-off-by: Hilda Wu <hildawu@realtek.com>
> ---
> V1 -> V2: Modify commit message and summary
> ---
> ---
>  drivers/bluetooth/btrtl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c 
> index 2d95b3ea046d..7128a8a0ba25 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -1371,7 +1371,7 @@ int btrtl_shutdown_realtek(struct hci_dev *hdev)
>         /* According to the vendor driver, BT must be reset on close to avoid
>          * firmware crash.
>          */
> -       skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT);
> +       skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, 
> + HCI_CMD_TIMEOUT);
>         if (IS_ERR(skb)) {
>                 ret = PTR_ERR(skb);
>                 bt_dev_err(hdev, "HCI reset during shutdown failed");
> --
> 2.34.1
>


--
Luiz Augusto von Dentz