[regression v5.11-rc1] btqca: suspend fails with QCA6390

[Kalle Valo]

Hi,

I got Dell XPS 13 9310 laptop which has QCA6390 wlan/bt device. I
noticed that on v5.11-rc1 suspend fails every time like this:

[   91.134305] Bluetooth: hci0: SSR or FW download time out
[   91.134314] PM: dpm_run_callback(): acpi_subsys_suspend+0x0/0x50 returns -110
[   91.134331] PM: Device serial0-0 failed to suspend: error -110
[   91.134338] PM: Some devices failed to suspend, or early wake event detected

On v5.10 suspend worked just fine and after a bisect I found reverting
commit 2be43abac5a8 ("Bluetooth: hci_qca: Wait for timeout during
suspend") fixes the issue for me. More info below.

Is there a quick fix for this or should the commit be reverted for
v5.11? I think it's important to have btqca suspend working on the final
release as there quite a lot of laptops with QCA6390.

I'll also include ath11k list as we have XPS 13 9310 users there and so
that they are aware of this regression.

Kalle

commit 2be43abac5a839d44bf9d14716573ae0ac920f2b
Author:     Venkata Lakshmi Narayana Gubba <gubbaven@xxxxxxxxxxxxxx>
AuthorDate: Tue Oct 6 20:50:21 2020 +0530
Commit:     Marcel Holtmann <marcel@xxxxxxxxxxxx>
CommitDate: Wed Nov 11 12:07:54 2020 +0100

    Bluetooth: hci_qca: Wait for timeout during suspend
    
    Currently qca_suspend() is relied on IBS mechanism. During
    FW download and memory dump collections, IBS will be disabled.
    In those cases, driver will allow suspend and still uses the
    serdev port, which results to errors. Now added a wait timeout
    if suspend is triggered during FW download and memory collections.
    
    Signed-off-by: Venkata Lakshmi Narayana Gubba <gubbaven@xxxxxxxxxxxxxx>
    Signed-off-by: Balakrishna Godavarthi <bgodavar@xxxxxxxxxxxxxx>
    Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@xxxxxxxxxxxx>
    Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>


stock v5.11-rc5, suspend fails:

[    2.924622] Bluetooth: BNEP (Ethernet Emulation) ver 1.3
[    2.924624] Bluetooth: BNEP filters: protocol multicast
[    2.924627] Bluetooth: BNEP socket layer initialized
[    3.091669] Bluetooth: hci0: QCA Product ID   :0x00000010
[    3.091673] Bluetooth: hci0: QCA SOC Version  :0x400a0200
[    3.091674] Bluetooth: hci0: QCA ROM Version  :0x00000200
[    3.091674] Bluetooth: hci0: QCA Patch Version:0x00000d2b
[    3.091676] Bluetooth: hci0: QCA controller version 0x02000200
[    3.091676] Bluetooth: hci0: QCA Downloading qca/htbtfw20.tlv
[    3.091689] bluetooth hci0: Direct firmware load for qca/htbtfw20.tlv failed with error -2
[    3.091692] Bluetooth: hci0: QCA Failed to request file: qca/htbtfw20.tlv (-2)
[    3.091693] Bluetooth: hci0: QCA Failed to download patch (-2)
<cut>
[   13.714497] fscrypt: AES-256-CTS-CBC using implementation "cts(cbc-aes-aesni)"
[   13.759753] fscrypt: AES-256-XTS using implementation "xts-aes-aesni"
[   13.818594] broken atomic modeset userspace detected, disabling atomic
[   14.391415] psmouse serio1: Failed to deactivate mouse on isa0060/serio1: -5
[   14.871419] psmouse serio1: Failed to enable mouse on isa0060/serio1
[   19.143493] input: PS/2 Generic Mouse as /devices/platform/i8042/serio1/input/input2
[   19.347355] psmouse serio1: Failed to enable mouse on isa0060/serio1
[   84.758946] PM: suspend entry (s2idle)
[   84.760462] Filesystems sync: 0.001 seconds
[   84.762783] Freezing user space processes ... (elapsed 0.001 seconds) done.
[   84.764319] OOM killer disabled.
[   84.764320] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done.
[   84.765470] printk: Suspending console(s) (use no_console_suspend to debug)
[   87.806250] Bluetooth: hci0: SSR or FW download time out
[   87.806261] PM: dpm_run_callback(): acpi_subsys_suspend+0x0/0x50 returns -110
[   87.806284] PM: Device serial0-0 failed to suspend: error -110
[   87.806292] PM: Some devices failed to suspend, or early wake event detected
[   87.924249] OOM killer enabled.
[   87.924252] Restarting tasks ... done.
[   87.971055] PM: suspend exit
[   87.971133] PM: suspend entry (s2idle)
[   87.975657] Filesystems sync: 0.004 seconds
[   87.976159] Freezing user space processes ... (elapsed 0.001 seconds) done.
[   87.977593] OOM killer disabled.
[   87.977594] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done.
[   87.978699] printk: Suspending console(s) (use no_console_suspend to debug)
[   91.134305] Bluetooth: hci0: SSR or FW download time out
[   91.134314] PM: dpm_run_callback(): acpi_subsys_suspend+0x0/0x50 returns -110
[   91.134331] PM: Device serial0-0 failed to suspend: error -110
[   91.134338] PM: Some devices failed to suspend, or early wake event detected
[   91.255045] OOM killer enabled.
[   91.255048] Restarting tasks ... done.
[   91.298067] PM: suspend exit

v5.11-rc5 plus a revert of 2be43abac5a8, suspend works;

[    3.027425] Bluetooth: hci0: QCA Product ID   :0x00000010
[    3.027428] Bluetooth: hci0: QCA SOC Version  :0x400a0200
[    3.027429] Bluetooth: hci0: QCA ROM Version  :0x00000200
[    3.027430] Bluetooth: hci0: QCA Patch Version:0x00000d2b
[    3.027431] Bluetooth: hci0: QCA controller version 0x02000200
[    3.027433] Bluetooth: hci0: QCA Downloading qca/htbtfw20.tlv
[    3.027449] bluetooth hci0: Direct firmware load for qca/htbtfw20.tlv failed with error -2
[    3.027451] Bluetooth: hci0: QCA Failed to request file: qca/htbtfw20.tlv (-2)
[    3.032824] Bluetooth: hci0: QCA Failed to download patch (-2)
<cut>
[   13.143154] fscrypt: AES-256-CTS-CBC using implementation "cts(cbc-aes-aesni)"
[   13.165061] fscrypt: AES-256-XTS using implementation "xts-aes-aesni"
[   13.225180] broken atomic modeset userspace detected, disabling atomic
[   14.343141] psmouse serio1: Failed to deactivate mouse on isa0060/serio1: -5
[   14.823182] psmouse serio1: Failed to enable mouse on isa0060/serio1
[   19.111270] input: PS/2 Generic Mouse as /devices/platform/i8042/serio1/input/input2
[   19.315153] psmouse serio1: Failed to enable mouse on isa0060/serio1
[  173.918828] PM: suspend entry (s2idle)
[  173.922617] Filesystems sync: 0.003 seconds
[  173.925127] Freezing user space processes ... (elapsed 0.001 seconds) done.
[  173.926656] OOM killer disabled.
[  173.926658] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done.
[  173.927776] printk: Suspending console(s) (use no_console_suspend to debug)
[  174.176572] psmouse serio1: Failed to disable mouse on isa0060/serio1
[  175.190979] mhi mhi0: Allowing M3 transition
[  175.190995] mhi mhi0: Wait for M3 completion
[  175.260930] ACPI: EC: interrupt blocked
[  186.827253] ACPI: EC: interrupt unblocked
[  186.968527] mhi mhi0: Entered with PM state: M3, MHI state: M3
[  187.322090] OOM killer enabled.
[  187.322092] Restarting tasks ... done.
[  187.362639] PM: suspend exit