wifi: ath10k: skip WMI and beacon transmission when device is wedged
PATCH v2 1/1 wifi: ath10k: skip WMI and beacon transmission when device is wedged
In ath10k_wmi_cmd_send(), the current code detects ATH10K_STATE_WEDGED and sets ret to -ESHUTDOWN, but still proceeds to transmit pending beacons and calls ath10k_wmi_cmd_send_nowait().
This can lead to incorrect behavior, as WMI commands and beacons are still sent after the device has been marked as wedged, and the original -ESHUTDOWN return value may be overwritten by the result of the send path.
The wedged state indicates the hardware is already unreliable, and no further interaction with firmware is expected or meaningful in this state.
Fix this by skipping beacon transmission and the WMI send path entirely once ATH10K_STATE_WEDGED is detected, ensuring consistent return values and avoiding unnecessary firmware interaction.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00288-QCARMSWPZ-1
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00189
---
v2: remove QUIC copyright.
--- drivers/net/wireless/ath/ath10k/wmi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath10k/wmi.c +7 -8
@@ -3,7 +3,6 @@* Copyright (c) 2005-2011 Atheros Communications Inc. * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */
@@ -1947,15 +1946,15 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id) ret = -ESHUTDOWN ;ath10k_dbg (ar,ATH10K_DBG_WMI ,"drop wmi command %d, hardware is wedged\n" , cmd_id); - } -/* try to send pending beacons first. they take priority */ -ath10k_wmi_tx_beacons_nowait (ar); + }else { +/* try to send pending beacons first. they take priority */ +ath10k_wmi_tx_beacons_nowait (ar); - ret =ath10k_wmi_cmd_send_nowait (ar, skb, cmd_id); - -if (ret &&test_bit (ATH10K_FLAG_CRASH_FLUSH , &ar->dev_flags)) - ret = -ESHUTDOWN ; + ret =ath10k_wmi_cmd_send_nowait (ar, skb, cmd_id); +if (ret &&test_bit (ATH10K_FLAG_CRASH_FLUSH , &ar->dev_flags)) + ret = -ESHUTDOWN ; + } (ret != -EAGAIN ); }), 3 * HZ);
base-commit: 34a5329beee86a22a446e27eb37f06caa63479ca
Signature · 1 line
2.34.1
Quoted 17 lines · Kang Yang
In
ath10k_wmi_cmd_send(), the current code detectsATH10K_STATE_WEDGEDand sets ret to-ESHUTDOWN, but still proceeds to transmit pending beacons and callsath10k_wmi_cmd_send_nowait().This can lead to incorrect behavior, as WMI commands and beacons are still sent after the device has been marked as wedged, and the original
-ESHUTDOWNreturn value may be overwritten by the result of the send path.The wedged state indicates the hardware is already unreliable, and no further interaction with firmware is expected or meaningful in this state.
Fix this by skipping beacon transmission and the WMI send path entirely once
ATH10K_STATE_WEDGEDis detected, ensuring consistent return values and avoiding unnecessary firmware interaction.
Quoted 5 lines
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00288-QCARMSWPZ-1
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00189Fixes c256a94d1b1b ("wifi: ath10k: shutdown driver when hardware is unreliable")Signed-off-by Kang Yang <[email protected]>
Quoted 17 lines · Kang Yang
In
ath10k_wmi_cmd_send(), the current code detectsATH10K_STATE_WEDGEDand sets ret to-ESHUTDOWN, but still proceeds to transmit pending beacons and callsath10k_wmi_cmd_send_nowait().This can lead to incorrect behavior, as WMI commands and beacons are still sent after the device has been marked as wedged, and the original
-ESHUTDOWNreturn value may be overwritten by the result of the send path.The wedged state indicates the hardware is already unreliable, and no further interaction with firmware is expected or meaningful in this state.
Fix this by skipping beacon transmission and the WMI send path entirely once
ATH10K_STATE_WEDGEDis detected, ensuring consistent return values and avoiding unnecessary firmware interaction.
Quoted 5 lines
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00288-QCARMSWPZ-1
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00189Fixes c256a94d1b1b ("wifi: ath10k: shutdown driver when hardware is unreliable")Signed-off-by Kang Yang <[email protected]>
Jeff Johnson
AppliedQuoted 10 lines · Kang Yang
In
ath10k_wmi_cmd_send(), the current code detectsATH10K_STATE_WEDGEDand sets ret to-ESHUTDOWN, but still proceeds to transmit pending beacons and callsath10k_wmi_cmd_send_nowait().This can lead to incorrect behavior, as WMI commands and beacons are still sent after the device has been marked as wedged, and the original
-ESHUTDOWNreturn value may be overwritten by the result of the send path.[...]
Applied, thanks!
[1/1] wifi: ath10k: skip WMI and beacon transmission when device is wedged
commit: 54a5b38e4396530e5b2f12b54d3844e860ab6784
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>