Commit 637d0bf3 authored by Venkata Lakshmi Narayana Gubba's avatar Venkata Lakshmi Narayana Gubba Committed by sanglipeng
Browse files

Bluetooth: hci_qca: check for SSR triggered flag while suspend 

stable inclusion
from stable-v5.10.165
commit c208f1e84a6757c42a954a6c161e65c2608f11e3
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7T7G4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c208f1e84a6757c42a954a6c161e65c2608f11e3



--------------------------------

commit 1bb0c663 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: 2be43aba ("Bluetooth: hci_qca: Wait for timeout during suspend")
Signed-off-by: default avatarVenkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 9ff87e3b

drivers/bluetooth/hci_qca.c

+2 −1
Original line number Diff line number Diff line
@@ -2120,7 +2120,8 @@ static int __maybe_unused qca_suspend(struct device *dev) 
	    !test_bit(QCA_SSR_TRIGGERED, &qca->flags))

		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) ?

					IBS_DISABLE_SSR_TIMEOUT_MS :

					FW_DOWNLOAD_TIMEOUT_MS;