Commit 55c0bd77 authored by Venkata Lakshmi Narayana Gubba's avatar Venkata Lakshmi Narayana Gubba Committed by Marcel Holtmann

Bluetooth: hci_qca: Fixed issue during suspend

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>
parent 234f414e
...@@ -77,7 +77,8 @@ enum qca_flags { ...@@ -77,7 +77,8 @@ enum qca_flags {
QCA_MEMDUMP_COLLECTION, QCA_MEMDUMP_COLLECTION,
QCA_HW_ERROR_EVENT, QCA_HW_ERROR_EVENT,
QCA_SSR_TRIGGERED, QCA_SSR_TRIGGERED,
QCA_BT_OFF QCA_BT_OFF,
QCA_ROM_FW
}; };
enum qca_capabilities { enum qca_capabilities {
...@@ -1664,6 +1665,7 @@ static int qca_setup(struct hci_uart *hu) ...@@ -1664,6 +1665,7 @@ static int qca_setup(struct hci_uart *hu)
if (ret) if (ret)
return ret; return ret;
clear_bit(QCA_ROM_FW, &qca->flags);
/* Patch downloading has to be done without IBS mode */ /* Patch downloading has to be done without IBS mode */
set_bit(QCA_IBS_DISABLED, &qca->flags); set_bit(QCA_IBS_DISABLED, &qca->flags);
...@@ -1721,12 +1723,14 @@ static int qca_setup(struct hci_uart *hu) ...@@ -1721,12 +1723,14 @@ static int qca_setup(struct hci_uart *hu)
hu->hdev->cmd_timeout = qca_cmd_timeout; hu->hdev->cmd_timeout = qca_cmd_timeout;
} else if (ret == -ENOENT) { } else if (ret == -ENOENT) {
/* No patch/nvm-config found, run with original fw/config */ /* No patch/nvm-config found, run with original fw/config */
set_bit(QCA_ROM_FW, &qca->flags);
ret = 0; ret = 0;
} else if (ret == -EAGAIN) { } else if (ret == -EAGAIN) {
/* /*
* Userspace firmware loader will return -EAGAIN in case no * Userspace firmware loader will return -EAGAIN in case no
* patch/nvm-config is found, so run with original fw/config. * patch/nvm-config is found, so run with original fw/config.
*/ */
set_bit(QCA_ROM_FW, &qca->flags);
ret = 0; ret = 0;
} }
...@@ -2103,6 +2107,12 @@ static int __maybe_unused qca_suspend(struct device *dev) ...@@ -2103,6 +2107,12 @@ static int __maybe_unused qca_suspend(struct device *dev)
set_bit(QCA_SUSPENDING, &qca->flags); 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 /* During SSR after memory dump collection, controller will be
* powered off and then powered on.If controller is powered off * powered off and then powered on.If controller is powered off
* during SSR then we should wait until SSR is completed. * during SSR then we should wait until SSR is completed.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment