From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0786C369D9 for ; Wed, 25 Sep 2024 13:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ybNwTs+ssYc5Tr4V968nCw3iJyQ5siWelTcxDkie7AI=; b=IguB5FLBET2FGQ8UzjT87JHLfw V9i+82/Sa4zXRaJPzav2pW9V3MHwM5JdkP0G9YMfdJH0ixNwfZ03BIudAQqn2nWYnQbB5Vfqx1Svr UBtk+iEPCbUU75HyV9Yf87FmQPnRxJj1lsdt7RtrAIKX2ni/q0L2M/l6uCmMialqoEAK62Xw/JEwU ogxhweROHwTLqhBypvzI+sbjzBCaNRNgTx0pLRQpzjza4hl/ISkcaPegoC5brkFJnmWJHzpat+c9F eXLsn/9T33xzljnCkkjii413/hYToASwcpFVJGEx/hzKO6ImQQLFcFGlVvqjc816GIuzA66kkGTNr oHVZQrhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1stRdI-00000005H0R-2LQy; Wed, 25 Sep 2024 13:00:40 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1stQNK-00000004uca-3qC2; Wed, 25 Sep 2024 11:40:08 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 492E45C5677; Wed, 25 Sep 2024 11:40:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9C91C4CEC3; Wed, 25 Sep 2024 11:40:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264405; bh=VEIQZWdTQ9dg2khM6hUR5xSlsXQRX0LggRkXcpNBBSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b+GjdMRdfoLjpW0DyKpkag3fWOh8wCZm61Qqqr7uAzM9Lj/ON6rmoHPxexeIChgM3 3kwGZMLrmA4+MdUu8RYZetLcvwrtpTyEEjk6h1uH4GJk4yGdnjwxFiYpd4svRSkAf5 sXGN/pcbfbKcqcJUEDISF4MEcTp7mHB7TK0vFz/+QM8EH70F1se4V4O6kEB3hx42Bl 9ILjF7kBVPtD2BlA8OSzqBngaqSmDKee27Ju6vWRVur9FGIfWrZNFXL+a4Mi3tYv6T idTJWjAUzRZN3yu4zM0KecID6JCq1TBQito0wlFvdr0CJ2q8z+0zOe8XE5MNiqikll zvInGSyS7t2pw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Fietkau , Sasha Levin , lorenzo@kernel.org, ryder.lee@mediatek.com, kvalo@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, shayne.chen@mediatek.com, henry.yen@mediatek.com, allen.ye@mediatek.com, yunchuan@nfschina.com, Bo.Jiao@mediatek.com, linux-wireless@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 6.11 083/244] wifi: mt76: mt7915: hold dev->mt76.mutex while disabling tx worker Date: Wed, 25 Sep 2024 07:25:04 -0400 Message-ID: <20240925113641.1297102-83-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925113641.1297102-1-sashal@kernel.org> References: <20240925113641.1297102-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240925_044007_105189_3492A04F X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Felix Fietkau [ Upstream commit 8f7152f10cb434f954aeff85ca1be9cd4d01912b ] Prevent racing against other functions disabling the same worker Link: https://patch.msgid.link/20240827093011.18621-17-nbd@nbd.name Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index 8008ce3fa6c7e..387d47e9fcd38 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -1537,12 +1537,14 @@ void mt7915_mac_reset_work(struct work_struct *work) set_bit(MT76_RESET, &phy2->mt76->state); cancel_delayed_work_sync(&phy2->mt76->mac_work); } + + mutex_lock(&dev->mt76.mutex); + mt76_worker_disable(&dev->mt76.tx_worker); mt76_for_each_q_rx(&dev->mt76, i) napi_disable(&dev->mt76.napi[i]); napi_disable(&dev->mt76.tx_napi); - mutex_lock(&dev->mt76.mutex); if (mtk_wed_device_active(&dev->mt76.mmio.wed)) mtk_wed_device_stop(&dev->mt76.mmio.wed); -- 2.43.0