> From: Sean Wang <sean.wang@xxxxxxxxxxxx>
>
> The firmware can have the capability to manage the channel context
> scheduling on multiple roles running on the device including Station,
> AP and P2P GC/GO mode (will be extended based on the patchset) to help
> users sharing the network with others on a single device.
>
> The firmware is able to support the channel chanctx up to 2 interface
> simultaneously running on the different channels.
>
> Another thing to be noted is that before the driver is going sent out the
> management frames, the driver has to get the privilege from the firmware
> to occupy the current channel context until the frame handshake is
> completed and then get the privilege back to the firmware.
>
> We temporarily disable the feature with a module parameter
> mt7921_disable_cnm for a while until we can ensure the patchset doesn't
> cause any regression.
>
> Co-developed-by: Deren Wu <deren.wu@xxxxxxxxxxxx>
> Signed-off-by: Deren Wu <deren.wu@xxxxxxxxxxxx>
> Signed-off-by: Sean Wang <sean.wang@xxxxxxxxxxxx>
> ---
> .../net/wireless/mediatek/mt76/mt7921/init.c | 40 ++++++-
> .../net/wireless/mediatek/mt76/mt7921/main.c | 111 +++++++++++++++++-
> .../wireless/mediatek/mt76/mt7921/mt7921.h | 1 +
> 3 files changed, 145 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
> index 1b7a18d42f5b..208a6117cb69 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
> @@ -7,6 +7,10 @@
> #include "mcu.h"
> #include "eeprom.h"
>
> +static bool mt7921_disable_cnm = true;
> +module_param_named(disable_cnm, mt7921_disable_cnm, bool, 0644);
> +MODULE_PARM_DESC(disable_cnm, "disable concurrent network support");
do we need it? I guess we can just leave it enabled by default and disable it
through a debugfs node. What do you think?
> +
> static const struct ieee80211_iface_limit if_limits[] = {
> {
> .max = MT7921_MAX_INTERFACES,
> @@ -25,6 +29,27 @@ static const struct ieee80211_iface_combination if_comb[] = {
> .max_interfaces = MT7921_MAX_INTERFACES,
> .num_different_channels = 1,
> .beacon_int_infra_match = true,
> + },
> +};
> +
> +static const struct ieee80211_iface_limit if_limits_chanctx[] = {
> + {
> + .max = 2,
> + .types = BIT(NL80211_IFTYPE_STATION),
> + },
> + {
> + .max = 1,
> + .types = BIT(NL80211_IFTYPE_AP),
> + }
> +};
> +
> +static const struct ieee80211_iface_combination if_comb_chanctx[] = {
> + {
> + .limits = if_limits_chanctx,
> + .n_limits = ARRAY_SIZE(if_limits_chanctx),
> + .max_interfaces = 2,
> + .num_different_channels = 2,
> + .beacon_int_infra_match = false,
> }
> };
>
> @@ -63,11 +88,20 @@ static int mt7921_check_offload_capability(struct mt7921_dev *dev)
> fw_can_roc = mktime64(year, mon, day, hour, min, sec) >=
> mktime64(2022, 7, 15, 12, 1, 1);
> out:
> - if (!fw_can_roc) {
> + if (!fw_can_roc || mt7921_disable_cnm) {
> dev->ops->remain_on_channel = NULL;
> dev->ops->cancel_remain_on_channel = NULL;
> + dev->ops->add_chanctx = NULL;
> + dev->ops->remove_chanctx = NULL;
> + dev->ops->change_chanctx = NULL;
> + dev->ops->assign_vif_chanctx = NULL;
> + dev->ops->unassign_vif_chanctx = NULL;
> + dev->ops->mgd_prepare_tx = NULL;
> + dev->ops->mgd_complete_tx = NULL;
>
> wiphy->flags &= ~WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
> + wiphy->iface_combinations = if_comb;
> + wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
> }
>
> return 0;
> @@ -93,12 +127,12 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)
> hw->sta_data_size = sizeof(struct mt7921_sta);
> hw->vif_data_size = sizeof(struct mt7921_vif);
>
> - wiphy->iface_combinations = if_comb;
> + wiphy->iface_combinations = if_comb_chanctx;
> wiphy->flags &= ~(WIPHY_FLAG_IBSS_RSN | WIPHY_FLAG_4ADDR_AP |
> WIPHY_FLAG_4ADDR_STATION);
> wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
> BIT(NL80211_IFTYPE_AP);
> - wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
> + wiphy->n_iface_combinations = ARRAY_SIZE(if_comb_chanctx);
> wiphy->max_remain_on_channel_duration = 5000;
> wiphy->max_scan_ie_len = MT76_CONNAC_SCAN_IE_LEN;
> wiphy->max_scan_ssids = 4;
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> index ae0aabe052e3..6386290ba71c 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> @@ -858,7 +858,7 @@ void mt7921_mac_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,
>
> if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls)
> mt76_connac_mcu_uni_add_bss(&dev->mphy, vif, &mvif->sta.wcid,
> - true, NULL);
> + true, mvif->ctx);
>
> mt7921_mac_wtbl_update(dev, msta->wcid.idx,
> MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
> @@ -890,7 +890,7 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
> if (!sta->tdls)
> mt76_connac_mcu_uni_add_bss(&dev->mphy, vif,
> &mvif->sta.wcid, false,
> - NULL);
> + mvif->ctx);
> }
>
> spin_lock_bh(&dev->sta_poll_lock);
> @@ -1640,7 +1640,7 @@ mt7921_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> mt7921_mutex_acquire(dev);
>
> err = mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid,
> - true, NULL);
> + true, mvif->ctx);
> if (err)
> goto failed;
>
> @@ -1672,12 +1672,108 @@ mt7921_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> goto failed;
>
> mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, false,
> - NULL);
> + mvif->ctx);
>
> failed:
> mt7921_mutex_release(dev);
> }
>
> +static int
> +mt7921_add_chanctx(struct ieee80211_hw *hw,
> + struct ieee80211_chanctx_conf *ctx)
> +{
> + return 0;
> +}
> +
> +static void
> +mt7921_remove_chanctx(struct ieee80211_hw *hw,
> + struct ieee80211_chanctx_conf *ctx)
> +{
> +}
> +
> +static void mt7921_ctx_iter(void *priv, u8 *mac,
> + struct ieee80211_vif *vif)
> +{
> + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
> + struct ieee80211_chanctx_conf *ctx = priv;
> +
> + if (ctx != mvif->ctx)
> + return;
> +
> + mt76_connac_mcu_uni_set_chctx(mvif->phy->mt76, &mvif->mt76, ctx);
> +}
> +
> +static void
> +mt7921_change_chanctx(struct ieee80211_hw *hw,
> + struct ieee80211_chanctx_conf *ctx,
> + u32 changed)
> +{
> + struct mt7921_phy *phy = mt7921_hw_phy(hw);
> +
> + mt7921_mutex_acquire(phy->dev);
> + ieee80211_iterate_active_interfaces(phy->mt76->hw,
> + IEEE80211_IFACE_ITER_ACTIVE,
> + mt7921_ctx_iter, ctx);
> + mt7921_mutex_release(phy->dev);
> +}
> +
> +static int
> +mt7921_assign_vif_chanctx(struct ieee80211_hw *hw,
> + struct ieee80211_vif *vif,
> + struct ieee80211_bss_conf *link_conf,
> + struct ieee80211_chanctx_conf *ctx)
> +{
> + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
> + struct mt7921_dev *dev = mt7921_hw_dev(hw);
> +
> + mt7921_mutex_acquire(dev);
I think in this case we can just grub the mutex without waking up the device.
what do you think?
> + mvif->ctx = ctx;
> + mt7921_mutex_release(dev);
> +
> + return 0;
> +}
> +
> +static void
> +mt7921_unassign_vif_chanctx(struct ieee80211_hw *hw,
> + struct ieee80211_vif *vif,
> + struct ieee80211_bss_conf *link_conf,
> + struct ieee80211_chanctx_conf *ctx)
> +{
> + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
> + struct mt7921_dev *dev = mt7921_hw_dev(hw);
> +
> + mt7921_mutex_acquire(dev);
same here.
Regards,
Lorenzo
> + mvif->ctx = NULL;
> + mt7921_mutex_release(dev);
> +}
> +
> +static void mt7921_mgd_prepare_tx(struct ieee80211_hw *hw,
> + struct ieee80211_vif *vif,
> + struct ieee80211_prep_tx_info *info)
> +{
> + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
> + struct mt7921_dev *dev = mt7921_hw_dev(hw);
> + u16 duration = info->duration ? info->duration :
> + jiffies_to_msecs(HZ);
> +
> + mt7921_mutex_acquire(dev);
> + mt7921_set_roc(mvif->phy, mvif, mvif->ctx->def.chan, duration,
> + MT7921_ROC_REQ_JOIN);
> + mt7921_mutex_release(dev);
> +}
> +
> +static void mt7921_mgd_complete_tx(struct ieee80211_hw *hw,
> + struct ieee80211_vif *vif,
> + struct ieee80211_prep_tx_info *info)
> +{
> + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
> + struct mt7921_dev *dev = mt7921_hw_dev(hw);
> +
> + mt7921_mutex_acquire(dev);
> + mt7921_abort_roc(mvif->phy, mvif);
> + mt7921_mutex_release(dev);
> +}
> +
> const struct ieee80211_ops mt7921_ops = {
> .tx = mt7921_tx,
> .start = mt7921_start,
> @@ -1730,6 +1826,13 @@ const struct ieee80211_ops mt7921_ops = {
> .set_sar_specs = mt7921_set_sar_specs,
> .remain_on_channel = mt7921_remain_on_channel,
> .cancel_remain_on_channel = mt7921_cancel_remain_on_channel,
> + .add_chanctx = mt7921_add_chanctx,
> + .remove_chanctx = mt7921_remove_chanctx,
> + .change_chanctx = mt7921_change_chanctx,
> + .assign_vif_chanctx = mt7921_assign_vif_chanctx,
> + .unassign_vif_chanctx = mt7921_unassign_vif_chanctx,
> + .mgd_prepare_tx = mt7921_mgd_prepare_tx,
> + .mgd_complete_tx = mt7921_mgd_complete_tx,
> };
> EXPORT_SYMBOL_GPL(mt7921_ops);
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> index 280605ffc4da..fda85252325c 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> @@ -156,6 +156,7 @@ struct mt7921_vif {
> struct ewma_rssi rssi;
>
> struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];
> + struct ieee80211_chanctx_conf *ctx;
> };
>
> struct mib_stats {
> --
> 2.25.1
>
Attachment:
signature.asc
Description: PGP signature
