From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 DD00F35C93E; Mon, 5 May 2025 23:06:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486365; cv=none; b=nLucrqwyrWEcBrzx3+HcL62mr8Dtj2AuG9NxIhrXi5mJ94sV89kri2QhDCr5wvp9WAvPnOUeQoqot4PNuRg+wXEMfJ7IWuiMcL0W+EmZS5ys1MciRaAuDXMTIiX9qxKQtVPI/bmYCVpwEeD6rNGaFivWoxBGA/nX/qN1ZDmeHaU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486365; c=relaxed/simple; bh=O0/F7IB7rVhvkUwQ7ooED6FDRzDGO0E0J1ZKYYqH+CE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QAnmCGc6qor9wiert+BhMnSnbKwMhwrDK+yGqbLCGCPi64M/1NaD+E8ituYZ6hf1Hzk7AJb7tKBmOCF/XnZpZyo5oDHeSb9BEUUQn6tF8EUp8L10WZffAyo2e64hntFa7G+LFEVMu7d/UpGxa2t1CKh45/w1PUqKuybzpGLb+j8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hdRQ8ShO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hdRQ8ShO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2121CC4CEF1; Mon, 5 May 2025 23:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486363; bh=O0/F7IB7rVhvkUwQ7ooED6FDRzDGO0E0J1ZKYYqH+CE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hdRQ8ShOzAOpbiNcgyG2h1eoM9zC5eO5R8FzNFRIIkLuHy412s1qSzow/b72JWvrO R+UaOktBhw8AnfxRUDobsrI7me6Cvf4CboTIo+p+AmKL0IpDVt5veK8Yj+9O3E9PXe Ck0984awtOxTYQUh5DRRdOimp0VvJV+Mrc93XRgwIpeSVYUYAl5csUaEl2SSjeroWm P2C1s/jzCOu2jA4SFEAdeygyAhmZteb8uc62kKghuWXdt5X3b3aF8XqBOH0jgLW30L siqvIHETgJvsGIVLxU5ER1lscBTCRFnmHqzUa0RXBtFMV8bwuBaSJsHXeNhr+SHWEF znizUGJ/8cItQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ping-Ke Shih , Sasha Levin , linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 283/294] wifi: rtw89: add wiphy_lock() to work that isn't held wiphy_lock() yet Date: Mon, 5 May 2025 18:56:23 -0400 Message-Id: <20250505225634.2688578-283-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505225634.2688578-1-sashal@kernel.org> References: <20250505225634.2688578-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.89 Content-Transfer-Encoding: 8bit From: Ping-Ke Shih [ Upstream commit ebfc9199df05d37b67f4d1b7ee997193f3d2e7c8 ] To ensure where are protected by driver mutex can also be protected by wiphy_lock(), so afterward we can remove driver mutex safely. Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20250122060310.31976-2-pkshih@realtek.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw89/regd.c | 2 ++ drivers/net/wireless/realtek/rtw89/ser.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/wireless/realtek/rtw89/regd.c b/drivers/net/wireless/realtek/rtw89/regd.c index 9e2328db18656..91f0895d9f540 100644 --- a/drivers/net/wireless/realtek/rtw89/regd.c +++ b/drivers/net/wireless/realtek/rtw89/regd.c @@ -451,6 +451,7 @@ void rtw89_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); struct rtw89_dev *rtwdev = hw->priv; + wiphy_lock(wiphy); mutex_lock(&rtwdev->mutex); rtw89_leave_ps_mode(rtwdev); @@ -468,6 +469,7 @@ void rtw89_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request exit: mutex_unlock(&rtwdev->mutex); + wiphy_unlock(wiphy); } static void __rtw89_reg_6ghz_power_recalc(struct rtw89_dev *rtwdev) diff --git a/drivers/net/wireless/realtek/rtw89/ser.c b/drivers/net/wireless/realtek/rtw89/ser.c index 01b17b8f4ff9d..45165cf3e824e 100644 --- a/drivers/net/wireless/realtek/rtw89/ser.c +++ b/drivers/net/wireless/realtek/rtw89/ser.c @@ -156,9 +156,11 @@ static void ser_state_run(struct rtw89_ser *ser, u8 evt) rtw89_debug(rtwdev, RTW89_DBG_SER, "ser: %s receive %s\n", ser_st_name(ser), ser_ev_name(ser, evt)); + wiphy_lock(rtwdev->hw->wiphy); mutex_lock(&rtwdev->mutex); rtw89_leave_lps(rtwdev); mutex_unlock(&rtwdev->mutex); + wiphy_unlock(rtwdev->hw->wiphy); ser->st_tbl[ser->state].st_func(ser, evt); } @@ -676,9 +678,11 @@ static void ser_l2_reset_st_hdl(struct rtw89_ser *ser, u8 evt) switch (evt) { case SER_EV_STATE_IN: + wiphy_lock(rtwdev->hw->wiphy); mutex_lock(&rtwdev->mutex); ser_l2_reset_st_pre_hdl(ser); mutex_unlock(&rtwdev->mutex); + wiphy_unlock(rtwdev->hw->wiphy); ieee80211_restart_hw(rtwdev->hw); ser_set_alarm(ser, SER_RECFG_TIMEOUT, SER_EV_L2_RECFG_TIMEOUT); -- 2.39.5