From: Sean Wang <[email protected]>
Properly set up the monitor mode the firmware can support to fix up
RTS/CTS and beacon frames cannot be captured and forwarded to the host.
Signed-off-by: Sean Wang <[email protected]>
---
.../wireless/mediatek/mt76/mt76_connac_mcu.c | 31 +++++++++++++++++++
.../wireless/mediatek/mt76/mt76_connac_mcu.h | 3 ++
.../net/wireless/mediatek/mt76/mt7921/main.c | 23 ++++++++------
3 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 0a646ae51c8d..dded8a7d3efc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2784,5 +2784,36 @@ int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index,
}
EXPORT_SYMBOL_GPL(mt76_connac_mcu_rdd_cmd);
+int mt76_connac_mcu_set_sniffer(struct mt76_dev *dev, struct ieee80211_vif *vif,
+ bool enable)
+{
+ struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
+ struct {
+ struct {
+ u8 band_idx;
+ u8 pad[3];
+ } __packed hdr;
+ struct sniffer_enable_tlv {
+ __le16 tag;
+ __le16 len;
+ u8 enable;
+ u8 pad[3];
+ } __packed enable;
+ } req = {
+ .hdr = {
+ .band_idx = mvif->band_idx,
+ },
+ .enable = {
+ .tag = cpu_to_le16(0),
+ .len = cpu_to_le16(sizeof(struct sniffer_enable_tlv)),
+ .enable = enable,
+ },
+ };
+
+ return mt76_mcu_send_msg(dev, MCU_UNI_CMD(SNIFFER), &req, sizeof(req),
+ true);
+}
+EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_sniffer);
+
MODULE_AUTHOR("Lorenzo Bianconi <[email protected]>");
MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 384c3eab1c8a..96ab1a55af17 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -993,6 +993,7 @@ enum {
MCU_UNI_CMD_SUSPEND = 0x05,
MCU_UNI_CMD_OFFLOAD = 0x06,
MCU_UNI_CMD_HIF_CTRL = 0x07,
+ MCU_UNI_CMD_SNIFFER = 0x24,
};
enum {
@@ -1653,4 +1654,6 @@ int mt76_connac_mcu_set_pm(struct mt76_dev *dev, int band, int enter);
int mt76_connac_mcu_restart(struct mt76_dev *dev);
int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index,
u8 rx_sel, u8 val);
+int mt76_connac_mcu_set_sniffer(struct mt76_dev *dev, struct ieee80211_vif *vif,
+ bool enable);
#endif /* __MT76_CONNAC_MCU_H */
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index b6e836a4fad7..051a573141f4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -479,6 +479,16 @@ mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
mt7921_mcu_set_beacon_filter(dev, vif, dev->pm.enable);
}
+static void
+mt7921_sniffer_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
+{
+ struct mt7921_dev *dev = priv;
+ struct ieee80211_hw *hw = mt76_hw(dev);
+ bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
+
+ mt76_connac_mcu_set_sniffer(&dev->mt76, vif, enabled);
+}
+
void mt7921_set_runtime_pm(struct mt7921_dev *dev)
{
struct ieee80211_hw *hw = dev->mphy.hw;
@@ -516,16 +526,9 @@ static int mt7921_config(struct ieee80211_hw *hw, u32 changed)
}
if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
- bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
-
- if (!enabled)
- phy->rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;
- else
- phy->rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC;
-
- mt76_rmw_field(dev, MT_DMA_DCR0(0), MT_DMA_DCR0_RXD_G5_EN,
- enabled);
- mt76_wr(dev, MT_WF_RFCR(0), phy->rxfilter);
+ ieee80211_iterate_active_interfaces(hw,
+ IEEE80211_IFACE_ITER_RESUME_ALL,
+ mt7921_sniffer_interface_iter, dev);
mt7921_set_runtime_pm(dev);
}
--
2.25.1
From: Sean Wang <[email protected]>
use mt76_hw instead of open coding it
Signed-off-by: Sean Wang <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 051a573141f4..7e5b4aaf3b3a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -491,7 +491,7 @@ mt7921_sniffer_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
void mt7921_set_runtime_pm(struct mt7921_dev *dev)
{
- struct ieee80211_hw *hw = dev->mphy.hw;
+ struct ieee80211_hw *hw = mt76_hw(dev);
struct mt76_connac_pm *pm = &dev->pm;
bool monitor = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
--
2.25.1
> From: Sean Wang <[email protected]>
>
> Properly set up the monitor mode the firmware can support to fix up
> RTS/CTS and beacon frames cannot be captured and forwarded to the host.
>
> Signed-off-by: Sean Wang <[email protected]>
> ---
> .../wireless/mediatek/mt76/mt76_connac_mcu.c | 31 +++++++++++++++++++
> .../wireless/mediatek/mt76/mt76_connac_mcu.h | 3 ++
> .../net/wireless/mediatek/mt76/mt7921/main.c | 23 ++++++++------
> 3 files changed, 47 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> index 0a646ae51c8d..dded8a7d3efc 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> @@ -2784,5 +2784,36 @@ int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index,
> }
> EXPORT_SYMBOL_GPL(mt76_connac_mcu_rdd_cmd);
>
> +int mt76_connac_mcu_set_sniffer(struct mt76_dev *dev, struct ieee80211_vif *vif,
> + bool enable)
Hi Sean,
can this fw mcu be used with mt7663 fw? If not I guess we should move it in
mt7921/mcu.c
> +{
> + struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
> + struct {
> + struct {
> + u8 band_idx;
> + u8 pad[3];
> + } __packed hdr;
> + struct sniffer_enable_tlv {
> + __le16 tag;
> + __le16 len;
> + u8 enable;
> + u8 pad[3];
> + } __packed enable;
> + } req = {
nit: alignment.
Regards,
Lorenzo
> + .hdr = {
> + .band_idx = mvif->band_idx,
> + },
> + .enable = {
> + .tag = cpu_to_le16(0),
> + .len = cpu_to_le16(sizeof(struct sniffer_enable_tlv)),
> + .enable = enable,
> + },
> + };
> +
> + return mt76_mcu_send_msg(dev, MCU_UNI_CMD(SNIFFER), &req, sizeof(req),
> + true);
> +}
> +EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_sniffer);
> +
> MODULE_AUTHOR("Lorenzo Bianconi <[email protected]>");
> MODULE_LICENSE("Dual BSD/GPL");
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> index 384c3eab1c8a..96ab1a55af17 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> @@ -993,6 +993,7 @@ enum {
> MCU_UNI_CMD_SUSPEND = 0x05,
> MCU_UNI_CMD_OFFLOAD = 0x06,
> MCU_UNI_CMD_HIF_CTRL = 0x07,
> + MCU_UNI_CMD_SNIFFER = 0x24,
> };
>
> enum {
> @@ -1653,4 +1654,6 @@ int mt76_connac_mcu_set_pm(struct mt76_dev *dev, int band, int enter);
> int mt76_connac_mcu_restart(struct mt76_dev *dev);
> int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index,
> u8 rx_sel, u8 val);
> +int mt76_connac_mcu_set_sniffer(struct mt76_dev *dev, struct ieee80211_vif *vif,
> + bool enable);
> #endif /* __MT76_CONNAC_MCU_H */
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> index b6e836a4fad7..051a573141f4 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> @@ -479,6 +479,16 @@ mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
> mt7921_mcu_set_beacon_filter(dev, vif, dev->pm.enable);
> }
>
> +static void
> +mt7921_sniffer_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
> +{
> + struct mt7921_dev *dev = priv;
> + struct ieee80211_hw *hw = mt76_hw(dev);
> + bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
> +
> + mt76_connac_mcu_set_sniffer(&dev->mt76, vif, enabled);
> +}
> +
> void mt7921_set_runtime_pm(struct mt7921_dev *dev)
> {
> struct ieee80211_hw *hw = dev->mphy.hw;
> @@ -516,16 +526,9 @@ static int mt7921_config(struct ieee80211_hw *hw, u32 changed)
> }
>
> if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
> - bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
> -
> - if (!enabled)
> - phy->rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;
> - else
> - phy->rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC;
> -
> - mt76_rmw_field(dev, MT_DMA_DCR0(0), MT_DMA_DCR0_RXD_G5_EN,
> - enabled);
> - mt76_wr(dev, MT_WF_RFCR(0), phy->rxfilter);
> + ieee80211_iterate_active_interfaces(hw,
> + IEEE80211_IFACE_ITER_RESUME_ALL,
> + mt7921_sniffer_interface_iter, dev);
> mt7921_set_runtime_pm(dev);
> }
>
> --
> 2.25.1
>
On Thu, 2022-02-24 at 00:04 +0100, Lorenzo Bianconi wrote:
> > From: Sean Wang <[email protected]>
> >
> > Properly set up the monitor mode the firmware can support to fix up
> > RTS/CTS and beacon frames cannot be captured and forwarded to the
> > host.
With this patch, RTS/CTS and beacon can show up in host capture.
Tested-by: Deren Wu <[email protected]>
Regards,
Deren
> >
> > Signed-off-by: Sean Wang <[email protected]>
> > ---
> > .../wireless/mediatek/mt76/mt76_connac_mcu.c | 31
> > +++++++++++++++++++
> > .../wireless/mediatek/mt76/mt76_connac_mcu.h | 3 ++
> > .../net/wireless/mediatek/mt76/mt7921/main.c | 23 ++++++++------
> > 3 files changed, 47 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> > b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> > index 0a646ae51c8d..dded8a7d3efc 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> > @@ -2784,5 +2784,36 @@ int mt76_connac_mcu_rdd_cmd(struct mt76_dev
> > *dev, int cmd, u8 index,
> > }
> > EXPORT_SYMBOL_GPL(mt76_connac_mcu_rdd_cmd);
> >
> > +int mt76_connac_mcu_set_sniffer(struct mt76_dev *dev, struct
> > ieee80211_vif *vif,
> > + bool enable)
>
> Hi Sean,
>
> can this fw mcu be used with mt7663 fw? If not I guess we should move
> it in
> mt7921/mcu.c
>
> > +{
> > + struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
> > + struct {
> > + struct {
> > + u8 band_idx;
> > + u8 pad[3];
> > + } __packed hdr;
> > + struct sniffer_enable_tlv {
> > + __le16 tag;
> > + __le16 len;
> > + u8 enable;
> > + u8 pad[3];
> > + } __packed enable;
> > + } req = {
>
> nit: alignment.
>
> Regards,
> Lorenzo
>
> > + .hdr = {
> > + .band_idx = mvif->band_idx,
> > + },
> > + .enable = {
> > + .tag = cpu_to_le16(0),
> > + .len = cpu_to_le16(sizeof(struct
> > sniffer_enable_tlv)),
> > + .enable = enable,
> > + },
> > + };
> > +
> > + return mt76_mcu_send_msg(dev, MCU_UNI_CMD(SNIFFER), &req,
> > sizeof(req),
> > + true);
> > +}
> > +EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_sniffer);
> > +
> > MODULE_AUTHOR("Lorenzo Bianconi <[email protected]>");
> > MODULE_LICENSE("Dual BSD/GPL");
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > index 384c3eab1c8a..96ab1a55af17 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > @@ -993,6 +993,7 @@ enum {
> > MCU_UNI_CMD_SUSPEND = 0x05,
> > MCU_UNI_CMD_OFFLOAD = 0x06,
> > MCU_UNI_CMD_HIF_CTRL = 0x07,
> > + MCU_UNI_CMD_SNIFFER = 0x24,
> > };
> >
> > enum {
> > @@ -1653,4 +1654,6 @@ int mt76_connac_mcu_set_pm(struct mt76_dev
> > *dev, int band, int enter);
> > int mt76_connac_mcu_restart(struct mt76_dev *dev);
> > int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8
> > index,
> > u8 rx_sel, u8 val);
> > +int mt76_connac_mcu_set_sniffer(struct mt76_dev *dev, struct
> > ieee80211_vif *vif,
> > + bool enable);
> > #endif /* __MT76_CONNAC_MCU_H */
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> > b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> > index b6e836a4fad7..051a573141f4 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> > @@ -479,6 +479,16 @@ mt7921_pm_interface_iter(void *priv, u8 *mac,
> > struct ieee80211_vif *vif)
> > mt7921_mcu_set_beacon_filter(dev, vif, dev->pm.enable);
> > }
> >
> > +static void
> > +mt7921_sniffer_interface_iter(void *priv, u8 *mac, struct
> > ieee80211_vif *vif)
> > +{
> > + struct mt7921_dev *dev = priv;
> > + struct ieee80211_hw *hw = mt76_hw(dev);
> > + bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
> > +
> > + mt76_connac_mcu_set_sniffer(&dev->mt76, vif, enabled);
> > +}
> > +
> > void mt7921_set_runtime_pm(struct mt7921_dev *dev)
> > {
> > struct ieee80211_hw *hw = dev->mphy.hw;
> > @@ -516,16 +526,9 @@ static int mt7921_config(struct ieee80211_hw
> > *hw, u32 changed)
> > }
> >
> > if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
> > - bool enabled = !!(hw->conf.flags &
> > IEEE80211_CONF_MONITOR);
> > -
> > - if (!enabled)
> > - phy->rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;
> > - else
> > - phy->rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC;
> > -
> > - mt76_rmw_field(dev, MT_DMA_DCR0(0),
> > MT_DMA_DCR0_RXD_G5_EN,
> > - enabled);
> > - mt76_wr(dev, MT_WF_RFCR(0), phy->rxfilter);
> > + ieee80211_iterate_active_interfaces(hw,
> > + IEEE80211_IFACE_ITE
> > R_RESUME_ALL,
> > + mt7921_sniffer_inte
> > rface_iter, dev);
> > mt7921_set_runtime_pm(dev);
> > }
> >
> > --
> > 2.25.1
> >
>
> _______________________________________________
> Linux-mediatek mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
On Wednesday, 23 February 2022 23:34:17 CET [email protected] wrote:
> From: Sean Wang <[email protected]>
>
> Properly set up the monitor mode the firmware can support to fix up
> RTS/CTS and beacon frames cannot be captured and forwarded to the host.
>
> Signed-off-by: Sean Wang <[email protected]>
Tested-by: Sven Eckelmann <[email protected]>
Tests were performed on
mt7921e 0000:05:00.0: ASIC revision: 79610010
mt7921e 0000:05:00.0: HW/SW Version: 0x8a108a10, Build Time: 20220110230855a
mt7921e 0000:05:00.0: WM Firmware Version: ____010000, Build Time: 20220110230951
Thanks,
Sven