xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: hci_qca: check for SSR triggered flag while suspend

Browse Source 
commit 1bb0c66332babc5cbc4581d962da0b03af9f23e8 upstream.

QCA_IBS_DISABLED flag will be set after memorydump started from
controller.Currently qca_suspend() is waiting for SSR to complete
based on flag QCA_IBS_DISABLED.Added to check for QCA_SSR_TRIGGERED
flag too.

Fixes: 2be43abac5a8 ("Bluetooth: hci_qca: Wait for timeout during suspend")
Signed-off-by: Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Venkata Lakshmi Narayana Gubba
2021-02-02 20:27:42 +05:30
committed by Greg Kroah-Hartman
parent ef11bc4bb9
commit c208f1e84a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/bluetooth/hci_qca.c
View File

@@ -2120,7 +2120,8 @@ static int __maybe_unused qca_suspend(struct device *dev)
!test_bit(QCA_SSR_TRIGGERED, &qca->flags)) !test_bit(QCA_SSR_TRIGGERED, &qca->flags))
return 0; return 0;
if (test_bit(QCA_IBS_DISABLED, &qca->flags)) { if (test_bit(QCA_IBS_DISABLED, &qca->flags) ||
test_bit(QCA_SSR_TRIGGERED, &qca->flags)) {
wait_timeout = test_bit(QCA_SSR_TRIGGERED, &qca->flags) ? wait_timeout = test_bit(QCA_SSR_TRIGGERED, &qca->flags) ?
IBS_DISABLE_SSR_TIMEOUT_MS : IBS_DISABLE_SSR_TIMEOUT_MS :
FW_DOWNLOAD_TIMEOUT_MS; FW_DOWNLOAD_TIMEOUT_MS;