From nobody Fri Dec 19 17:42:08 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FDF7C433FE for ; Sat, 22 Oct 2022 07:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231905AbiJVHwx (ORCPT ); Sat, 22 Oct 2022 03:52:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231948AbiJVHtl (ORCPT ); Sat, 22 Oct 2022 03:49:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF579A3B88; Sat, 22 Oct 2022 00:46:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 32EDDB82E20; Sat, 22 Oct 2022 07:45:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F1AAC433D6; Sat, 22 Oct 2022 07:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424705; bh=x6YESoJfx3sab24CZpUUqkR9w/aWB/eTAk+eNCGXbKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GXRXHfxkN5OSTvVV7h4d5pTdOGhRhO5b7HuUYHmoyAEeqwaSWxyqHgqo9HZJPjm10 oGaEZqlk+P6Ptwx/MEBOlte8Sh8r0LYwXAUVQqg/rp6fyi4MfwXB+VNTyyxi1s0zm9 b7QMMOPVZAn/ASkpAbhYFkt/3J6i40DWWu/qLu5o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, AngeloGioacchino Del Regno , Sean Wang , Lorenzo Bianconi , Felix Fietkau , Sasha Levin Subject: [PATCH 5.19 246/717] wifi: mt76: mt7921: add mt7921_mutex_acquire at mt7921_[start, stop]_ap Date: Sat, 22 Oct 2022 09:22:05 +0200 Message-Id: <20221022072458.428220926@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Sean Wang [ Upstream commit 52b44015f031f629f1ce1d73415a2017593c7ade ] Add mt7921_mutex_acquire at mt7921_[start, stop]_ap to fix the race with the context holding dev->muxtex and the driver might access the device in low power state. Fixes: 9d958b60ebc2 ("mt76: mt7921: fix command timeout in AP stop period") Tested-by: AngeloGioacchino Del Regno Signed-off-by: Sean Wang Acked-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- .../net/wireless/mediatek/mt76/mt7921/main.c | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net= /wireless/mediatek/mt76/mt7921/main.c index d3f310877248..22c9793e4a40 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -1499,17 +1499,23 @@ mt7921_start_ap(struct ieee80211_hw *hw, struct iee= e80211_vif *vif) struct mt7921_dev *dev =3D mt7921_hw_dev(hw); int err; =20 + mt7921_mutex_acquire(dev); + err =3D mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, true); if (err) - return err; + goto out; =20 err =3D mt7921_mcu_set_bss_pm(dev, vif, true); if (err) - return err; + goto out; + + err =3D mt7921_mcu_sta_update(dev, NULL, vif, true, + MT76_STA_INFO_STATE_NONE); +out: + mt7921_mutex_release(dev); =20 - return mt7921_mcu_sta_update(dev, NULL, vif, true, - MT76_STA_INFO_STATE_NONE); + return err; } =20 static void @@ -1520,11 +1526,16 @@ mt7921_stop_ap(struct ieee80211_hw *hw, struct ieee= 80211_vif *vif) struct mt7921_dev *dev =3D mt7921_hw_dev(hw); int err; =20 + mt7921_mutex_acquire(dev); + err =3D mt7921_mcu_set_bss_pm(dev, vif, false); if (err) - return; + goto out; =20 mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, false); + +out: + mt7921_mutex_release(dev); } =20 const struct ieee80211_ops mt7921_ops =3D { --=20 2.35.1