From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28F1A35F19A for ; Tue, 9 Jun 2026 09:54:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780998861; cv=none; b=cVRZcGekQcJMn3QLh9nTWyAVimd2F5hN1VmG+encNDzOlI4Ot1uq4wtnRZ92bW072T2f2pO+nHCRNNWluAQeBndW/D9MkeT2bwgthSzLZZFm3Q6Nd9GJvu0FEwvA9GR/UwbhJ0hGi2KdpClu7kHIuQFSxiTOry0TxEdRD3vWBHM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780998861; c=relaxed/simple; bh=MG+MBcNvqcq8Et1tRDgRhMfvYMeM7cEx2V7ysgwWkNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G4RjAoCQwfpjMbpLtHK/384fkTO2HVetwi/6Lc84kVXFbUxzsogexi5j9lJQvChXo1LIBUGoT+ggtmLP4U65Hi8QwwQBKN/vLquJ4aXvTMizsMJa+jbAsp52o1RXtygIYuCaNmE3CskM5XLqrWIx79D4P6pofsOWsh7kv3hW+O4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=l0Illhda; arc=none smtp.client-ip=209.85.218.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="l0Illhda" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-bed4f2f0898so671034266b.3 for ; Tue, 09 Jun 2026 02:54:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780998857; x=1781603657; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PetLQSauU/7mfz2291nX83ledTGEEi5d/jN3iXgKPwU=; b=l0IllhdadIxZc4rKlIfIyNAQ2FE0AIwLsXjvs0hMorZQ4JxgL4H0oRvDMsb4CVYG0M 3JPiintZcws4OlUw/bqmZSOupJYiZsg5ZLNCJ1ORGoVUF0Ki1ymb44Q2OigjiMZpghWv /FO92ntX2+tPmFw6iOwbsHULj2GOJflWOMhbtUYgfayzfe/6B5G7a08wbEb/vU6GZbIg ZLvTTwf6he7I3qqPVXabMYK1En2chgi/1YftnrkUPjTOCx+4D5Fdnb10rAQzbYhfXlE7 rAWSmtYqDvu8l0fkBLTZT++47bIp6aw89F6Oj0fiL6RXcACQjSUpaakdsr66s10x4xOU k4BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780998857; x=1781603657; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PetLQSauU/7mfz2291nX83ledTGEEi5d/jN3iXgKPwU=; b=XZmx44cAfhvqzV8fb1si2OVQFd1rexSUnz0pWQDYRlSeHPOpHBW7LMUYhAqBO9Dw8I kbq2waKfb7SbugzizdvOws+Fb2PUEFffe9d4pYYxFX623G6EAu0bqKkk9qB3XvbvI0KL Eo7nRcc15w1UNbD4zGF9eQka8ZKepLBGXz6GesFnJ1vLBhO4JC/zpPERfqIq3BUc17Ps gY60XrHlQILoKIsYw1iJ8raH2F83RPWXfi6v7Ye2THYAY6D4MCyCVptGNjYeItNatQ2f nelGSgcoUbSHlOZ0/mfLGvCO3ZT72fQM3NDJhqbjyLGZmJYixh+xFFIlmFrdtRwZLt69 Jiow== X-Forwarded-Encrypted: i=1; AFNElJ++Khn2+gk6L/S24rZ1KbynV1mavr6jOtKbjf+4J//IcanL8KBwtmtp7biyKRMPYMhNGI8QUlNvFJ296oA=@vger.kernel.org X-Gm-Message-State: AOJu0YwusrW9c1fDdDm8TAUDpGe5qI/eBznk/OUANtE4DmXXEnyopnFB x52zVoiiW/QuZ8s+1+Zdr9UzaELahdhYoMz4+yDELgrJyXarlIhLvT5j1bbdIq4x7pw= X-Gm-Gg: Acq92OGuCWN3c0fllmrWS1L+r1fZCG3ORVHot54p0gxpouprxIoRQntust2UV+5lYr1 mrgPaF74X78lx8Dpkyd4Yzd2hkfYozpU5zkskE57dOnAAvtsn5orfCyQVbSbsY13MjJbPtLSIYB sldM1zSLF6Z9jhw+AqUilWTWMrUXqDa1S+bVFPkFoD/Do3TDQEZtBouXFwlEc4353VtRZm8DFz9 C+5hebQvagB7YKxR9ZIwPCWVjto+BryNkIlYh6d7yPTKzdEhnGpvecg29Oj/N3r2xCShxXyfU0e ykKiq3N6U6QbOah6ygp1KWra/dc8vuEH7XKpo7GNkVOW71u0Ziinwubn+XFv5bcYAFST4XzwUlg gjYHYtBkAfwbXA0oSJp0OxAAzqYkzL3E4+m+dcbWGSu5mQXr4/kwuZu62ef3Lufl+gpyPZpAbNr 5DvsWwJGvDnu7DwFabDl8OVRsp8vy3zsI/jGzFQ/+kCMTx X-Received: by 2002:a17:907:3f9e:b0:bdd:f2c9:80cc with SMTP id a640c23a62f3a-bf9373e2be2mr100836266b.21.1780998856952; Tue, 09 Jun 2026 02:54:16 -0700 (PDT) Received: from localhost ([80.208.66.169]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bf055307aacsm1013781366b.47.2026.06.09.02.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 02:54:16 -0700 (PDT) From: William Hansen-Baird To: pkshih@realtek.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, William Hansen-Baird Subject: [PATCH rtw-next v2] wifi: rtlwifi: rtl8723be: Remove unnecessary irq save/restore in hw_init() Date: Tue, 9 Jun 2026 11:53:59 +0200 Message-ID: <20260609095359.2964193-1-william.hansen.baird@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608135345.2526325-3-williamhb+k@fastmail.com> References: <20260608135345.2526325-3-williamhb+k@fastmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- Changes since v1: - Remove timestamps from dmesg output - Use [1] footnote style for link - Fix subject prefix to rtw-next 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 e1f811218894..bf7b5a32adaa 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c @@ -1333,11 +1333,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; @@ -1443,7 +1438,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.54.0