Commit 54a5b38e authored by Kang Yang's avatar Kang Yang Committed by Jeff Johnson
Browse files

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

Fixes: c256a94d ("wifi: ath10k: shutdown driver when hardware is unreliable")
Signed-off-by: default avatarKang Yang <kang.yang@oss.qualcomm.com>
Reviewed-by: default avatarRameshkumar Sundaram <rameshkumar.sundaram@oss.qualcomm.com>
Reviewed-by: default avatarBaochen Qiang <baochen.qiang@oss.qualcomm.com>
Link: https://patch.msgid.link/20260428061737.37-1-kang.yang@oss.qualcomm.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent 7320d6eb

drivers/net/wireless/ath/ath10k/wmi.c

+7 −8
Original line number Diff line number Diff line
@@ -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,7 +1946,7 @@ 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);

		}

		} else {

			/* try to send pending beacons first. they take priority */

			ath10k_wmi_tx_beacons_nowait(ar);
@@ -1955,7 +1954,7 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id) 


			if (ret && test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags))

				ret = -ESHUTDOWN;



		}

		(ret != -EAGAIN);

	}), 3 * HZ);