[PATCH v3 1/2] mt76: connac: add mt76_connac_mcu_update_sta_cmd support
Lorenzo Bianconi
lorenzo at kernel.org
Thu Jun 3 01:35:45 PDT 2021
> From: Sean Wang <sean.wang at mediatek.com>
>
> Add mt76_connac_mcu_update_sta_cmd support that is the prerequisite patch
> for we are able to update the station record with the current state the
> station has into the offload firmware at runtime.
could you please rebase it on top of "mt76: connac: fix UC entry is being overwritten"?
https://patchwork.kernel.org/project/linux-wireless/patch/3d30cb9e40df970e2f4ef09c975f9fd6f7dc02dd.1622649436.git.lorenzo@kernel.org/
>
> Signed-off-by: Sean Wang <sean.wang at mediatek.com>
> ---
> v1->v2: no change
> v2->v3: 1. rebase the latest mt76
> 2. turn into using enum mt76_sta_info_state
> 3. drop unneeded .state parameter passing in __mt7615_mcu_add_sta
> 4. make mt76_connac_mcu_add_sta_cmd and
> mt76_connac_mcu_update_sta_cmd static inline in
> mt76_connac_mcu.h
> ---
> .../net/wireless/mediatek/mt76/mt7615/mcu.c | 5 +--
> .../wireless/mediatek/mt76/mt76_connac_mcu.c | 21 +++++++------
> .../wireless/mediatek/mt76/mt76_connac_mcu.h | 31 ++++++++++++++++---
> .../net/wireless/mediatek/mt76/mt7921/main.c | 8 +++--
> .../net/wireless/mediatek/mt76/mt7921/mcu.c | 4 ++-
> .../wireless/mediatek/mt76/mt7921/mt7921.h | 3 +-
> 6 files changed, 52 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> index cf4a4f2637d5..2f73bcb607dd 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> @@ -1028,9 +1028,10 @@ mt7615_mcu_wtbl_sta_add(struct mt7615_phy *phy, struct ieee80211_vif *vif,
> if (IS_ERR(sskb))
> return PTR_ERR(sskb);
>
> - mt76_connac_mcu_sta_basic_tlv(sskb, vif, sta, enable);
> + mt76_connac_mcu_sta_basic_tlv(sskb, vif, sta, enable, true);
> if (enable && sta)
> - mt76_connac_mcu_sta_tlv(phy->mt76, sskb, sta, vif, 0);
> + mt76_connac_mcu_sta_tlv(phy->mt76, sskb, sta, vif, 0,
> + MT76_STA_INFO_STATE_ASSOC);
>
> wtbl_hdr = mt76_connac_mcu_alloc_wtbl_req(&dev->mt76, &msta->wcid,
> WTBL_RESET_AND_SET, NULL,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> index b155e7b8d89d..45465eb3581a 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> @@ -304,7 +304,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_alloc_wtbl_req);
> void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb,
> struct ieee80211_vif *vif,
> struct ieee80211_sta *sta,
> - bool enable)
> + bool enable, bool newly)
> {
> struct sta_rec_basic *basic;
> struct tlv *tlv;
> @@ -316,7 +316,8 @@ void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb,
> basic->extra_info = cpu_to_le16(EXTRA_INFO_VER);
>
> if (enable) {
> - basic->extra_info |= cpu_to_le16(EXTRA_INFO_NEW);
> + if (newly)
> + basic->extra_info |= cpu_to_le16(EXTRA_INFO_NEW);
> basic->conn_state = CONN_STATE_PORT_SECURE;
> } else {
> basic->conn_state = CONN_STATE_DISCONNECT;
> @@ -709,7 +710,7 @@ mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif,
> void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
> struct ieee80211_sta *sta,
> struct ieee80211_vif *vif,
> - u8 rcpi)
> + u8 rcpi, u8 sta_state)
> {
> struct cfg80211_chan_def *chandef = &mphy->chandef;
> enum nl80211_band band = chandef->chan->band;
> @@ -770,7 +771,7 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
>
> tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_STATE, sizeof(*state));
> state = (struct sta_rec_state *)tlv;
> - state->state = 2;
> + state->state = sta_state;
>
> if (sta->vht_cap.vht_supported) {
> state->vht_opmode = sta->bandwidth;
> @@ -862,8 +863,9 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,
> }
> EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_ht_tlv);
>
> -int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,
> - struct mt76_sta_cmd_info *info)
> +int mt76_connac_mcu_sta_cmd(struct mt76_phy *phy,
> + struct mt76_sta_cmd_info *info,
> + bool newly)
> {
> struct mt76_vif *mvif = (struct mt76_vif *)info->vif->drv_priv;
> struct mt76_dev *dev = phy->dev;
> @@ -875,10 +877,11 @@ int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,
> if (IS_ERR(skb))
> return PTR_ERR(skb);
>
> - mt76_connac_mcu_sta_basic_tlv(skb, info->vif, info->sta, info->enable);
> + mt76_connac_mcu_sta_basic_tlv(skb, info->vif, info->sta, info->enable,
> + newly);
> if (info->enable && info->sta)
> mt76_connac_mcu_sta_tlv(phy, skb, info->sta, info->vif,
> - info->rcpi);
> + info->rcpi, info->state);
>
> sta_wtbl = mt76_connac_mcu_add_tlv(skb, STA_REC_WTBL,
> sizeof(struct tlv));
> @@ -902,7 +905,7 @@ int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,
>
> return mt76_mcu_skb_send_msg(dev, skb, info->cmd, true);
> }
> -EXPORT_SYMBOL_GPL(mt76_connac_mcu_add_sta_cmd);
> +EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_cmd);
>
> void mt76_connac_mcu_wtbl_ba_tlv(struct mt76_dev *dev, struct sk_buff *skb,
> struct ieee80211_ampdu_params *params,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> index 3076417ead5f..c7b809ff3045 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> @@ -904,6 +904,12 @@ struct mt76_connac_suspend_tlv {
> u8 pad[5];
> } __packed;
>
> +enum mt76_sta_info_state {
> + MT76_STA_INFO_STATE_NONE,
> + MT76_STA_INFO_STATE_AUTH,
> + MT76_STA_INFO_STATE_ASSOC
> +};
> +
> struct mt76_sta_cmd_info {
> struct ieee80211_sta *sta;
> struct mt76_wcid *wcid;
> @@ -913,6 +919,7 @@ struct mt76_sta_cmd_info {
> bool enable;
> int cmd;
> u8 rcpi;
> + u8 state;
why not enum mt76_sta_info_state here swapping with rcpi?
> };
>
> #define MT_SKU_POWER_LIMIT 161
> @@ -982,7 +989,8 @@ int mt76_connac_mcu_set_channel_domain(struct mt76_phy *phy);
> int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif);
> void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb,
> struct ieee80211_vif *vif,
> - struct ieee80211_sta *sta, bool enable);
> + struct ieee80211_sta *sta, bool enable,
> + bool newly);
> void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev, struct sk_buff *skb,
> struct ieee80211_vif *vif,
> struct ieee80211_sta *sta, void *sta_wtbl,
> @@ -997,7 +1005,7 @@ int mt76_connac_mcu_sta_update_hdr_trans(struct mt76_dev *dev,
> void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
> struct ieee80211_sta *sta,
> struct ieee80211_vif *vif,
> - u8 rcpi);
> + u8 rcpi, u8 state);
why not enum mt76_sta_info_state here?
> void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb,
> struct ieee80211_sta *sta, void *sta_wtbl,
> void *wtbl_tlv);
> @@ -1019,8 +1027,9 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy,
> struct ieee80211_vif *vif,
> struct mt76_wcid *wcid,
> bool enable);
> -int mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,
> - struct mt76_sta_cmd_info *info);
> +int mt76_connac_mcu_sta_cmd(struct mt76_phy *phy,
> + struct mt76_sta_cmd_info *info,
> + bool newly);
> void mt76_connac_mcu_beacon_loss_iter(void *priv, u8 *mac,
> struct ieee80211_vif *vif);
> int mt76_connac_mcu_set_rts_thresh(struct mt76_dev *dev, u32 val, u8 band);
> @@ -1059,4 +1068,18 @@ int mt76_connac_mcu_set_deep_sleep(struct mt76_dev *dev, bool enable);
> void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb,
> struct mt76_connac_coredump *coredump);
> int mt76_connac_mcu_set_rate_txpower(struct mt76_phy *phy);
> +
> +static inline int
> +mt76_connac_mcu_add_sta_cmd(struct mt76_phy *phy,
> + struct mt76_sta_cmd_info *info)
> +{
> + return mt76_connac_mcu_sta_cmd(phy, info, true);
> +}
> +
> +static inline int
> +mt76_connac_mcu_update_sta_cmd(struct mt76_phy *phy,
> + struct mt76_sta_cmd_info *info)
> +{
> + return mt76_connac_mcu_sta_cmd(phy, info, false);
> +}
> #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 84930ad5ebc7..c641a92b140c 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> @@ -578,7 +578,8 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw,
> mt7921_mcu_uni_bss_ps(dev, vif);
>
> if (changed & BSS_CHANGED_ASSOC) {
> - mt7921_mcu_sta_add(dev, NULL, vif, true);
> + mt7921_mcu_sta_add(dev, NULL, vif, true,
> + MT76_STA_INFO_STATE_ASSOC);
> mt7921_bss_bcnft_apply(dev, vif, info->assoc);
> }
>
> @@ -627,7 +628,8 @@ int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
> mt7921_mac_wtbl_update(dev, idx,
> MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
>
> - ret = mt7921_mcu_sta_add(dev, sta, vif, true);
> + ret = mt7921_mcu_sta_add(dev, sta, vif, true,
> + MT76_STA_INFO_STATE_ASSOC);
> if (ret)
> return ret;
>
> @@ -645,7 +647,7 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
> mt76_connac_free_pending_tx_skbs(&dev->pm, &msta->wcid);
> mt76_connac_pm_wake(&dev->mphy, &dev->pm);
>
> - mt7921_mcu_sta_add(dev, sta, vif, false);
> + mt7921_mcu_sta_add(dev, sta, vif, false, MT76_STA_INFO_STATE_NONE);
> mt7921_mac_wtbl_update(dev, msta->wcid.idx,
> MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> index ffc83717fd0d..4f0fd9674950 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> @@ -1268,7 +1268,8 @@ int mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif,
> }
>
> int mt7921_mcu_sta_add(struct mt7921_dev *dev, struct ieee80211_sta *sta,
> - struct ieee80211_vif *vif, bool enable)
> + struct ieee80211_vif *vif, bool enable,
> + enum mt76_sta_info_state state)
> {
> struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
> int rssi = -ewma_rssi_read(&mvif->rssi);
> @@ -1276,6 +1277,7 @@ int mt7921_mcu_sta_add(struct mt7921_dev *dev, struct ieee80211_sta *sta,
> .sta = sta,
> .vif = vif,
> .enable = enable,
> + .state = state,
> .cmd = MCU_UNI_CMD_STA_REC_UPDATE,
> .rcpi = to_rcpi(rssi),
> };
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> index 8aa8d2ecdffa..d4d84b898011 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
> @@ -263,7 +263,8 @@ int mt7921_mcu_add_key(struct mt7921_dev *dev, struct ieee80211_vif *vif,
> enum set_key_cmd cmd);
> int mt7921_set_channel(struct mt7921_phy *phy);
> int mt7921_mcu_sta_add(struct mt7921_dev *dev, struct ieee80211_sta *sta,
> - struct ieee80211_vif *vif, bool enable);
> + struct ieee80211_vif *vif, bool enable,
> + enum mt76_sta_info_state state);
> int mt7921_mcu_set_chan_info(struct mt7921_phy *phy, int cmd);
> int mt7921_mcu_set_tx(struct mt7921_dev *dev, struct ieee80211_vif *vif);
> int mt7921_mcu_set_eeprom(struct mt7921_dev *dev);
> --
> 2.25.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-mediatek/attachments/20210603/d4414176/attachment.sig>
More information about the Linux-mediatek
mailing list