| Message ID | ff63866d7d62d088edd4a9f7587320f8f59a361f.1690999957.git.ryder.lee@mediatek.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | wifi: mt76: mt7915: enable BSS_CHANGED_MU_GROUPS support | expand |
Ryder Lee <ryder.lee@mediatek.com> writes: > The Group ID Management frame is an Action frame of category VHT. > It is transmitted by the AP to assign or change the user position > of a STA for one or more group IDs. > > Also, sniffer can use a given group id to monitor STA that belongs > to that group. > > Notify underlying driver of changes via BSS_CHANGED_MU_GROUPS. > > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> > Change-Id: I3d2f5508a2b6eb7c929c3997c31a9285713c8bea No Change-Id, please. > --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c > @@ -593,6 +593,34 @@ mt7915_update_bss_color(struct ieee80211_hw *hw, > } > } > > +static void > +mt7915_update_mu_group(struct ieee80211_hw *hw, struct ieee80211_vif *vif, > + struct ieee80211_bss_conf *info) > +{ > + struct mt7915_phy *phy = mt7915_hw_phy(hw); > + struct mt7915_dev *dev = mt7915_hw_dev(hw); > + u8 i, band = phy->mt76->band_idx; > + u32 *mu; > + > + mu = (u32 *)info->mu_group.membership; Is this safe on big endian? > + for (i = 0; i < WLAN_MEMBERSHIP_LEN / sizeof(*mu); i++) { > + if (is_mt7916(&dev->mt76)) > + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_VLD_MT7916(band, i), > + mu[i]); > + else > + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_VLD(band, i), mu[i]); > + } > + > + mu = (u32 *)info->mu_group.position; And this?
On Thu, 2023-08-03 at 07:58 +0300, Kalle Valo wrote: > > External email : Please do not click links or open attachments until > you have verified the sender or the content. > Ryder Lee <ryder.lee@mediatek.com> writes: > > > The Group ID Management frame is an Action frame of category VHT. > > It is transmitted by the AP to assign or change the user position > > of a STA for one or more group IDs. > > > > Also, sniffer can use a given group id to monitor STA that belongs > > to that group. > > > > Notify underlying driver of changes via BSS_CHANGED_MU_GROUPS. > > > > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> > > Change-Id: I3d2f5508a2b6eb7c929c3997c31a9285713c8bea > > No Change-Id, please. > ok. > > --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c > > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c > > @@ -593,6 +593,34 @@ mt7915_update_bss_color(struct ieee80211_hw > *hw, > > } > > } > > > > +static void > > +mt7915_update_mu_group(struct ieee80211_hw *hw, struct > ieee80211_vif *vif, > > + struct ieee80211_bss_conf *info) > > +{ > > + struct mt7915_phy *phy = mt7915_hw_phy(hw); > > + struct mt7915_dev *dev = mt7915_hw_dev(hw); > > + u8 i, band = phy->mt76->band_idx; > > + u32 *mu; > > + > > + mu = (u32 *)info->mu_group.membership; > > Is this safe on big endian? > hmmm, I'm thinking about this. Doesn't this byte array covert (and then write) to the same cpu endianess? __le32 mu = (__le32 *)info->mu_group.membership write(..., le32_to_cpu(mu)); I know something like above change is safe, but just checking... RYder
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c index ee976657bfc3..794469fdedac 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c @@ -370,6 +370,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy) wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_DISCOVERY); wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0); + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER); if (!is_mt7915(&dev->mt76)) wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR); diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c index f8d6323bd42d..102cbc4da2f4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c @@ -593,6 +593,34 @@ mt7915_update_bss_color(struct ieee80211_hw *hw, } } +static void +mt7915_update_mu_group(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *info) +{ + struct mt7915_phy *phy = mt7915_hw_phy(hw); + struct mt7915_dev *dev = mt7915_hw_dev(hw); + u8 i, band = phy->mt76->band_idx; + u32 *mu; + + mu = (u32 *)info->mu_group.membership; + for (i = 0; i < WLAN_MEMBERSHIP_LEN / sizeof(*mu); i++) { + if (is_mt7916(&dev->mt76)) + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_VLD_MT7916(band, i), + mu[i]); + else + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_VLD(band, i), mu[i]); + } + + mu = (u32 *)info->mu_group.position; + for (i = 0; i < WLAN_USER_POSITION_LEN / sizeof(*mu); i++) { + if (is_mt7916(&dev->mt76)) + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_POS_MT7916(band, i), + mu[i]); + else + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_POS(band, i), mu[i]); + } +} + static void mt7915_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info, @@ -646,6 +674,9 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw, BSS_CHANGED_FILS_DISCOVERY)) mt7915_mcu_add_beacon(hw, vif, info->enable_beacon, changed); + if (changed & BSS_CHANGED_MU_GROUPS) + mt7915_update_mu_group(hw, vif, info); + mutex_unlock(&dev->mt76.mutex); } diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h index 588cd87e24e9..534e039e0deb 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h @@ -1197,13 +1197,21 @@ enum offs_rev { #define MT_WF_PHY_BASE 0x83080000 #define MT_WF_PHY(ofs) (MT_WF_PHY_BASE + (ofs)) +#define MT_WF_PHY_RX_GID_TAB_VLD(_n, i) MT_WF_PHY(0x1054 + (i) * 4 + \ + ((_n) << 16)) +#define MT_WF_PHY_RX_GID_TAB_VLD_MT7916(_n, i) MT_WF_PHY(0x1054 + (i) * 4 + \ + ((_n) << 20)) +#define MT_WF_PHY_RX_GID_TAB_POS(_n, i) MT_WF_PHY(0x105c + (i) * 4 + \ + ((_n) << 16)) +#define MT_WF_PHY_RX_GID_TAB_POS_MT7916(_n, i) MT_WF_PHY(0x105c + (i) * 4 + \ + ((_n) << 20)) #define MT_WF_PHY_RX_CTRL1(_phy) MT_WF_PHY(0x2004 + ((_phy) << 16)) #define MT_WF_PHY_RX_CTRL1_MT7916(_phy) MT_WF_PHY(0x2004 + ((_phy) << 20)) #define MT_WF_PHY_RX_CTRL1_IPI_EN GENMASK(2, 0) #define MT_WF_PHY_RX_CTRL1_STSCNT_EN GENMASK(11, 9) -#define MT_WF_PHY_RXTD12(_phy) MT_WF_PHY(0x8230 + ((_phy) << 16)) -#define MT_WF_PHY_RXTD12_MT7916(_phy) MT_WF_PHY(0x8230 + ((_phy) << 20)) +#define MT_WF_PHY_RXTD12(_phy) MT_WF_PHY(0x8230 + ((_phy) << 16)) +#define MT_WF_PHY_RXTD12_MT7916(_phy) MT_WF_PHY(0x8230 + ((_phy) << 20)) #define MT_WF_PHY_RXTD12_IRPI_SW_CLR_ONLY BIT(18) #define MT_WF_PHY_RXTD12_IRPI_SW_CLR BIT(29)
The Group ID Management frame is an Action frame of category VHT. It is transmitted by the AP to assign or change the user position of a STA for one or more group IDs. Also, sniffer can use a given group id to monitor STA that belongs to that group. Notify underlying driver of changes via BSS_CHANGED_MU_GROUPS. Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Change-Id: I3d2f5508a2b6eb7c929c3997c31a9285713c8bea --- .../net/wireless/mediatek/mt76/mt7915/init.c | 1 + .../net/wireless/mediatek/mt76/mt7915/main.c | 31 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7915/regs.h | 12 +++++-- 3 files changed, 42 insertions(+), 2 deletions(-)