Commit 6da157c7 authored by Venkata Lakshmi Narayana Gubba's avatar Venkata Lakshmi Narayana Gubba Committed by Yuan Can
Browse files

Bluetooth: hci_qca: Fixed issue during suspend 

stable inclusion
from stable-v5.10.165
commit 217721b7631348ff89825ea56a33235edef79f51
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IALIJ7
CVE: CVE-2022-48878

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



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

commit 55c0bd77 upstream.

If BT SoC is running with ROM FW then just return in
qca_suspend function as ROM FW does not support
in-band sleep.

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 avatarYuan Can <yuancan@huawei.com>
parent b9c26da6

drivers/bluetooth/hci_qca.c

+11 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ enum qca_flags { 
	QCA_MEMDUMP_COLLECTION,

	QCA_HW_ERROR_EVENT,

	QCA_SSR_TRIGGERED,

	QCA_BT_OFF

	QCA_BT_OFF,

	QCA_ROM_FW

};



enum qca_capabilities {
@@ -1664,6 +1665,7 @@ static int qca_setup(struct hci_uart *hu) 
	if (ret)

		return ret;



	clear_bit(QCA_ROM_FW, &qca->flags);

	/* Patch downloading has to be done without IBS mode */

	set_bit(QCA_IBS_DISABLED, &qca->flags);
@@ -1722,12 +1724,14 @@ static int qca_setup(struct hci_uart *hu) 
		hu->hdev->cmd_timeout = qca_cmd_timeout;

	} else if (ret == -ENOENT) {

		/* No patch/nvm-config found, run with original fw/config */

		set_bit(QCA_ROM_FW, &qca->flags);

		ret = 0;

	} else if (ret == -EAGAIN) {

		/*

		 * Userspace firmware loader will return -EAGAIN in case no

		 * patch/nvm-config is found, so run with original fw/config.

		 */

		set_bit(QCA_ROM_FW, &qca->flags);

		ret = 0;

	} else {

		if (retries < MAX_INIT_RETRIES) {
@@ -2112,6 +2116,12 @@ static int __maybe_unused qca_suspend(struct device *dev) 


	set_bit(QCA_SUSPENDING, &qca->flags);



	/* if BT SoC is running with default firmware then it does not

	 * support in-band sleep

	 */

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

		return 0;



	/* 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.