| Message ID | 20230428205000.2647945-1-greearb@candelatech.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | [1/6] wifi: mt76: mt7915: Support vht mu-mimo sniffer feature. | expand |
On Fri, 2023-04-28 at 13:49 -0700, greearb@candelatech.com wrote: > External email : Please do not click links or open attachments until > you have verified the sender or the content. > > > From: Ben Greear <greearb@candelatech.com> > > This feature allows mac80211 to update the driver with mu-mimo > group to allow the monitor port to capture MU-MIMO (VHT) frames. > > The mt7915 driver implementation will only enable this feature > when there is only a monitor vdev. I was afraid that it would mess > up a sta + monitor vdev combination, for instance. > > Original code from Ryder > > Signed-off-by: Ben Greear <greearb@candelatech.com> > --- > drivers/net/wireless/mediatek/mt76/mt76.h | 5 +++ > .../net/wireless/mediatek/mt76/mt7915/init.c | 1 + > .../net/wireless/mediatek/mt76/mt7915/main.c | 41 > +++++++++++++++++++ > .../net/wireless/mediatek/mt76/mt7915/regs.h | 10 +++++ > 4 files changed, 57 insertions(+) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h > b/drivers/net/wireless/mediatek/mt76/mt76.h > index 6b07b8fafec2..d4ae53d80d07 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76.h > @@ -945,6 +945,11 @@ static inline u16 mt76_rev(struct mt76_dev *dev) > return dev->rev & 0xffff; > } > > +static inline int mt76_vif_count(struct mt76_dev *dev) > +{ > + return hweight_long(dev->vif_mask); > +} > + > #define mt76xx_chip(dev) mt76_chip(&((dev)->mt76)) > #define mt76xx_rev(dev) mt76_rev(&((dev)->mt76)) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c > b/drivers/net/wireless/mediatek/mt76/mt7915/init.c > index ac2049f49bb3..bea75615872f 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 1b361199c061..7566db0cf523 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c > @@ -592,6 +592,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, > @@ -650,6 +678,19 @@ 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) { > + /* Assumption is that in case of non-monitor VDEV > existing, then > + * that device should control the mu-group directly. > + */ > + int vif_count = mt76_vif_count(&dev->mt76); > + int max_ok = 0; I don't think we need checks here as user can fully handle this with toggling iw command - iw dev mon0 set monitor mumimo-groupid <Group ID> Also, the Group ID mgmt frame is transmitted by the AP to assign or change the user position of a STA, which will notify underlying driver of changes. > + if (phy->monitor_vif) > + max_ok = 1; > + if (vif_count <= max_ok) > + 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 c8e478a55081..5e057cce5c9f 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h > @@ -1183,6 +1183,16 @@ 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(_phy, > i) MT_WF_PHY(0x1054 + \ > + (i) > * 4 + ((_phy) << 16)) > +#define MT_WF_PHY_RX_GID_TAB_VLD_MT7916(_phy, > i) MT_WF_PHY(0x1054 + \ > + (i) > * 4 + ((_phy) << 20)) > + > +#define MT_WF_PHY_RX_GID_TAB_POS(_phy, > i) MT_WF_PHY(0x105c + \ > + (i) > * 4 + ((_phy) << 16)) > +#define MT_WF_PHY_RX_GID_TAB_POS_MT7916(_phy, > i) MT_WF_PHY(0x105c + \ > + (i) > * 4 + ((_phy) << 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) > -- > 2.40.0 >
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index 6b07b8fafec2..d4ae53d80d07 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -945,6 +945,11 @@ static inline u16 mt76_rev(struct mt76_dev *dev) return dev->rev & 0xffff; } +static inline int mt76_vif_count(struct mt76_dev *dev) +{ + return hweight_long(dev->vif_mask); +} + #define mt76xx_chip(dev) mt76_chip(&((dev)->mt76)) #define mt76xx_rev(dev) mt76_rev(&((dev)->mt76)) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c index ac2049f49bb3..bea75615872f 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 1b361199c061..7566db0cf523 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c @@ -592,6 +592,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, @@ -650,6 +678,19 @@ 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) { + /* Assumption is that in case of non-monitor VDEV existing, then + * that device should control the mu-group directly. + */ + int vif_count = mt76_vif_count(&dev->mt76); + int max_ok = 0; + + if (phy->monitor_vif) + max_ok = 1; + if (vif_count <= max_ok) + 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 c8e478a55081..5e057cce5c9f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h @@ -1183,6 +1183,16 @@ 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(_phy, i) MT_WF_PHY(0x1054 + \ + (i) * 4 + ((_phy) << 16)) +#define MT_WF_PHY_RX_GID_TAB_VLD_MT7916(_phy, i) MT_WF_PHY(0x1054 + \ + (i) * 4 + ((_phy) << 20)) + +#define MT_WF_PHY_RX_GID_TAB_POS(_phy, i) MT_WF_PHY(0x105c + \ + (i) * 4 + ((_phy) << 16)) +#define MT_WF_PHY_RX_GID_TAB_POS_MT7916(_phy, i) MT_WF_PHY(0x105c + \ + (i) * 4 + ((_phy) << 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)