* [PATCH 1/2] ath11k: pci: fix crash on suspend if board file is not found
@ 2022-01-27 9:01 Kalle Valo
2022-01-27 9:01 ` [PATCH 2/2] ath11k: mhi: use mhi_sync_power_up() Kalle Valo
2022-01-31 14:11 ` [PATCH 1/2] ath11k: pci: fix crash on suspend if board file is not found Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Kalle Valo @ 2022-01-27 9:01 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless
From: Kalle Valo <quic_kvalo@quicinc.com>
Mario reported that the kernel was crashing on suspend if ath11k was not able
to find a board file:
[ 473.693286] PM: Suspending system (s2idle)
[ 473.693291] printk: Suspending console(s) (use no_console_suspend to debug)
[ 474.407787] BUG: unable to handle page fault for address: 0000000000002070
[ 474.407791] #PF: supervisor read access in kernel mode
[ 474.407794] #PF: error_code(0x0000) - not-present page
[ 474.407798] PGD 0 P4D 0
[ 474.407801] Oops: 0000 [#1] PREEMPT SMP NOPTI
[ 474.407805] CPU: 2 PID: 2350 Comm: kworker/u32:14 Tainted: G W 5.16.0 #248
[...]
[ 474.407868] Call Trace:
[ 474.407870] <TASK>
[ 474.407874] ? _raw_spin_lock_irqsave+0x2a/0x60
[ 474.407882] ? lock_timer_base+0x72/0xa0
[ 474.407889] ? _raw_spin_unlock_irqrestore+0x29/0x3d
[ 474.407892] ? try_to_del_timer_sync+0x54/0x80
[ 474.407896] ath11k_dp_rx_pktlog_stop+0x49/0xc0 [ath11k]
[ 474.407912] ath11k_core_suspend+0x34/0x130 [ath11k]
[ 474.407923] ath11k_pci_pm_suspend+0x1b/0x50 [ath11k_pci]
[ 474.407928] pci_pm_suspend+0x7e/0x170
[ 474.407935] ? pci_pm_freeze+0xc0/0xc0
[ 474.407939] dpm_run_callback+0x4e/0x150
[ 474.407947] __device_suspend+0x148/0x4c0
[ 474.407951] async_suspend+0x20/0x90
dmesg-efi-164255130401001:
Oops#1 Part1
[ 474.407955] async_run_entry_fn+0x33/0x120
[ 474.407959] process_one_work+0x220/0x3f0
[ 474.407966] worker_thread+0x4a/0x3d0
[ 474.407971] kthread+0x17a/0x1a0
[ 474.407975] ? process_one_work+0x3f0/0x3f0
[ 474.407979] ? set_kthread_struct+0x40/0x40
[ 474.407983] ret_from_fork+0x22/0x30
[ 474.407991] </TASK>
The issue here is that board file loading happens after ath11k_pci_probe()
succesfully returns (ath11k initialisation happends asynchronously) and the
suspend handler is still enabled, of course failing as ath11k is not properly
initialised. Fix this by checking ATH11K_FLAG_QMI_FAIL during both suspend and
resume.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2
Reported-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215504
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
---
drivers/net/wireless/ath/ath11k/pci.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index d73b522a0081..16a3560cfaf8 100644
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -1571,6 +1571,11 @@ static __maybe_unused int ath11k_pci_pm_suspend(struct device *dev)
struct ath11k_base *ab = dev_get_drvdata(dev);
int ret;
+ if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags)) {
+ ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot skipping pci suspend as qmi is not initialised\n");
+ return 0;
+ }
+
ret = ath11k_core_suspend(ab);
if (ret)
ath11k_warn(ab, "failed to suspend core: %d\n", ret);
@@ -1583,6 +1588,11 @@ static __maybe_unused int ath11k_pci_pm_resume(struct device *dev)
struct ath11k_base *ab = dev_get_drvdata(dev);
int ret;
+ if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags)) {
+ ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot skipping pci resume as qmi is not initialised\n");
+ return 0;
+ }
+
ret = ath11k_core_resume(ab);
if (ret)
ath11k_warn(ab, "failed to resume core: %d\n", ret);
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ath11k: mhi: use mhi_sync_power_up()
2022-01-27 9:01 [PATCH 1/2] ath11k: pci: fix crash on suspend if board file is not found Kalle Valo
@ 2022-01-27 9:01 ` Kalle Valo
2022-01-31 14:11 ` [PATCH 1/2] ath11k: pci: fix crash on suspend if board file is not found Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2022-01-27 9:01 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless
From: Kalle Valo <quic_kvalo@quicinc.com>
If amss.bin was missing ath11k would crash during 'rmmod ath11k_pci'. The
reason for that was that we were using mhi_async_power_up() which does not
check any errors. But mhi_sync_power_up() on the other hand does check for
errors so let's use that to fix the crash.
I was not able to find a reason why an async version was used. This call ends
is called from ath11k_hif_power_up() which can sleep, so sync version should be
safe to use.
[ 145.569731] general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC KASAN PTI
[ 145.569789] KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007]
[ 145.569843] CPU: 2 PID: 1628 Comm: rmmod Kdump: loaded Tainted: G W 5.16.0-wt-ath+ #567
[ 145.569898] Hardware name: Intel(R) Client Systems NUC8i7HVK/NUC8i7HVB, BIOS HNKBLi70.86A.0067.2021.0528.1339 05/28/2021
[ 145.569956] RIP: 0010:ath11k_hal_srng_access_begin+0xb5/0x2b0 [ath11k]
[ 145.570028] Code: df 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 ec 01 00 00 48 8b ab a8 00 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 ea 48 c1 ea 03 <0f> b6 14 02 48 89 e8 83 e0 07 83 c0 03 45 85 ed 75 48 38 d0 7c 08
[ 145.570089] RSP: 0018:ffffc900025d7ac0 EFLAGS: 00010246
[ 145.570144] RAX: dffffc0000000000 RBX: ffff88814fca2dd8 RCX: 1ffffffff50cb455
[ 145.570196] RDX: 0000000000000000 RSI: ffff88814fca2dd8 RDI: ffff88814fca2e80
[ 145.570252] RBP: 0000000000000000 R08: 0000000000000000 R09: ffffffffa8659497
[ 145.570329] R10: fffffbfff50cb292 R11: 0000000000000001 R12: ffff88814fca0000
[ 145.570410] R13: 0000000000000000 R14: ffff88814fca2798 R15: ffff88814fca2dd8
[ 145.570465] FS: 00007fa399988540(0000) GS:ffff888233e00000(0000) knlGS:0000000000000000
[ 145.570519] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 145.570571] CR2: 00007fa399b51421 CR3: 0000000137898002 CR4: 00000000003706e0
[ 145.570623] Call Trace:
[ 145.570675] <TASK>
[ 145.570727] ? ath11k_ce_tx_process_cb+0x34b/0x860 [ath11k]
[ 145.570797] ath11k_ce_tx_process_cb+0x356/0x860 [ath11k]
[ 145.570864] ? tasklet_init+0x150/0x150
[ 145.570919] ? ath11k_ce_alloc_pipes+0x280/0x280 [ath11k]
[ 145.570986] ? tasklet_clear_sched+0x42/0xe0
[ 145.571042] ? tasklet_kill+0xe9/0x1b0
[ 145.571095] ? tasklet_clear_sched+0xe0/0xe0
[ 145.571148] ? irq_has_action+0x120/0x120
[ 145.571202] ath11k_ce_cleanup_pipes+0x45a/0x580 [ath11k]
[ 145.571270] ? ath11k_pci_stop+0x10e/0x170 [ath11k_pci]
[ 145.571345] ath11k_core_stop+0x8a/0xc0 [ath11k]
[ 145.571434] ath11k_core_deinit+0x9e/0x150 [ath11k]
[ 145.571499] ath11k_pci_remove+0xd2/0x260 [ath11k_pci]
[ 145.571553] pci_device_remove+0x9a/0x1c0
[ 145.571605] __device_release_driver+0x332/0x660
[ 145.571659] driver_detach+0x1e7/0x2c0
[ 145.571712] bus_remove_driver+0xe2/0x2d0
[ 145.571772] pci_unregister_driver+0x21/0x250
[ 145.571826] __do_sys_delete_module+0x30a/0x4b0
[ 145.571879] ? free_module+0xac0/0xac0
[ 145.571933] ? lockdep_hardirqs_on_prepare.part.0+0x18c/0x370
[ 145.571986] ? syscall_enter_from_user_mode+0x1d/0x50
[ 145.572039] ? lockdep_hardirqs_on+0x79/0x100
[ 145.572097] do_syscall_64+0x3b/0x90
[ 145.572153] entry_SYSCALL_64_after_hwframe+0x44/0xae
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
---
drivers/net/wireless/ath/ath11k/mhi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c
index cccaa348cf21..8b2143802816 100644
--- a/drivers/net/wireless/ath/ath11k/mhi.c
+++ b/drivers/net/wireless/ath/ath11k/mhi.c
@@ -561,7 +561,7 @@ static int ath11k_mhi_set_state(struct ath11k_pci *ab_pci,
ret = 0;
break;
case ATH11K_MHI_POWER_ON:
- ret = mhi_async_power_up(ab_pci->mhi_ctrl);
+ ret = mhi_sync_power_up(ab_pci->mhi_ctrl);
break;
case ATH11K_MHI_POWER_OFF:
mhi_power_down(ab_pci->mhi_ctrl, true);
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ath11k: pci: fix crash on suspend if board file is not found
2022-01-27 9:01 [PATCH 1/2] ath11k: pci: fix crash on suspend if board file is not found Kalle Valo
2022-01-27 9:01 ` [PATCH 2/2] ath11k: mhi: use mhi_sync_power_up() Kalle Valo
@ 2022-01-31 14:11 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2022-01-31 14:11 UTC (permalink / raw)
To: Kalle Valo; +Cc: ath11k, linux-wireless
Kalle Valo <kvalo@kernel.org> wrote:
> Mario reported that the kernel was crashing on suspend if ath11k was not able
> to find a board file:
>
> [ 473.693286] PM: Suspending system (s2idle)
> [ 473.693291] printk: Suspending console(s) (use no_console_suspend to debug)
> [ 474.407787] BUG: unable to handle page fault for address: 0000000000002070
> [ 474.407791] #PF: supervisor read access in kernel mode
> [ 474.407794] #PF: error_code(0x0000) - not-present page
> [ 474.407798] PGD 0 P4D 0
> [ 474.407801] Oops: 0000 [#1] PREEMPT SMP NOPTI
> [ 474.407805] CPU: 2 PID: 2350 Comm: kworker/u32:14 Tainted: G W 5.16.0 #248
> [...]
> [ 474.407868] Call Trace:
> [ 474.407870] <TASK>
> [ 474.407874] ? _raw_spin_lock_irqsave+0x2a/0x60
> [ 474.407882] ? lock_timer_base+0x72/0xa0
> [ 474.407889] ? _raw_spin_unlock_irqrestore+0x29/0x3d
> [ 474.407892] ? try_to_del_timer_sync+0x54/0x80
> [ 474.407896] ath11k_dp_rx_pktlog_stop+0x49/0xc0 [ath11k]
> [ 474.407912] ath11k_core_suspend+0x34/0x130 [ath11k]
> [ 474.407923] ath11k_pci_pm_suspend+0x1b/0x50 [ath11k_pci]
> [ 474.407928] pci_pm_suspend+0x7e/0x170
> [ 474.407935] ? pci_pm_freeze+0xc0/0xc0
> [ 474.407939] dpm_run_callback+0x4e/0x150
> [ 474.407947] __device_suspend+0x148/0x4c0
> [ 474.407951] async_suspend+0x20/0x90
> dmesg-efi-164255130401001:
> Oops#1 Part1
> [ 474.407955] async_run_entry_fn+0x33/0x120
> [ 474.407959] process_one_work+0x220/0x3f0
> [ 474.407966] worker_thread+0x4a/0x3d0
> [ 474.407971] kthread+0x17a/0x1a0
> [ 474.407975] ? process_one_work+0x3f0/0x3f0
> [ 474.407979] ? set_kthread_struct+0x40/0x40
> [ 474.407983] ret_from_fork+0x22/0x30
> [ 474.407991] </TASK>
>
> The issue here is that board file loading happens after ath11k_pci_probe()
> succesfully returns (ath11k initialisation happends asynchronously) and the
> suspend handler is still enabled, of course failing as ath11k is not properly
> initialised. Fix this by checking ATH11K_FLAG_QMI_FAIL during both suspend and
> resume.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2
>
> Reported-by: Mario Limonciello <mario.limonciello@amd.com>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=215504
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
2 patches applied to ath-next branch of ath.git, thanks.
b4f4c56459a5 ath11k: pci: fix crash on suspend if board file is not found
3df6d74aedfd ath11k: mhi: use mhi_sync_power_up()
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220127090117.2024-1-kvalo@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-31 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-27 9:01 [PATCH 1/2] ath11k: pci: fix crash on suspend if board file is not found Kalle Valo
2022-01-27 9:01 ` [PATCH 2/2] ath11k: mhi: use mhi_sync_power_up() Kalle Valo
2022-01-31 14:11 ` [PATCH 1/2] ath11k: pci: fix crash on suspend if board file is not found Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).