From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795023003; b=tsDcbx+IJ3QR/q0MPdPQLHvW8m9ygTezBZHJHs+gXsbohGiU0BJv4umLXE4VpPohqP63 MT9befjRMNmSlTCtdfazWoapTT3TLCkZbEyJtaD/pNx0FTU5HUSyjOjm+0JQ+tqGSEVXU MNutnsTPCpg/IRh7gSBsUIGDF9wYc79B+NolUME05O8TbiohMYxwbf3jJa31kP5Wonhzh yJMHp3ZbD1HZxmupbZgn7VL9qIANHOtKKSKLAXUZ2OiW9LtgHbXA2y5g728jWJ3E/yNg+ 3mG1ih1shLv+CDkH839YVvpYKJN0S236gHa95NqoL4ebX1xA0bYAzc5JchJ3nBs/zIQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023003; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=ZwTEaecIsXUI8DDo9x0AClLCp35v1gq9s/B9PCOgYtw=; b=ZZJ61BMm5vTMrQ2/t16u/J+19OGGfFuKinpMExxhJY89JizDJIy3zvYwxkLOplkx/rBg W3tL8i/+kAg0FE3qNy8GcSleyhPfeumTWpsN/4v8721chDgWep7ecEQwVSnXQbbgld+Bd YtG0guBfxKNd/sPFcN+T1TnRblQPXzzFGD8mND75GbUOmru8FsJR9bBIf1+MYEDwshAva dWcjjqKSI5dt2jeeWDF3frc6MUnppBpY5HZrQFF8D8gllokNuQaFMTA+YmUT81x6g2c6S Ofr5rG5L9u3ToSsfzJHPxc1qRlO81tXe9FRKCAFmokDBM0F2PseFVmTOSFx55cPFhhg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LdU4qBrc; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4C75606A331; Wed, 18 Nov 2026 17:30:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LdU4qBrc Received: by smtp.kernel.org (Postfix) with ESMTPSA id 508051F000C4; Wed, 18 Nov 2026 17:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023003; bh=ZwTEaecIsXUI8DDo9x0AClLCp35v1gq9s/B9PCOgYtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LdU4qBrcT7iX3o5cQcF/IV4SM7D+gyLY7XzBLy4IBNMxmpprmWF0/tO+0F2SYlbzl OQl3GZt/wPXjjQYmi1bqS03zuzCXXYPZ4CBVHBCRbPNkP+nzd2VbrTGiU+GFofaafS I7pnmQuB2u55zoPph76DRMrb9i+n4ciFf/PwZ5mo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Julius Bairaktaris , Rameshkumar Sundaram , Baochen Qiang , Jeff Johnson , Sasha Levin Subject: [PATCH 6.18 0214/2151] wifi: ath11k: disable interrupts during firmware crash recovery Date: Wed, 18 Nov 2026 15:32:29 +0100 Message-ID: <20261118150129.575452349@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Julius Bairaktaris [ Upstream commit f7a74e131d3f0de04335dbe278bfb82bdafcdb3e ] On IPQ8074 a firmware assert reboots the SoC: Unable to handle kernel read from unreadable memory at virtual address 0 pc : ath11k_hal_srng_access_begin+0xc/0x60 [ath11k] lr : ath11k_dp_rx_process_mon_status+0x15c/0xd84 [ath11k] Call trace: ath11k_hal_srng_access_begin+0xc/0x60 [ath11k] ath11k_dp_rx_process_mon_rings+0xa0/0x5d4 [ath11k] ath11k_dp_service_srng+0x1f4/0x348 [ath11k] ath11k_ahb_ext_grp_napi_poll+0x34/0xd4 [ath11k_ahb] __napi_poll+0x38/0x188 net_rx_action+0x120/0x2c0 ath11k_core_reconfigure_on_crash() tears the data path down with ath11k_dp_pdev_free(), ath11k_dp_free() and ath11k_hal_srng_clear(), which memsets the ring list. The DP NAPI is still running while that happens, so it services a ring whose address pointer has just been cleared. That function used to disable the interrupts first, until commit d455e805de70 ("wifi: ath11k: rearrange IRQ enable/disable in reset path") moved the disable into ath11k_core_reset(). reset_work is only queued from mhi.c and from the debugfs hw-restart handler, so AHB parts never run it on a real firmware crash. Their recovery goes QMI server exit -> restart_work -> ath11k_core_reconfigure_on_crash() -> ath11k_core_qmi_firmware_ready(), and nothing disables the interrupts anywhere along it. Disable them again on the crash path. The reset path has already done so by the time it gets here, hence the ab->is_reset check. This is also why the debugfs hw-restart trigger never showed the problem: it goes through ath11k_core_reset(), the one path that still had the disable. Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.12-01460-QCAHKSWPL_SILICONZ-1 Fixes: d455e805de70 ("wifi: ath11k: rearrange IRQ enable/disable in reset path") Assisted-by: Claude:claude-opus-5 Signed-off-by: Julius Bairaktaris Reviewed-by: Rameshkumar Sundaram Reviewed-by: Baochen Qiang Link: https://patch.msgid.link/20260726221908.104873-3-julius@bairaktaris.de Signed-off-by: Jeff Johnson Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath11k/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c index 78a1b0edd8b45..e8b130cd71d49 100644 --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c @@ -2304,6 +2304,16 @@ static int ath11k_core_reconfigure_on_crash(struct ath11k_base *ab) mutex_lock(&ab->core_lock); ath11k_thermal_unregister(ab); + + /* + * ath11k_core_reset() already disabled the interrupts on the reset + * path; only the firmware crash path reaches here with them live. + */ + if (!ab->is_reset) { + ath11k_hif_irq_disable(ab); + ath11k_hif_ce_irq_disable(ab); + } + ath11k_dp_pdev_free(ab); ath11k_spectral_deinit(ab); ath11k_ce_cleanup_pipes(ab); -- 2.53.0