Commit b2491018 authored by Felix Fietkau's avatar Felix Fietkau

wifi: mt76: mt7915: fix monitor mode issues

Enable receiving other-unicast packets
Disable RX header translation in order to proprerly receive data packets.
Fixes warnings and missed packets when rx decap offload is enabled
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5d0e7dde
...@@ -483,16 +483,22 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed) ...@@ -483,16 +483,22 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)
if (changed & IEEE80211_CONF_CHANGE_MONITOR) { if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR); bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
bool band = phy->mt76->band_idx; bool band = phy->mt76->band_idx;
u32 rxfilter = phy->rxfilter;
if (!enabled) if (!enabled) {
phy->rxfilter |= MT_WF_RFCR_DROP_OTHER_UC; rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;
else dev->monitor_mask &= ~BIT(band);
phy->rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC; } else {
rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC;
dev->monitor_mask |= BIT(band);
}
mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN, mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN,
enabled); enabled);
mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_MDP_DCR0_RX_HDR_TRANS_EN,
!dev->monitor_mask);
mt76_testmode_reset(phy->mt76, true); mt76_testmode_reset(phy->mt76, true);
mt76_wr(dev, MT_WF_RFCR(band), phy->rxfilter); mt76_wr(dev, MT_WF_RFCR(band), rxfilter);
} }
mutex_unlock(&dev->mt76.mutex); mutex_unlock(&dev->mt76.mutex);
...@@ -527,6 +533,7 @@ static void mt7915_configure_filter(struct ieee80211_hw *hw, ...@@ -527,6 +533,7 @@ static void mt7915_configure_filter(struct ieee80211_hw *hw,
MT_WF_RFCR1_DROP_BA | MT_WF_RFCR1_DROP_BA |
MT_WF_RFCR1_DROP_CFEND | MT_WF_RFCR1_DROP_CFEND |
MT_WF_RFCR1_DROP_CFACK; MT_WF_RFCR1_DROP_CFACK;
u32 rxfilter;
u32 flags = 0; u32 flags = 0;
#define MT76_FILTER(_flag, _hw) do { \ #define MT76_FILTER(_flag, _hw) do { \
...@@ -561,7 +568,12 @@ static void mt7915_configure_filter(struct ieee80211_hw *hw, ...@@ -561,7 +568,12 @@ static void mt7915_configure_filter(struct ieee80211_hw *hw,
MT_WF_RFCR_DROP_NDPA); MT_WF_RFCR_DROP_NDPA);
*total_flags = flags; *total_flags = flags;
mt76_wr(dev, MT_WF_RFCR(band), phy->rxfilter); rxfilter = phy->rxfilter;
if (hw->conf.flags & IEEE80211_CONF_MONITOR)
rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC;
else
rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;
mt76_wr(dev, MT_WF_RFCR(band), rxfilter);
if (*total_flags & FIF_CONTROL) if (*total_flags & FIF_CONTROL)
mt76_clear(dev, MT_WF_RFCR1(band), ctl_flags); mt76_clear(dev, MT_WF_RFCR1(band), ctl_flags);
......
...@@ -295,6 +295,8 @@ struct mt7915_dev { ...@@ -295,6 +295,8 @@ struct mt7915_dev {
bool muru_debug; bool muru_debug;
bool ibf; bool ibf;
u8 monitor_mask;
struct dentry *debugfs_dir; struct dentry *debugfs_dir;
struct rchan *relay_fwlog; struct rchan *relay_fwlog;
......
...@@ -172,6 +172,7 @@ enum offs_rev { ...@@ -172,6 +172,7 @@ enum offs_rev {
#define MT_MDP_DCR0 MT_MDP(0x000) #define MT_MDP_DCR0 MT_MDP(0x000)
#define MT_MDP_DCR0_DAMSDU_EN BIT(15) #define MT_MDP_DCR0_DAMSDU_EN BIT(15)
#define MT_MDP_DCR0_RX_HDR_TRANS_EN BIT(19)
#define MT_MDP_DCR1 MT_MDP(0x004) #define MT_MDP_DCR1 MT_MDP(0x004)
#define MT_MDP_DCR1_MAX_RX_LEN GENMASK(15, 3) #define MT_MDP_DCR1_MAX_RX_LEN GENMASK(15, 3)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment