From nobody Thu Apr 2 05:51:58 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 369623B7B92; Mon, 30 Mar 2026 10:06:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774865167; cv=none; b=Sod7dKcnq9IHqJ7o7B5oWOYPNt9O5rxZoMrUaQJdBuOCjALCa3lotd+2WX7iCX5W3mBUdtNYnrSb6qeF8PklDTj3yHco9VSKjGpXjoUfmdE104plST3qHLF5OkWPgigkPAGs6CmL906FDgDax8kDs7IQyOw95YVKhlNtB3anGN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774865167; c=relaxed/simple; bh=2Px1vFmVelvllOxT/hL/0VnYYWZyh+UKt4NS9+SHuFE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=vDabxtElkHRHxtZRXz0xA36TNIKOfJKBMFxxuugLgoFS1rvYp/hRJ/30/mL8EoBIroBrbFV4Wq9fSe54c0uxMkR/vBjJv6lCxvM31+WwMH0v5wJxxgq3B6vnw39+xVF325xWB0gKDMmrPxRwTxbI7TkxGRQDTFrd6au99KPRNSk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=BRK91mSo; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="BRK91mSo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1774865158; bh=2Px1vFmVelvllOxT/hL/0VnYYWZyh+UKt4NS9+SHuFE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BRK91mSobPtGrDz7gGNcgOYhrnozUQ50KD313+nAgjXQmBO/yfZCrJ6D8PZpXFtQY pghvkhibzpWyDPY6mq0R6uGw0H2SH5jYDf8/qp+NoeGeolV/4pLUM3U5yhbPXPATJg /Rx5fJ5U4ohR2R2/MeXA1TQsKnfPXinzMWP3PAq1y3Lo7QG0PVE+d9pQDi/WrjnZ0w NOH266CQGIVAtj8moOCAyI4l3enicspCDQr0eKUNhO8KczP1j58pbZYlD2Txxt66NY uOKJoXbHPHSJr8WALKDeXa+XKRoaiDmRPgzhG75FhvlbcgLGYEwNR6q6LNn5wBXnkB JTQFSoCRF2bTw== Received: from [192.168.1.53] (unknown [IPv6:2a01:6243:628:0:43ea:f64d:fc7e:3a2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mattl) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6525D17E41AE; Mon, 30 Mar 2026 12:05:58 +0200 (CEST) From: Matthew Leach Date: Mon, 30 Mar 2026 11:05:31 +0100 Subject: [PATCH RESEND RFC 1/3] net: ath11k: fix redundant reset from stale pending workqueue bit Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260330-ath11k-lockup-fixes-v1-1-7ed21095c2c4@collabora.com> References: <20260330-ath11k-lockup-fixes-v1-0-7ed21095c2c4@collabora.com> In-Reply-To: <20260330-ath11k-lockup-fixes-v1-0-7ed21095c2c4@collabora.com> To: Jeff Johnson Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Matthew Leach X-Mailer: b4 0.15.0 During a firmware lockup, WMI commands time out in rapid succession, each calling queue_work() to schedule ath11k_core_reset(). This can cause a spurious extra reset after recovery completes: 1. First WMI timeout calls queue_work(), sets the pending bit and schedules ath11k_core_reset(). The workqueue clears the pending bit before invoking the work function. reset_count becomes 1 and the reset is kicked off asynchronously. ath11k_core_reset() returns. 2. Second WMI timeout calls queue_work() and re-queues the work. When it runs after step 1 returns, it sees reset_count > 1 and blocks in wait_for_completion(). The pending bit is again cleared. 3. Third WMI timeout calls queue_work(), the pending bit was cleared in step 2, so this succeeds and arms another execution. 4. The asynchronous reset finishes. ath11k_mac_op_reconfig_complete() decrements reset_count and calls complete(). The blocked worker from step 2 wakes, takes the early-exit path, and decrements reset_count to 0. 5. The workqueue sees the pending bit from step 3 and runs ath11k_core_reset() again. reset_count is 0, triggering a full redundant hardware reset. Fix this by calling cancel_work() on reset_work in ath11k_mac_op_reconfig_complete() before signalling completion. This clears any stale pending bit, preventing the spurious re-execution. Signed-off-by: Matthew Leach --- drivers/net/wireless/ath/ath11k/mac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/a= th/ath11k/mac.c index e4ee2ba1f669..748f779b3d1b 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -9274,6 +9274,10 @@ ath11k_mac_op_reconfig_complete(struct ieee80211_hw = *hw, * the recovery has to be done for each radio */ if (recovery_count =3D=3D ab->num_radios) { + /* Cancel any pending work, preventing a second redudant + * reset. + */ + cancel_work(&ab->reset_work); atomic_dec(&ab->reset_count); complete(&ab->reset_complete); ab->is_reset =3D false; --=20 2.53.0 From nobody Thu Apr 2 05:51:58 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36A493B7B94; Mon, 30 Mar 2026 10:06:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774865167; cv=none; b=EMHi1nMzaFFTrYEnkKSlF+W4Rpl2QXdslaGI4klpRzc7cIfYYbUktipDfuIyKmAawVzdELZVagjJItPyH3gSAr0M3fmWJsyYI8NRKkwYs8iK45YW7DIObYW2hgre23HIz81Ea8LH3Q/6zeg7lbZFaYMwCkKieBau/pz0Bz9tbq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774865167; c=relaxed/simple; bh=hof7rouX38nmEzoDefI3x1AgAGZp8Hxze5p0FV+9bmU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U7yvrV3UcVW+0j+an+/fB3lSKPrSHsZ1ZJSLfV/gzwtyhE/l4niOIxf2utnIqBxu8LMYc8t4whtH9nN85xlXvNyx+EKdZruIknmTUwvHVXT5tbgdhvkaOyMstmwZW7+JML8ifYlPhU3mBUzQseYLDZ4yTCxUrDzm9fXJyc15xYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=F8l017a6; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="F8l017a6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1774865159; bh=hof7rouX38nmEzoDefI3x1AgAGZp8Hxze5p0FV+9bmU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=F8l017a6jNR8NndedfguN48w4q6E9iPXvyzJRDXbsqK+z4SEGeRuPFWg6EWdcww1H UKIJVr/UfRo4o9u8WyVjRFD+PSFOzs94LMrY+Zg9Tre8nPw48XKm6/RVeTxuvoW7g1 i2zYy1PoZOC7hB6s7IgfmO2hiY2IlSMhOXkrr4VmfvxkX08M0d7yBGiGEptV50YG1K C9FK0rSXI7T5Oenk5cl6V7Ksqd22HBjCsgnnG23HOALuYNb079BDR4RDQJEdwRfheS P8oa5nlOVejlV85ABGu2sICw9gOBqp0RR/ZxXbTVMy2Gek5KleCW71VXWHty3Dyk0P Y5O/21hZD5oIw== Received: from [192.168.1.53] (unknown [IPv6:2a01:6243:628:0:43ea:f64d:fc7e:3a2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mattl) by bali.collaboradmins.com (Postfix) with ESMTPSA id CEBD217E41B3; Mon, 30 Mar 2026 12:05:58 +0200 (CEST) From: Matthew Leach Date: Mon, 30 Mar 2026 11:05:32 +0100 Subject: [PATCH RESEND RFC 2/3] net: ath11k: add firmware lockup detection and recovery Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260330-ath11k-lockup-fixes-v1-2-7ed21095c2c4@collabora.com> References: <20260330-ath11k-lockup-fixes-v1-0-7ed21095c2c4@collabora.com> In-Reply-To: <20260330-ath11k-lockup-fixes-v1-0-7ed21095c2c4@collabora.com> To: Jeff Johnson Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Matthew Leach X-Mailer: b4 0.15.0 Detect firmware lockup when a WMI command times out and TX descriptor exhaustion occurs within ATH11K_LOCKUP_DESC_ERR_RANGE_HZ (1 minute). In this case, consider the firmware dead. When a lockup is detected, queue reset work to restart the chip. After reset completes, clear the lockup detection state. Signed-off-by: Matthew Leach --- drivers/net/wireless/ath/ath11k/core.h | 2 ++ drivers/net/wireless/ath/ath11k/mac.c | 6 ++++++ drivers/net/wireless/ath/ath11k/wmi.c | 24 +++++++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/= ath/ath11k/core.h index a0d725923ef2..221dcd23b3dd 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -70,6 +70,7 @@ extern bool ath11k_ftm_mode; #define ATH11K_RESET_FAIL_TIMEOUT_HZ (20 * HZ) #define ATH11K_RECONFIGURE_TIMEOUT_HZ (10 * HZ) #define ATH11K_RECOVER_START_TIMEOUT_HZ (20 * HZ) +#define ATH11K_LOCKUP_DESC_ERR_RANGE_HZ (60 * HZ) =20 enum ath11k_supported_bw { ATH11K_BW_20 =3D 0, @@ -1039,6 +1040,7 @@ struct ath11k_base { =20 struct ath11k_dbring_cap *db_caps; u32 num_db_cap; + u64 last_frame_tx_error_jiffies; =20 /* To synchronize 11d scan vdev id */ struct mutex vdev_id_11d_lock; diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/a= th/ath11k/mac.c index 748f779b3d1b..a0b4d60da330 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include =20 @@ -6546,6 +6547,10 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw, =20 ret =3D ath11k_dp_tx(ar, arvif, arsta, skb); if (unlikely(ret)) { + scoped_guard(spinlock_bh, &ar->ab->base_lock) { + ar->ab->last_frame_tx_error_jiffies =3D jiffies_64; + } + ath11k_warn(ar->ab, "failed to transmit frame %d\n", ret); ieee80211_free_txskb(ar->hw, skb); } @@ -9281,6 +9286,7 @@ ath11k_mac_op_reconfig_complete(struct ieee80211_hw *= hw, atomic_dec(&ab->reset_count); complete(&ab->reset_complete); ab->is_reset =3D false; + ab->last_frame_tx_error_jiffies =3D 0; atomic_set(&ab->fail_cont_count, 0); ath11k_dbg(ab, ATH11K_DBG_BOOT, "reset success\n"); } diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/a= th/ath11k/wmi.c index 40747fba3b0c..7d9f0bcbb3b0 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -7,8 +7,11 @@ #include #include #include +#include #include #include +#include +#include #include #include #include @@ -325,9 +328,28 @@ int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, s= truct sk_buff *skb, }), WMI_SEND_TIMEOUT_HZ); } =20 - if (ret =3D=3D -EAGAIN) + if (ret =3D=3D -EAGAIN) { + u64 range_start; + ath11k_warn(wmi_ab->ab, "wmi command %d timeout\n", cmd_id); =20 + guard(spinlock_bh)(&ab->base_lock); + + if (ab->last_frame_tx_error_jiffies =3D=3D 0) + return ret; + + range_start =3D + (jiffies_64 > ATH11K_LOCKUP_DESC_ERR_RANGE_HZ) ? + jiffies_64 - ATH11K_LOCKUP_DESC_ERR_RANGE_HZ : + 0; + + if (time_in_range64(ab->last_frame_tx_error_jiffies, + range_start, jiffies_64) && + queue_work(ab->workqueue_aux, &ab->reset_work)) + ath11k_err(wmi_ab->ab, + "Firmware lockup detected. Resetting."); + } + if (ret =3D=3D -ENOBUFS) ath11k_warn(wmi_ab->ab, "ce desc not available for wmi command %d\n", cmd_id); --=20 2.53.0 From nobody Thu Apr 2 05:51:58 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36ADF3B7B95; Mon, 30 Mar 2026 10:06:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774865167; cv=none; b=aRSD18JdpsZE3CLowmZTja9D30bhIVekrx3n1KESfoI6MrnygFJIjK2HZuMMXo3pSt7TWHSkcdS6mAmtexaPIKC1qtyZI9+QdUpfZWnNTq/R2QEkxzodH9pWYRDTk+fZjPQinvzFT6Q9NLMe+lW745I+zEqZ2as0bKMDzLXDPMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774865167; c=relaxed/simple; bh=qTa6bNhVs6NpYSFFFtl049zj5lWrm0xAmHqh8jsaWps=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o2pCws8nkl+mzB61nRxCSFRDwq77cXH/Cc2SwgEbrb4+SkoVW+GTZtdGght3+3kb2EyFPaIfAH8lmgrucvOESTAH26ACBkJR+OxWkIMIEA0HqBOJI9Mql4X9Hw9jqYl6a6TFhbqLC9JQOFgZKKTs9sB79oncboONYEa/DCIPw7c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=OfBinJ8Y; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="OfBinJ8Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1774865159; bh=qTa6bNhVs6NpYSFFFtl049zj5lWrm0xAmHqh8jsaWps=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OfBinJ8YDDkQWc9DlTwXWMmem1rFOC0WLOHthBSuk9Re1OSLLQP4M+aZh9nRetKmD umHaIScGeW72pWCHNdEerrUbBPZjxfffVPd6Nkq8TMWBB35g1V9uTSXQgh5nuHkCoP 0HBSUIkqE0QyEMQeD11Ng1aB4xfmcjrRJ2pzsiQHwsmnTU1TtR/hmr5+wPIjMV0Bn8 uy6nVJ8z8bbfg2kFjeNu1kfXfeIi6RKno6W1Fxe3MGiVFCKpxibcN3uuHeMiG01DQG KoNOpT9fiI4QLOQAlVMGc0ECDhDwSNeH4wni3UP3fsImUaTvGR1DvPdtDoqXGmkId5 1C7YLkb23xkXA== Received: from [192.168.1.53] (unknown [IPv6:2a01:6243:628:0:43ea:f64d:fc7e:3a2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mattl) by bali.collaboradmins.com (Postfix) with ESMTPSA id 3F0DD17E41BB; Mon, 30 Mar 2026 12:05:59 +0200 (CEST) From: Matthew Leach Date: Mon, 30 Mar 2026 11:05:33 +0100 Subject: [PATCH RESEND RFC 3/3] net: ath11k: add lockup simulation via debugfs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260330-ath11k-lockup-fixes-v1-3-7ed21095c2c4@collabora.com> References: <20260330-ath11k-lockup-fixes-v1-0-7ed21095c2c4@collabora.com> In-Reply-To: <20260330-ath11k-lockup-fixes-v1-0-7ed21095c2c4@collabora.com> To: Jeff Johnson Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Matthew Leach X-Mailer: b4 0.15.0 Add a debugfs command to simulate a firmware lockup. This does not hang the hardware. Instead, it forces the driver down an error path that reproduces the sequence observed during real lockups: ath11k_pci 0000:03:00.0: failed to transmit frame -12 ath11k_pci 0000:03:00.0: failed to transmit frame -12 ath11k_pci 0000:03:00.0: failed to transmit frame -12 ... ath11k_pci 0000:03:00.0: wmi command 28680 timeout ath11k_pci 0000:03:00.0: failed to submit WMI_MGMT_TX_SEND_CMDID cmd ath11k_pci 0000:03:00.0: failed to send mgmt frame: -11 This allows validation of the firmware lockup detection and recovery mechanism without requiring a real hardware failure. Signed-off-by: Matthew Leach --- drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/debugfs.c | 7 ++++++- drivers/net/wireless/ath/ath11k/hal.c | 7 +++++-- drivers/net/wireless/ath/ath11k/htc.c | 2 +- drivers/net/wireless/ath/ath11k/wmi.c | 6 +++++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/= ath/ath11k/core.h index 221dcd23b3dd..44b02ae1e85b 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -1041,6 +1041,7 @@ struct ath11k_base { struct ath11k_dbring_cap *db_caps; u32 num_db_cap; u64 last_frame_tx_error_jiffies; + bool simulate_lockup; =20 /* To synchronize 11d scan vdev id */ struct mutex vdev_id_11d_lock; diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wirele= ss/ath/ath11k/debugfs.c index 0c1138407838..ca0b72a3e0b0 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c @@ -356,7 +356,8 @@ static ssize_t ath11k_read_simulate_fw_crash(struct fil= e *file, const char buf[] =3D "To simulate firmware crash write one of the keywords to this file:\n" "`assert` - this will send WMI_FORCE_FW_HANG_CMDID to firmware to cause = assert.\n" - "`hw-restart` - this will simply queue hw restart without fw/hw actually= crashing.\n"; + "`hw-restart` - this will simply queue hw restart without fw/hw actually= crashing.\n" + "`lockup` - simulate a firmware lockup without the h/w actually hanging.= \n"; =20 return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf)); } @@ -413,6 +414,10 @@ static ssize_t ath11k_write_simulate_fw_crash(struct f= ile *file, ath11k_info(ab, "user requested hw restart\n"); queue_work(ab->workqueue_aux, &ab->reset_work); ret =3D 0; + } else if (!strcmp(buf, "lockup")) { + ath11k_info(ab, "simulating lockup\n"); + ab->simulate_lockup =3D true; + ret =3D 0; } else { ret =3D -EINVAL; goto exit; diff --git a/drivers/net/wireless/ath/ath11k/hal.c b/drivers/net/wireless/a= th/ath11k/hal.c index e821e5a62c1c..e01fb17a4734 100644 --- a/drivers/net/wireless/ath/ath11k/hal.c +++ b/drivers/net/wireless/ath/ath11k/hal.c @@ -691,7 +691,7 @@ int ath11k_hal_srng_dst_num_free(struct ath11k_base *ab= , struct hal_srng *srng, =20 tp =3D srng->u.dst_ring.tp; =20 - if (sync_hw_ptr) { + if (sync_hw_ptr && !ab->simulate_lockup) { hp =3D *srng->u.dst_ring.hp_addr; srng->u.dst_ring.cached_hp =3D hp; } else { @@ -743,7 +743,7 @@ u32 *ath11k_hal_srng_src_get_next_entry(struct ath11k_b= ase *ab, */ next_hp =3D (srng->u.src_ring.hp + srng->entry_size) % srng->ring_size; =20 - if (next_hp =3D=3D srng->u.src_ring.cached_tp) + if (next_hp =3D=3D srng->u.src_ring.cached_tp || ab->simulate_lockup) return NULL; =20 desc =3D srng->ring_base_vaddr + srng->u.src_ring.hp; @@ -828,6 +828,9 @@ void ath11k_hal_srng_access_begin(struct ath11k_base *a= b, struct hal_srng *srng) =20 lockdep_assert_held(&srng->lock); =20 + if (ab->simulate_lockup) + return; + if (srng->ring_dir =3D=3D HAL_SRNG_DIR_SRC) { srng->u.src_ring.cached_tp =3D *(volatile u32 *)srng->u.src_ring.tp_addr; diff --git a/drivers/net/wireless/ath/ath11k/htc.c b/drivers/net/wireless/a= th/ath11k/htc.c index 4571d01cc33d..b05d04a1f5e8 100644 --- a/drivers/net/wireless/ath/ath11k/htc.c +++ b/drivers/net/wireless/ath/ath11k/htc.c @@ -208,7 +208,7 @@ static int ath11k_htc_process_trailer(struct ath11k_htc= *htc, break; } =20 - if (ab->hw_params.credit_flow) { + if (ab->hw_params.credit_flow && !ab->simulate_lockup) { switch (record->hdr.id) { case ATH11K_HTC_RECORD_CREDITS: len =3D sizeof(struct ath11k_htc_credit_report); diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/a= th/ath11k/wmi.c index 7d9f0bcbb3b0..27d6d4a2f803 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -345,9 +345,13 @@ int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, s= truct sk_buff *skb, =20 if (time_in_range64(ab->last_frame_tx_error_jiffies, range_start, jiffies_64) && - queue_work(ab->workqueue_aux, &ab->reset_work)) + queue_work(ab->workqueue_aux, &ab->reset_work)) { ath11k_err(wmi_ab->ab, "Firmware lockup detected. Resetting."); + + /* Assume that reset gets us out of lockup. */ + ab->simulate_lockup =3D false; + } } =20 if (ret =3D=3D -ENOBUFS) --=20 2.53.0