[PATCH 1/5] wifi: mt76: mt7921: refactor regulatory domain handling to regd.[ch]
Sean Wang
sean.wang at kernel.org
Mon Feb 23 12:38:53 PST 2026
Hi JB,
Thanks for the patch just a small nit:
On Mon, Feb 23, 2026 at 1:40 AM JB Tsai <jb.tsai at mediatek.com> wrote:
>
> Move regd logic to regd.c and regd.h files
>
> Signed-off-by: JB Tsai <jb.tsai at mediatek.com>
> ---
> .../wireless/mediatek/mt76/mt7921/Makefile | 2 +-
> .../net/wireless/mediatek/mt76/mt7921/init.c | 98 +----------------
> .../net/wireless/mediatek/mt76/mt7921/main.c | 1 +
> .../wireless/mediatek/mt76/mt7921/mt7921.h | 1 -
> .../net/wireless/mediatek/mt76/mt7921/pci.c | 1 +
> .../net/wireless/mediatek/mt76/mt7921/regd.c | 104 ++++++++++++++++++
> .../net/wireless/mediatek/mt76/mt7921/regd.h | 13 +++
> 7 files changed, 121 insertions(+), 99 deletions(-)
> create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/regd.c
> create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/regd.h
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile
> index 2ad3c1cc3779..3ef7c9c45386 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile
> @@ -5,7 +5,7 @@ obj-$(CONFIG_MT7921E) += mt7921e.o
> obj-$(CONFIG_MT7921S) += mt7921s.o
> obj-$(CONFIG_MT7921U) += mt7921u.o
>
> -mt7921-common-y := mac.o mcu.o main.o init.o debugfs.o
> +mt7921-common-y := mac.o mcu.o regd.o main.o init.o debugfs.o
> mt7921-common-$(CONFIG_NL80211_TESTMODE) += testmode.o
> mt7921e-y := pci.o pci_mac.o pci_mcu.o
> mt7921s-y := sdio.o sdio_mac.o sdio_mcu.o
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
> index 29732315af1c..1fe2f2bc3881 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
> @@ -9,6 +9,7 @@
> #include "mt7921.h"
> #include "../mt76_connac2_mac.h"
> #include "mcu.h"
> +#include "regd.h"
>
> static ssize_t mt7921_thermal_temp_show(struct device *dev,
> struct device_attribute *attr,
> @@ -60,103 +61,6 @@ static int mt7921_thermal_init(struct mt792x_phy *phy)
> return PTR_ERR_OR_ZERO(hwmon);
> }
>
> -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;
> - }
> -}
> -
> -void mt7921_regd_update(struct mt792x_dev *dev)
> -{
> - struct mt76_dev *mdev = &dev->mt76;
> - struct ieee80211_hw *hw = mdev->hw;
> - struct wiphy *wiphy = hw->wiphy;
> -
> - mt7921_mcu_set_clc(dev, mdev->alpha2, dev->country_ie_env);
> - mt7921_regd_channel_update(wiphy, dev);
> - mt76_connac_mcu_set_channel_domain(hw->priv);
> - mt7921_set_tx_sar_pwr(hw, NULL);
> -}
> -EXPORT_SYMBOL_GPL(mt7921_regd_update);
> -
> -static void
> -mt7921_regd_notifier(struct wiphy *wiphy,
> - struct regulatory_request *request)
> -{
> - struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
> - struct mt792x_dev *dev = mt792x_hw_dev(hw);
> - struct mt76_connac_pm *pm = &dev->pm;
> -
> - memcpy(dev->mt76.alpha2, request->alpha2, sizeof(dev->mt76.alpha2));
> - dev->mt76.region = request->dfs_region;
> - dev->country_ie_env = request->country_ie_env;
> -
> - if (request->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;
> - }
> -
> - if (pm->suspended)
> - return;
> -
> - dev->regd_in_progress = true;
> -
> - mt792x_mutex_acquire(dev);
> - mt7921_regd_update(dev);
> - mt792x_mutex_release(dev);
> -
> - dev->regd_in_progress = false;
> - wake_up(&dev->wait);
> -}
> -
> int mt7921_mac_init(struct mt792x_dev *dev)
> {
> int i;
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> index 42b9514e04e7..00ca3d3f3ef0 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> @@ -7,6 +7,7 @@
> #include <linux/module.h>
> #include <net/ipv6.h>
> #include "mt7921.h"
> +#include "regd.h"
> #include "mcu.h"
>
> static int
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> index ad92af98e314..5239ea970d24 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> @@ -246,7 +246,6 @@ mt7921_l1_rmw(struct mt792x_dev *dev, u32 addr, u32 mask, u32 val)
> #define mt7921_l1_set(dev, addr, val) mt7921_l1_rmw(dev, addr, 0, val)
> #define mt7921_l1_clear(dev, addr, val) mt7921_l1_rmw(dev, addr, val, 0)
>
> -void mt7921_regd_update(struct mt792x_dev *dev);
> int mt7921_mac_init(struct mt792x_dev *dev);
> bool mt7921_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask);
> int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
> index 65c7fe671137..a173a61f2b49 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
> @@ -12,6 +12,7 @@
> #include "../mt76_connac2_mac.h"
> #include "../dma.h"
> #include "mcu.h"
> +#include "regd.h"
>
> static const struct pci_device_id mt7921_pci_device_table[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961),
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regd.c b/drivers/net/wireless/mediatek/mt76/mt7921/regd.c
> new file mode 100644
> index 000000000000..6e6c81189222
> --- /dev/null
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/regd.c
> @@ -0,0 +1,104 @@
> +/* SPDX-License-Identifier: ISC */
Please align the SPDX identifier in the new files with mt76
(BSD-3-Clause-Clear).
> +/* Copyright (C) 2025 MediaTek Inc. */
> +
> +#include <linux/of_net.h>
> +#include <linux/of.h>
linux/of.h should be sufficient here; we can drop linux/of_net.h.
> +#include "mt7921.h"
> +#include "regd.h"
> +#include "mcu.h"
> +
> +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;
> + }
> +}
> +
> +void mt7921_regd_update(struct mt792x_dev *dev)
> +{
> + struct mt76_dev *mdev = &dev->mt76;
> + struct ieee80211_hw *hw = mdev->hw;
> + struct wiphy *wiphy = hw->wiphy;
> +
> + mt7921_mcu_set_clc(dev, mdev->alpha2, dev->country_ie_env);
> + mt7921_regd_channel_update(wiphy, dev);
> + mt76_connac_mcu_set_channel_domain(hw->priv);
> + mt7921_set_tx_sar_pwr(hw, NULL);
> +}
> +EXPORT_SYMBOL_GPL(mt7921_regd_update);
> +
> +void mt7921_regd_notifier(struct wiphy *wiphy,
> + struct regulatory_request *request)
> +{
> + struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
> + struct mt792x_dev *dev = mt792x_hw_dev(hw);
> + struct mt76_connac_pm *pm = &dev->pm;
> +
> + memcpy(dev->mt76.alpha2, request->alpha2, sizeof(dev->mt76.alpha2));
> + dev->mt76.region = request->dfs_region;
> + dev->country_ie_env = request->country_ie_env;
> +
> + if (request->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;
> + }
> +
> + if (pm->suspended)
> + return;
> +
> + dev->regd_in_progress = true;
> +
> + mt792x_mutex_acquire(dev);
> + mt7921_regd_update(dev);
> + mt792x_mutex_release(dev);
> +
> + dev->regd_in_progress = false;
> + wake_up(&dev->wait);
> +}
Looks good to me this is a straight move of the code with no extra
logic changes.
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regd.h b/drivers/net/wireless/mediatek/mt76/mt7921/regd.h
> new file mode 100644
> index 000000000000..0ba6161e1919
> --- /dev/null
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/regd.h
> @@ -0,0 +1,13 @@
> +/* SPDX-License-Identifier: ISC */
Please align the SPDX identifier in the new files with mt76
(BSD-3-Clause-Clear).
> +/* Copyright (C) 2025 MediaTek Inc. */
> +
> +#ifndef __MT7921_REGD_H
> +#define __MT7921_REGD_H
> +
> +#include "mt7921.h"
> +
I guess regd.h shouldn’t rely on indirect includes for struct
regulatory_request; please forward-declare it or include the proper
header.
> +void mt7921_regd_update(struct mt792x_dev *dev);
> +void mt7921_regd_notifier(struct wiphy *wiphy,
> + struct regulatory_request *request);
> +
> +#endif
> --
> 2.45.2
>
>
More information about the Linux-mediatek
mailing list