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=1795033578; b=M5KrcHIn2UIqApXEtgQWkDbRiydYuNPpEiujd+qMnvfSZwa9EYf90pGhQCa6wns8ClAn U2aVYK30V7GSt2P1aG37PDMtxGy2rkfJIAdoZVRJISqlvmI+Jnie8pekBcgcrL71O7n5Y DG6+GQCDkHqR7+Jhtyjx+R77OMlxAJg96EZnI0sWBHlWdj++IWHc+wbbLAfiHjZGqp2QQ TzJzJcL2AeLvu3bcBd/DV7qF4rY/NtNHDlZoXeA36b6KnUpvv3Gj+/UMlwR4fFgpgFf/P J4yXr12Th3USbX8J+a4B1pX+gdB+ynoEt8jqziJS5Xbu7WfCyoo00jYzztQTSROOxdg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795033578; 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=SwyNChmG71AJTWpSILzdhGhpyQuh3XLBN+UBf5iBGZc=; b=QH5XeF1kTjxhtXLs+aa7eWnVposT9jiGl7syNQ2NQfm6m1805DK0RpqgEeWkp3I4voIx Zry1FU3RhzqntpTT9cwnzmQfHbTB3buAouT5Hb5NM10bbgQZxfr+91um24M4/PzOheCY5 OYFZgUhy58IBQadJSJEhSbwlDOn9IHf4u0xA+YpOFoc6EqlaogwKvw2cx+yHWqlF1cLNo VkqsFcIeM8xnbjgZDnbEjyvk/oD00ZxCQJcpvFk/rw2nx3rceet6x5zN0NBF+gyIfPFUv V2Eq+hhDu5iPChu65BZoA0nHbcwnV/Vxov8OKuYluV2SKkyj5AaMrq7w6PjYptHpiyQ== 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=yvnVoTsa; 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 2D289606A335; Wed, 18 Nov 2026 20:26:18 +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=yvnVoTsa Received: by smtp.kernel.org (Postfix) with ESMTPSA id 851641F000CA; Wed, 18 Nov 2026 20:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795033578; bh=SwyNChmG71AJTWpSILzdhGhpyQuh3XLBN+UBf5iBGZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=yvnVoTsa3WktpHtXVanuvKBL/CSUX6cvQxCVLzFs9yj9sut/+WW8GTw5WFRPKLO1u z4x+hipXpTHfqboowqh2DJtCpVwi1eFvNZIrwaGM+kRdzAp67HcnqGTa0Wydz5BVzV olIL1K/cP62Uw06GyX0gG4iLG18jyNkyYRPkF2PU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, William Hansen-Baird , Ping-Ke Shih , Sasha Levin Subject: [PATCH 6.6 0063/3318] wifi: rtlwifi: rtl8723be: Remove unnecessary irq save/restore in hw_init() Date: Wed, 18 Nov 2026 15:11:25 +0100 Message-ID: <20261118150315.876581030@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150313.527275416@linuxfoundation.org> References: <20261118150313.527275416@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: William Hansen-Baird [ Upstream commit 1b4cd55626b6ffa93d18848412afb912a4add585 ] rtl8723be hw_init() calls local_save_flags(flags) followed by local_irq_enable(). Later, local_irq_restore(flags) is called. This causes warnings from Lockdep on boot and modprobe, as local_irq_restore(flags) should only be called while irqs are disabled. The warning was introduced to detect this class of bug in [1]. With testing I found that all paths which call hw_init() have irqs already enabled for rtl8723be. Furthermore, the calls were originally added for the rtl8192ce in commit f78bccd79ba3 ("rtlwifi: rtl8192ce: Fix too long disable of IRQs") before later being added to most other rtlwifi drivers. Commit d3feae41a347 ("rtlwifi: Update power-save routines for 062814 driver") then replaces the call to spin_lock_irqsave() before hw_init(), and thus the codepath which caused irqs to be disabled in hw_init and prompted the original commit has been removed. The same irq save/restore pattern is also present in the hw_init() of rtl8192ce, rtl8723ae, rtl8188ee, rtl8192se and rtl8192cu, however I don't have the hardware to test them, so I did not include them in my changes. Tested on a Razer Blade 14 2017. Example of output from Lockdep prior to fix: raw_local_irq_restore() called with IRQs enabled ... Call Trace: rtl8723be_hw_init+0x5992/0x7220 [rtl8723be] ? static_obj+0x61/0xa0 rtl_pci_start+0x222/0x5c0 [rtl_pci] rtl_op_start+0x128/0x1a0 [rtlwifi] ? __kasan_check_read+0x11/0x20 drv_start+0x16c/0x550 [mac80211] ... irq event stamp: 887679 hardirqs last enabled at (887689): [] __up_console_sem+0x90/0xa0 hardirqs last disabled at (887698): [] __up_console_sem+0x75/0xa0 softirqs last enabled at (887670): [] __irq_exit_rcu+0x175/0x2f0 softirqs last disabled at (887649): [] __irq_exit_rcu+0x175/0x2f0 ---[ end trace 0000000000000000 ]--- [1] https://lore.kernel.org/all/20210111153707.10071-1-mark.rutland@arm.com/ Signed-off-by: William Hansen-Baird Acked-by: Ping-Ke Shih Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20260609095359.2964193-1-william.hansen.baird@gmail.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c index 15575644551f0..3514feb470e3a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c @@ -1339,11 +1339,6 @@ int rtl8723be_hw_init(struct ieee80211_hw *hw) bool rtstatus = true; int err; u8 tmp_u1b; - unsigned long flags; - - /* reenable interrupts to not interfere with other devices */ - local_save_flags(flags); - local_irq_enable(); rtlhal->fw_ready = false; rtlpriv->rtlhal.being_init_adapter = true; @@ -1449,7 +1444,6 @@ int rtl8723be_hw_init(struct ieee80211_hw *hw) rtl8723be_dm_init(hw); exit: - local_irq_restore(flags); rtlpriv->rtlhal.being_init_adapter = false; return err; } -- 2.53.0