wifi: mt76: mt7925: update the channel usage when the regd domain changed
authorMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Tue, 4 Mar 2025 11:36:46 +0000 (19:36 +0800)
committerFelix Fietkau <nbd@nbd.name>
Wed, 19 Mar 2025 13:47:04 +0000 (14:47 +0100)
The 5.9/6GHz channel license of a certain platform device has been
regulated in various countries. That may be difference with standard Liunx
regulatory domain settings. In this case, when .reg_notifier() called for
regulatory change, mt7925 chipset should update the channel usage based on
CLC data.

Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Link: https://patch.msgid.link/20250304113649.867387-3-mingyen.hsieh@mediatek.com
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7925/init.c
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h

index 46b12a2e81ee2b3667945a861fce4818373ed21d..8732b05355dbc3f4261eecbfe537dbe9fa511a36 100644 (file)
@@ -96,15 +96,55 @@ out:
        mt7925_set_stream_he_eht_caps(phy);
 }
 
+static void
+mt7925_regd_channel_update(struct wiphy *wiphy, struct mt792x_dev *dev)
+{
+#define IS_UNII_INVALID(idx, sfreq, efreq, cfreq) \
+       (!(dev->phy.clc_chan_conf & BIT(idx)) && (cfreq) >= (sfreq) && (cfreq) <= (efreq))
+       struct ieee80211_supported_band *sband;
+       struct mt76_dev *mdev = &dev->mt76;
+       struct ieee80211_channel *ch;
+       int i;
+
+       sband = wiphy->bands[NL80211_BAND_5GHZ];
+       if (!sband)
+               return;
+
+       for (i = 0; i < sband->n_channels; i++) {
+               ch = &sband->channels[i];
+
+               /* UNII-4 */
+               if (IS_UNII_INVALID(0, 5845, 5925, ch->center_freq))
+                       ch->flags |= IEEE80211_CHAN_DISABLED;
+       }
+
+       sband = wiphy->bands[NL80211_BAND_6GHZ];
+       if (!sband)
+               return;
+
+       for (i = 0; i < sband->n_channels; i++) {
+               ch = &sband->channels[i];
+
+               /* UNII-5/6/7/8 */
+               if (IS_UNII_INVALID(1, 5925, 6425, ch->center_freq) ||
+                   IS_UNII_INVALID(2, 6425, 6525, ch->center_freq) ||
+                   IS_UNII_INVALID(3, 6525, 6875, ch->center_freq) ||
+                   IS_UNII_INVALID(4, 6875, 7125, ch->center_freq))
+                       ch->flags |= IEEE80211_CHAN_DISABLED;
+       }
+}
+
 void mt7925_regd_update(struct mt792x_dev *dev)
 {
        struct mt76_dev *mdev = &dev->mt76;
        struct ieee80211_hw *hw = mdev->hw;
+       struct wiphy *wiphy = hw->wiphy;
 
        if (!dev->regd_change)
                return;
 
        mt7925_mcu_set_clc(dev, mdev->alpha2, dev->country_ie_env);
+       mt7925_regd_channel_update(wiphy, dev);
        mt7925_mcu_set_channel_domain(hw->priv);
        mt7925_set_tx_sar_pwr(hw, NULL);
        dev->regd_change = false;
index 575b51931d7d4f06b8fd3a54239e352336273ee7..30f88a9dcded3845ced3dad5a8865c7910b2d8e2 100644 (file)
@@ -686,6 +686,7 @@ static int mt7925_load_clc(struct mt792x_dev *dev, const char *fw_name)
        u8 *clc_base = NULL, hw_encap = 0;
        int ret, i, len, offset = 0;
 
+       dev->phy.clc_chan_conf = 0xff;
        if (mt7925_disable_clc ||
            mt76_is_usb(&dev->mt76))
                return 0;
@@ -3194,6 +3195,7 @@ __mt7925_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
        if (!clc)
                return 0;
 
+       req.ver = clc->ver;
        pos = clc->data + sizeof(*seg) * clc->t0.nr_seg;
        last_pos = clc->data + le32_to_cpu(*(__le32 *)(clc->data + 4));
        while (pos < last_pos) {
@@ -3211,6 +3213,7 @@ __mt7925_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
                memcpy(req.type, rule->type, 2);
 
                req.size = cpu_to_le16(seg->len);
+               dev->phy.clc_chan_conf = clc->ver == 1 ? 0xff : rule->flag;
                skb = __mt76_mcu_msg_alloc(&dev->mt76, &req,
                                           le16_to_cpu(req.size) + sizeof(req),
                                           sizeof(req), GFP_KERNEL);
@@ -3226,8 +3229,10 @@ __mt7925_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
                valid_cnt++;
        }
 
-       if (!valid_cnt)
+       if (!valid_cnt) {
+               dev->phy.clc_chan_conf = 0xff;
                return -ENOENT;
+       }
 
        return 0;
 }
index 5cd3073dfc50405f12bb693882811bcff9e922ea..4e50f2597ccd4fad390141de5da0c865af8fa2ba 100644 (file)
@@ -147,7 +147,8 @@ struct mt7925_clc_rule {
        u8 alpha2[2];
        u8 type[2];
        u8 seg_idx;
-       u8 rsv[3];
+       u8 flag; /* UNII4~8 ctrl flag */
+       u8 rsv[2];
 } __packed;
 
 struct mt7925_clc_segment {