Commit 9ff87e3b authored by Venkata Lakshmi Narayana Gubba's avatar Venkata Lakshmi Narayana Gubba Committed by sanglipeng
Browse files

Bluetooth: hci_qca: Wait for SSR completion during suspend 

stable inclusion
from stable-v5.10.165
commit ef11bc4bb9757a5ee3ded5b8d8f7652fa0d079c0
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=ef11bc4bb9757a5ee3ded5b8d8f7652fa0d079c0



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

commit ad3a9c0e upstream.

During SSR after memory dump collection,BT controller will be powered off,
powered on and then FW will be downloaded.During suspend if BT controller
is powered off due to SSR then we should wait until SSR is completed and
then suspend.

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 6af9efb2

drivers/bluetooth/hci_qca.c

+9 −7
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ 
#define IBS_HOST_TX_IDLE_TIMEOUT_MS	2000

#define CMD_TRANS_TIMEOUT_MS		100

#define MEMDUMP_TIMEOUT_MS		8000

#define IBS_DISABLE_SSR_TIMEOUT_MS	(MEMDUMP_TIMEOUT_MS + 1000)

#define IBS_DISABLE_SSR_TIMEOUT_MS \

	(MEMDUMP_TIMEOUT_MS + FW_DOWNLOAD_TIMEOUT_MS)

#define FW_DOWNLOAD_TIMEOUT_MS		3000



/* susclk rate */
@@ -2111,7 +2112,12 @@ static int __maybe_unused qca_suspend(struct device *dev) 


	set_bit(QCA_SUSPENDING, &qca->flags);



	if (test_bit(QCA_BT_OFF, &qca->flags))

	/* During SSR after memory dump collection, controller will be

	 * powered off and then powered on.If controller is powered off

	 * during SSR then we should wait until SSR is completed.

	 */

	if (test_bit(QCA_BT_OFF, &qca->flags) &&

	    !test_bit(QCA_SSR_TRIGGERED, &qca->flags))

		return 0;



	if (test_bit(QCA_IBS_DISABLED, &qca->flags)) {
@@ -2121,7 +2127,7 @@ static int __maybe_unused qca_suspend(struct device *dev) 


		/* QCA_IBS_DISABLED flag is set to true, During FW download

		 * and during memory dump collection. It is reset to false,

		 * After FW download complete and after memory dump collections.

		 * After FW download complete.

		 */

		wait_on_bit_timeout(&qca->flags, QCA_IBS_DISABLED,

			    TASK_UNINTERRUPTIBLE, msecs_to_jiffies(wait_timeout));
@@ -2133,10 +2139,6 @@ static int __maybe_unused qca_suspend(struct device *dev) 
		}

	}



	/* After memory dump collection, Controller is powered off.*/

	if (test_bit(QCA_BT_OFF, &qca->flags))

		return 0;



	cancel_work_sync(&qca->ws_awake_device);

	cancel_work_sync(&qca->ws_awake_rx);