mirror of
https://github.com/outbackdingo/mt76.git
synced 2026-10-24 13:26:48 +00:00
Split mt7921_mcu_regd_update() into two functions to prevent recursive
mutex acquisition. Introduce __mt7921_mcu_regd_update() as the internal
implementation that assumes the mutex is already held by the caller,
while mt7921_mcu_regd_update() remains as the external interface that
handles mutex acquisition and release.
This fixes a deadlock issue when mt7921_regd_set_6ghz_power_type() is
called with the device mutex already held. Without this change, calling
mt7921_mcu_regd_update() would attempt to acquire the same mutex again,
causing a recursive lock deadlock.
The __mt7921_mcu_regd_update() function can be safely called when the
caller has already acquired the device mutex, avoiding the deadlock
while maintaining proper synchronization for regulatory domain updates.
Fixes: dc2608cf5224 ("wifi: mt76: mt7921: refactor regulatory notifier flow")
Signed-off-by: Charlie-cy Wu <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Felix Fietkau <[email protected]>
216 lines
5.2 KiB
C
216 lines
5.2 KiB
C
// SPDX-License-Identifier: BSD-3-Clause-Clear
|
|
/* Copyright (C) 2025 MediaTek Inc. */
|
|
|
|
#include <linux/of.h>
|
|
#include "mt7921.h"
|
|
#include "regd.h"
|
|
#include "mcu.h"
|
|
|
|
static bool mt7921_disable_clc;
|
|
module_param_named(disable_clc, mt7921_disable_clc, bool, 0644);
|
|
MODULE_PARM_DESC(disable_clc, "disable CLC support");
|
|
|
|
bool mt7921_regd_clc_supported(struct mt792x_dev *dev)
|
|
{
|
|
if (mt7921_disable_clc ||
|
|
mt76_is_usb(&dev->mt76))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
static void
|
|
mt7921_regd_channel_update(struct wiphy *wiphy, struct mt792x_dev *dev)
|
|
{
|
|
#define IS_UNII_INVALID(idx, sfreq, efreq) \
|
|
(!(dev->phy.clc_chan_conf & BIT(idx)) && (cfreq) >= (sfreq) && (cfreq) <= (efreq))
|
|
struct ieee80211_supported_band *sband;
|
|
struct mt76_dev *mdev = &dev->mt76;
|
|
struct device_node *np, *band_np;
|
|
struct ieee80211_channel *ch;
|
|
int i, cfreq;
|
|
|
|
np = mt76_find_power_limits_node(mdev);
|
|
|
|
sband = wiphy->bands[NL80211_BAND_5GHZ];
|
|
band_np = np ? of_get_child_by_name(np, "txpower-5g") : NULL;
|
|
for (i = 0; i < sband->n_channels; i++) {
|
|
ch = &sband->channels[i];
|
|
cfreq = ch->center_freq;
|
|
|
|
if (np && (!band_np || !mt76_find_channel_node(band_np, ch))) {
|
|
ch->flags |= IEEE80211_CHAN_DISABLED;
|
|
continue;
|
|
}
|
|
|
|
/* UNII-4 */
|
|
if (IS_UNII_INVALID(0, 5845, 5925))
|
|
ch->flags |= IEEE80211_CHAN_DISABLED;
|
|
}
|
|
|
|
sband = wiphy->bands[NL80211_BAND_6GHZ];
|
|
if (!sband)
|
|
return;
|
|
|
|
band_np = np ? of_get_child_by_name(np, "txpower-6g") : NULL;
|
|
for (i = 0; i < sband->n_channels; i++) {
|
|
ch = &sband->channels[i];
|
|
cfreq = ch->center_freq;
|
|
|
|
if (np && (!band_np || !mt76_find_channel_node(band_np, ch))) {
|
|
ch->flags |= IEEE80211_CHAN_DISABLED;
|
|
continue;
|
|
}
|
|
|
|
/* UNII-5/6/7/8 */
|
|
if (IS_UNII_INVALID(1, 5925, 6425) ||
|
|
IS_UNII_INVALID(2, 6425, 6525) ||
|
|
IS_UNII_INVALID(3, 6525, 6875) ||
|
|
IS_UNII_INVALID(4, 6875, 7125))
|
|
ch->flags |= IEEE80211_CHAN_DISABLED;
|
|
}
|
|
}
|
|
|
|
int __mt7921_mcu_regd_update(struct mt792x_dev *dev, u8 *alpha2,
|
|
enum environment_cap country_ie_env)
|
|
{
|
|
struct mt76_dev *mdev = &dev->mt76;
|
|
struct ieee80211_hw *hw = mdev->hw;
|
|
struct wiphy *wiphy = hw->wiphy;
|
|
int ret;
|
|
|
|
lockdep_assert_held(&dev->mt76.mutex);
|
|
|
|
if (!dev->regd_change)
|
|
return 0;
|
|
|
|
ret = mt7921_mcu_set_clc(dev, alpha2, country_ie_env);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
mt7921_regd_channel_update(wiphy, dev);
|
|
|
|
ret = mt76_connac_mcu_set_channel_domain(hw->priv);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret = mt7921_set_tx_sar_pwr(hw, NULL);
|
|
|
|
return ret;
|
|
}
|
|
|
|
int mt7921_mcu_regd_update(struct mt792x_dev *dev, u8 *alpha2,
|
|
enum environment_cap country_ie_env)
|
|
{
|
|
int ret;
|
|
|
|
dev->regd_in_progress = true;
|
|
|
|
mt792x_mutex_acquire(dev);
|
|
ret = __mt7921_mcu_regd_update(dev, alpha2, country_ie_env);
|
|
mt792x_mutex_release(dev);
|
|
|
|
dev->regd_change = false;
|
|
dev->regd_in_progress = false;
|
|
wake_up(&dev->wait);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(mt7921_mcu_regd_update);
|
|
|
|
void mt7921_regd_notifier(struct wiphy *wiphy,
|
|
struct regulatory_request *req)
|
|
{
|
|
struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
|
|
struct mt792x_dev *dev = mt792x_hw_dev(hw);
|
|
struct mt76_connac_pm *pm = &dev->pm;
|
|
struct mt76_dev *mdev = &dev->mt76;
|
|
|
|
if (req->initiator == NL80211_REGDOM_SET_BY_USER &&
|
|
!dev->regd_user)
|
|
dev->regd_user = true;
|
|
|
|
/* do not need to update the same country twice */
|
|
if (!memcmp(req->alpha2, mdev->alpha2, 2) &&
|
|
dev->country_ie_env == req->country_ie_env)
|
|
return;
|
|
|
|
memcpy(mdev->alpha2, req->alpha2, 2);
|
|
mdev->region = req->dfs_region;
|
|
dev->country_ie_env = req->country_ie_env;
|
|
|
|
if (req->initiator == NL80211_REGDOM_SET_BY_USER) {
|
|
if (dev->mt76.alpha2[0] == '0' && dev->mt76.alpha2[1] == '0')
|
|
wiphy->regulatory_flags &= ~REGULATORY_COUNTRY_IE_IGNORE;
|
|
else
|
|
wiphy->regulatory_flags |= REGULATORY_COUNTRY_IE_IGNORE;
|
|
}
|
|
|
|
dev->regd_change = true;
|
|
|
|
if (pm->suspended)
|
|
return;
|
|
|
|
mt7921_mcu_regd_update(dev, req->alpha2,
|
|
req->country_ie_env);
|
|
}
|
|
|
|
static bool
|
|
mt7921_regd_is_valid_alpha2(const char *alpha2)
|
|
{
|
|
if (!alpha2)
|
|
return false;
|
|
|
|
if (alpha2[0] == '0' && alpha2[1] == '0')
|
|
return true;
|
|
|
|
if (isalpha(alpha2[0]) && isalpha(alpha2[1]))
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
int mt7921_regd_change(struct mt792x_phy *phy, char *alpha2)
|
|
{
|
|
struct wiphy *wiphy = phy->mt76->hw->wiphy;
|
|
struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
|
|
struct mt792x_dev *dev = mt792x_hw_dev(hw);
|
|
struct mt76_dev *mdev = &dev->mt76;
|
|
|
|
if (dev->hw_full_reset)
|
|
return 0;
|
|
|
|
if (!mt7921_regd_is_valid_alpha2(alpha2) ||
|
|
!mt7921_regd_clc_supported(dev) ||
|
|
dev->regd_user)
|
|
return -EINVAL;
|
|
|
|
if (mdev->alpha2[0] != '0' && mdev->alpha2[1] != '0')
|
|
return 0;
|
|
|
|
/* do not need to update the same country twice */
|
|
if (!memcmp(alpha2, mdev->alpha2, 2))
|
|
return 0;
|
|
|
|
if (phy->chip_cap & MT792x_CHIP_CAP_11D_EN)
|
|
return regulatory_hint(wiphy, alpha2);
|
|
else
|
|
return mt7921_mcu_set_clc(dev, alpha2, ENVIRON_INDOOR);
|
|
}
|
|
|
|
int mt7921_regd_init(struct mt792x_phy *phy)
|
|
{
|
|
struct wiphy *wiphy = phy->mt76->hw->wiphy;
|
|
struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
|
|
struct mt792x_dev *dev = mt792x_hw_dev(hw);
|
|
struct mt76_dev *mdev = &dev->mt76;
|
|
|
|
if (phy->chip_cap & MT792x_CHIP_CAP_11D_EN)
|
|
wiphy->regulatory_flags |= REGULATORY_COUNTRY_IE_IGNORE |
|
|
REGULATORY_DISABLE_BEACON_HINTS;
|
|
else
|
|
memzero_explicit(&mdev->alpha2, sizeof(mdev->alpha2));
|
|
|
|
return 0;
|
|
}
|