gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: mt7615: set mcu country code in mt7615_mcu_set_channel_domain()

Browse Source 
Update mcu country code running mt7615_mcu_set_channel_domain routine in
mt7615_regd_notifier().
Filter out disabled channels in mt7615_mcu_set_channel_domain().

Signed-off-by: Lorenzo Bianconi <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Lorenzo Bianconi
2021-01-19 11:00:27 +01:00
committed by Felix Fietkau
parent 65abbcd9f6
commit 3199ef5fa3
2 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt7615/init.c
+5 -4
View File
@@ -307,11 +307,12 @@ mt7615_regd_notifier(struct wiphy *wiphy,
mt7615_init_txpower(dev, &mphy->sband_2g.sband);
mt7615_init_txpower(dev, &mphy->sband_5g.sband);
if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR))
return;
mt7615_mutex_acquire(dev);
mt7615_dfs_init_radar_detector(phy);
if (chandef->chan->flags & IEEE80211_CHAN_RADAR)
mt7615_dfs_init_radar_detector(phy);
mt7615_mcu_set_channel_domain(phy);
mt7615_mutex_release(dev);
}
mt7615/mcu.c
+33 -15
View File
@@ -3041,7 +3041,7 @@ int mt7615_mcu_set_channel_domain(struct mt7615_phy *phy)
struct mt76_phy *mphy = phy->mt76;
struct mt7615_dev *dev = phy->dev;
struct mt7615_mcu_channel_domain {
__le32 country_code; /* regulatory_request.alpha2 */
u8 alpha2[4]; /* regulatory_request.alpha2 */
u8 bw_2g; /* BW_20_40M 0
* BW_20M 1
* BW_20_40_80M 2
@@ -3056,42 +3056,60 @@ int mt7615_mcu_set_channel_domain(struct mt7615_phy *phy)
} __packed hdr = {
.bw_2g = 0,
.bw_5g = 3,
.n_2ch = mphy->sband_2g.sband.n_channels,
.n_5ch = mphy->sband_5g.sband.n_channels,
};
struct mt7615_mcu_chan {
__le16 hw_value;
__le16 pad;
__le32 flags;
} __packed;
int i, n_channels = hdr.n_2ch + hdr.n_5ch;
int len = sizeof(hdr) + n_channels * sizeof(struct mt7615_mcu_chan);
} __packed channel;
int len, i, n_max_channels, n_2ch = 0, n_5ch = 0;
struct ieee80211_channel *chan;
struct sk_buff *skb;
if (!mt7615_firmware_offload(dev))
return 0;
n_max_channels = mphy->sband_2g.sband.n_channels +
mphy->sband_5g.sband.n_channels;
len = sizeof(hdr) + n_max_channels * sizeof(channel);
skb = mt76_mcu_msg_alloc(&dev->mt76, NULL, len);
if (!skb)
return -ENOMEM;
skb_put_data(skb, &hdr, sizeof(hdr));
skb_reserve(skb, sizeof(hdr));
for (i = 0; i < n_channels; i++) {
struct ieee80211_channel *chan;
struct mt7615_mcu_chan channel;
if (i < hdr.n_2ch)
chan = &mphy->sband_2g.sband.channels[i];
else
chan = &mphy->sband_5g.sband.channels[i - hdr.n_2ch];
for (i = 0; i < mphy->sband_2g.sband.n_channels; i++) {
chan = &mphy->sband_2g.sband.channels[i];
if (chan->flags & IEEE80211_CHAN_DISABLED)
continue;
channel.hw_value = cpu_to_le16(chan->hw_value);
channel.flags = cpu_to_le32(chan->flags);
channel.pad = 0;
skb_put_data(skb, &channel, sizeof(channel));
n_2ch++;
}
for (i = 0; i < mphy->sband_5g.sband.n_channels; i++) {
chan = &mphy->sband_5g.sband.channels[i];
if (chan->flags & IEEE80211_CHAN_DISABLED)
continue;
channel.hw_value = cpu_to_le16(chan->hw_value);
channel.flags = cpu_to_le32(chan->flags);
channel.pad = 0;
skb_put_data(skb, &channel, sizeof(channel));
n_5ch++;
}
BUILD_BUG_ON(sizeof(dev->mt76.alpha2) > sizeof(hdr.alpha2));
memcpy(hdr.alpha2, dev->mt76.alpha2, sizeof(dev->mt76.alpha2));
hdr.n_2ch = n_2ch;
hdr.n_5ch = n_5ch;
memcpy(__skb_push(skb, sizeof(hdr)), &hdr, sizeof(hdr));
return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_CMD_SET_CHAN_DOMAIN,
false);