From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 B43AA37A84A; Fri, 4 Sep 2026 06:03:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788501838; cv=none; b=jXa3CGk3qnbFujmyuYd6LL9CQVkH7we9E8oOME1RwogemcKHoZH0Z1nCnjirc2z7u0SYbYVfecXOC26H4Fe4vNxub7xc6HKDaypjO1CjloSqUW5A8KRcyDRmr91/WqrQohZ2oVqarj3+DpT17G1d1qh3S4WBCLdQbnQWDujnYcs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788501838; c=relaxed/simple; bh=SLnCHrwVstpeq0s9HKqSSvarLGD3xWMTwL4sN4uI7oM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RRi/Oz6TZECTWagRhHEc8Nk1HqYVKns0aysTHUM2rK0UBa9oIAhej8lwF/ybII/pC+4ibzgFjUXneJ8FD5ydSzTIRdyTx+Jqf3Ksof9Rg+MeuxUwAQ6xuvmFKaRc/R3w06CCOaaO2EdsaHICO2tk6a97164tagtWs68tu3Fd6ak= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2tPI9icD; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2tPI9icD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 194781F00A3D; Fri, 4 Sep 2026 06:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788501837; bh=tFXPQnILDMrHTLX9/YVT6cVgM438MlqwrTTrpCv5iqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=2tPI9icDJKPpp/be5iqFADfo71028dNdnchRbskWLpYmZkRLpRUgvYmrVgn910PHI ZgxP+8cXAxhXtZtMfB/76qlV0PRN6LpDZdbPXozRpVskhAMxD7QV1gJpI5VWGSYXrN yrUNtx0WIC1RpfbIFtuQAgD2yu7gfytTrsUBdGUw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Runyu Xiao , Felix Fietkau Subject: [PATCH 6.18 533/552] wifi: mt76: mt7615: avoid waiting for mac work under the mt76 mutex Date: Fri, 4 Sep 2026 07:01:30 +0200 Message-ID: <20260904045802.699894755@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Runyu Xiao commit bda8324270b1ac91bfba1df8928e0570e29759e8 upstream. mt7615_suspend() acquired the mt76 mutex and then called cancel_delayed_work_sync() on mac_work. mt7615_mac_work() acquires the same mutex via mt7615_mutex_acquire() at the top of the worker, so if mac_work is already running and blocked on the mutex, the suspend path deadlocks waiting for the work it holds the mutex against. Flush scan_work and mac_work before taking the mutex, matching the suspend paths in mt7921 and mt7925. scan_work only takes the mt76 spinlock, but moving it keeps the sequence consistent. This also keeps mac_work from running over an already suspended HIF, which the previous split (async cancel under the lock, sync cancel after release) would have allowed. Fixes: c6bf20109a3f ("mt76: mt7615: add WoW support") Cc: stable@vger.kernel.org Signed-off-by: Runyu Xiao Link: https://patch.msgid.link/20260612041331.2596331-1-runyu.xiao@seu.edu.cn Signed-off-by: Felix Fietkau Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/mediatek/mt76/mt7615/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c @@ -1239,11 +1239,12 @@ static int mt7615_suspend(struct ieee802 cancel_delayed_work_sync(&dev->pm.ps_work); mt76_connac_free_pending_tx_skbs(&dev->pm, NULL); + cancel_delayed_work_sync(&phy->scan_work); + cancel_delayed_work_sync(&phy->mt76->mac_work); + mt7615_mutex_acquire(dev); clear_bit(MT76_STATE_RUNNING, &phy->mt76->state); - cancel_delayed_work_sync(&phy->scan_work); - cancel_delayed_work_sync(&phy->mt76->mac_work); set_bit(MT76_STATE_SUSPEND, &phy->mt76->state); ieee80211_iterate_active_interfaces(hw,