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@xxxxxxxxxxx>
---
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
