[PATCH v1] driver: bluetooth: hci_qca: fix ssr fail when BT_EN is pulled up by hw

[PATCH v1] driver: bluetooth: hci_qca: fix ssr fail when BT_EN is pulled up by hw

[Shuai Zhang]

If the SoC always enables the bt_en pin via hardware and the driver
cannot control the bt_en pin of the SoC chip, then during SSR,
the QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits cannot be cleared.
This leads to a reset command timeout failure.

To address this, clear QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits
after the coredump collection is complete.
Also, add msleep delay to wait for controller to complete SSR.

Signed-off-by: Shuai Zhang <quic_shuaz@quicinc.com>
---
 drivers/bluetooth/hci_qca.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index a2dc39c00..1c3df6e30 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1653,6 +1653,22 @@ static void qca_hw_error(struct hci_dev *hdev, u8 code)
 	}
 
 	clear_bit(QCA_HW_ERROR_EVENT, &qca->flags);
+
+	/*If the SoC always enables the bt_en pin via hardware and the driver
+	* cannot control the bt_en pin of the SoC chip, then during SSR,
+	* the QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits cannot be cleared.
+	* This leads to a reset command timeout failure.
+	*
+	* To address this, clear QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits
+	* after the coredump collection is complete.
+	* Also, add msleep delay to wait for controller to complete SSR.
+	*/
+	if(!test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
+		clear_bit(QCA_SSR_TRIGGERED, &qca->flags);
+		clear_bit(QCA_IBS_DISABLED,&qca->flags);
+		qca->tx_ibs_state = HCI_IBS_TX_AWAKE;
+		msleep(50);
+	}
 }
 
 static void qca_reset(struct hci_dev *hdev)
-- 
2.34.1

RE: [v1] driver: bluetooth: hci_qca: fix ssr fail when BT_EN is pulled up by hw

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 2196 bytes --]

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=969792

---Test result---

Test Summary:
CheckPatch                    PENDING   0.41 seconds
GitLint                       PENDING   0.32 seconds
SubjectPrefix                 FAIL      0.34 seconds
BuildKernel                   PASS      24.40 seconds
CheckAllWarning               PASS      26.70 seconds
CheckSparse                   PASS      29.79 seconds
BuildKernel32                 PASS      23.93 seconds
TestRunnerSetup               PASS      453.00 seconds
TestRunner_l2cap-tester       PASS      25.01 seconds
TestRunner_iso-tester         PASS      41.39 seconds
TestRunner_bnep-tester        PASS      5.76 seconds
TestRunner_mgmt-tester        FAIL      129.01 seconds
TestRunner_rfcomm-tester      PASS      9.10 seconds
TestRunner_sco-tester         PASS      14.54 seconds
TestRunner_ioctl-tester       PASS      9.99 seconds
TestRunner_mesh-tester        PASS      7.28 seconds
TestRunner_smp-tester         PASS      8.36 seconds
TestRunner_userchan-tester    PASS      6.07 seconds
IncrementalBuild              PENDING   0.73 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: SubjectPrefix - FAIL
Desc: Check subject contains "Bluetooth" prefix
Output:
"Bluetooth: " prefix is not specified in the subject
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 490, Passed: 484 (98.8%), Failed: 2, Not Run: 4

Failed Test Cases
LL Privacy - Add Device 3 (AL is full)               Failed       0.220 seconds
LL Privacy - Start Discovery 1 (Disable RL)          Failed       0.180 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth

Re: [PATCH v1] driver: bluetooth: hci_qca: fix ssr fail when BT_EN is pulled up by hw

[Luiz Augusto von Dentz]

Hi Shuai,

On Mon, Jun 9, 2025 at 6:57 AM Shuai Zhang <quic_shuaz@quicinc.com> wrote:
>
> If the SoC always enables the bt_en pin via hardware and the driver
> cannot control the bt_en pin of the SoC chip, then during SSR,
> the QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits cannot be cleared.
> This leads to a reset command timeout failure.
>
> To address this, clear QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits
> after the coredump collection is complete.
> Also, add msleep delay to wait for controller to complete SSR.
>
> Signed-off-by: Shuai Zhang <quic_shuaz@quicinc.com>
> ---
>  drivers/bluetooth/hci_qca.c | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index a2dc39c00..1c3df6e30 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -1653,6 +1653,22 @@ static void qca_hw_error(struct hci_dev *hdev, u8 code)
>         }
>
>         clear_bit(QCA_HW_ERROR_EVENT, &qca->flags);
> +
> +       /*If the SoC always enables the bt_en pin via hardware and the driver
> +       * cannot control the bt_en pin of the SoC chip, then during SSR,
> +       * the QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits cannot be cleared.
> +       * This leads to a reset command timeout failure.
> +       *
> +       * To address this, clear QCA_SSR_TRIGGERED and QCA_IBS_DISABLED bits
> +       * after the coredump collection is complete.
> +       * Also, add msleep delay to wait for controller to complete SSR.
> +       */
> +       if(!test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
> +               clear_bit(QCA_SSR_TRIGGERED, &qca->flags);
> +               clear_bit(QCA_IBS_DISABLED,&qca->flags);
> +               qca->tx_ibs_state = HCI_IBS_TX_AWAKE;
> +               msleep(50);
> +       }
>  }

WARNING: Block comments should align the * on each line
#11: FILE: drivers/bluetooth/hci_qca.c:1658:
+    /*If the SoC always enables the bt_en pin via hardware and the driver
+    * cannot control the bt_en pin of the SoC chip, then during SSR,

ERROR: space required before the open parenthesis '('
#19: FILE: drivers/bluetooth/hci_qca.c:1666:
+    if(!test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {

ERROR: space required after that ',' (ctx:VxO)
#21: FILE: drivers/bluetooth/hci_qca.c:1668:
+        clear_bit(QCA_IBS_DISABLED,&qca->flags);
                                   ^

ERROR: space required before that '&' (ctx:OxV)
#21: FILE: drivers/bluetooth/hci_qca.c:1668:
+        clear_bit(QCA_IBS_DISABLED,&qca->flags);
                                    ^


>  static void qca_reset(struct hci_dev *hdev)
> --
> 2.34.1
>
>


-- 
Luiz Augusto von Dentz