wifi: mt76: refactor chip_config to accept generic commands
Subsystems (2)
PATCH v3 1/5 wifi: mt76: refactor chip_config to accept generic commands
The API, mt76_connac_mcu_chip_config(), was only used to send reset command but the chip_config command is a carrier of more commands.
This patch enables other FW commands to be carried over mt76_connac_mcu_chip_config().
--- drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +1 -1
@@ -54,7 +54,7 @@ static int mt7615_config(void *data, u64 val)int ret;mt7615_mutex_acquire (dev); - ret =mt76_connac_mcu_chip_config (&dev->mt76); + ret =mt76_connac_mcu_chip_config (&dev->mt76,"assert" );mt7615_mutex_release (dev);return ret;
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +2 -2
@@ -2044,13 +2044,13 @@ int mt76_connac_mcu_sched_scan_enable(struct mt76_phy *phy, }EXPORT_SYMBOL_GPL (mt76_connac_mcu_sched_scan_enable); -int mt76_connac_mcu_chip_config (struct mt76_dev *dev) +int mt76_connac_mcu_chip_config (struct mt76_dev *dev,const char *cmd) {struct mt76_connac_config req = { .resp_type =0 , }; -strscpy (req.data,"assert" ); +strscpy (req.data, cmd);return mt76_mcu_send_msg (dev,MCU_CE_CMD (CHIP_CONFIG ), &req,sizeof (req), false);
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +1 -1
@@ -2098,7 +2098,7 @@ void mt76_connac_mcu_set_suspend_iter(void *priv, u8 *mac,int mt76_connac_sta_state_dp (struct mt76_dev *dev,enum ieee80211_sta_state old_state,enum ieee80211_sta_state new_state); -int mt76_connac_mcu_chip_config (struct mt76_dev *dev); +int mt76_connac_mcu_chip_config (struct mt76_dev *dev,const char *cmd);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);
drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c +1 -1
@@ -237,7 +237,7 @@ static int mt7921_chip_reset(void *data, u64 val)default :/* Collect the core dump before reset wifisys. */ mt792x_mutex_acquire (dev); - ret =mt76_connac_mcu_chip_config (&dev->mt76); + ret =mt76_connac_mcu_chip_config (&dev->mt76,"assert" );mt792x_mutex_release (dev);break ; }
Signature · 1 line
2.45.2
PATCH v3 2/5 wifi: mt76: refactor chip_cfg commands to be a generic API
New chip_cfg command isn't chip specific but only available to mt7925.
1. Move chip specific mt7925_mcu_chip_config() from mt76/mt7925/mcu.c to mt76_connac_mcu_uni_chip_config() in mt76/mt76_connac_mcu.c.
2. mt792x_mcu_chip_config() uses mt76_connac_mcu_uni_chip_config() if is dealing with CONNAC3 F/W, and uses mt76_connac_mcu_chip_config() otherwise.
--- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 35 +++++++++++++++++++ .../wireless/mediatek/mt76/mt76_connac_mcu.h | 5 +++ .../wireless/mediatek/mt76/mt7925/debugfs.c | 2 +- .../net/wireless/mediatek/mt76/mt7925/mcu.c | 6 ++-- .../net/wireless/mediatek/mt76/mt7925/mcu.h | 1 - drivers/net/wireless/mediatek/mt76/mt792x.h | 1 + .../net/wireless/mediatek/mt76/mt792x_core.c | 13 +++++++ 7 files changed, 58 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +35 -0
@@ -2057,6 +2057,41 @@ int mt76_connac_mcu_chip_config(struct mt76_dev *dev, const char *cmd) }EXPORT_SYMBOL_GPL (mt76_connac_mcu_chip_config); +/* Unified-command form of chip_config (connac3, e.g. MT7925/MT7928): the same +* CE payload carried as a TLV inside MCU_UNI_CMD_CHIP_CONFIG. +*/ +int mt76_connac_mcu_uni_chip_config (struct mt76_dev *dev,const char *cmd) +{ +ssize_t len; + +struct { +u8 rsv[4 ]; +__le16 tag; +__le16 len; +struct mt76_connac_config config; + } __packed req = { + .tag =cpu_to_le16 (UNI_CHIP_CONFIG_CHIP_CFG ), + .len =cpu_to_le16 (sizeof (req) -sizeof (req.rsv)), + .config = { + .resp_type =0 , + .type =0 , + }, + }; + +if (!cmd) +return -EINVAL ; + + len =strscpy (req.config.data, cmd); +if (len == -E2BIG ) +return -E2BIG ; + + req.config.data_size =cpu_to_le16 (len +1 ); + +return mt76_mcu_send_msg (dev,MCU_UNI_CMD (CHIP_CONFIG ), + &req,sizeof (req), false); +} +EXPORT_SYMBOL_GPL (mt76_connac_mcu_uni_chip_config); +int mt76_connac_mcu_set_deep_sleep (struct mt76_dev *dev,bool enable) {struct mt76_connac_config req = {
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +5 -0
@@ -1459,6 +1459,10 @@ enum UNI_ALL_STA_INFO_TAG {UNI_ALL_STA_MAX_NUM }; +enum { +UNI_CHIP_CONFIG_CHIP_CFG =2 , +}; +enum {MT_NIC_CAP_TX_RESOURCE ,MT_NIC_CAP_TX_EFUSE_ADDR ,
@@ -2099,6 +2103,7 @@ int mt76_connac_sta_state_dp(struct mt76_dev *dev,enum ieee80211_sta_state old_state, enum ieee80211_sta_state new_state);int mt76_connac_mcu_chip_config (struct mt76_dev *dev,const char *cmd); +int mt76_connac_mcu_uni_chip_config (struct mt76_dev *dev,const char *cmd);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);
drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c +1 -1
@@ -276,7 +276,7 @@ static int mt7925_chip_reset(void *data, u64 val)default :/* Collect the core dump before reset wifisys. */ mt792x_mutex_acquire (dev); - ret =mt7925_mcu_chip_config (dev,"assert" ); + ret =mt792x_mcu_chip_config (dev,"assert" );mt792x_mutex_release (dev);break ; }
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +3 -3
@@ -1166,7 +1166,7 @@ int mt7925_mcu_set_deep_sleep(struct mt792x_dev *dev, bool enable)snprintf (cmd,sizeof (cmd),"KeepFullPwr %d" , !enable); -return mt7925_mcu_chip_config (dev, cmd); +return mt792x_mcu_chip_config (dev, cmd); }EXPORT_SYMBOL_GPL (mt7925_mcu_set_deep_sleep);
@@ -1177,11 +1177,11 @@ int mt7925_mcu_set_thermal_protect(struct mt792x_dev *dev)snprintf (cmd,sizeof (cmd),"ThermalProtGband %d %d %d %d %d %d %d %d %d %d" ,0 ,100 ,90 ,80 ,30 ,1 ,1 ,115 ,105 ,5 ); - ret =mt7925_mcu_chip_config (dev, cmd); + ret =mt792x_mcu_chip_config (dev, cmd);snprintf (cmd,sizeof (cmd),"ThermalProtAband %d %d %d %d %d %d %d %d %d %d" ,1 ,100 ,90 ,80 ,30 ,1 ,1 ,115 ,105 ,5 ); - ret |=mt7925_mcu_chip_config (dev, cmd); + ret |=mt792x_mcu_chip_config (dev, cmd);return ret; }
drivers/net/wireless/mediatek/mt76/mt7925/mcu.h +0 -1
@@ -115,7 +115,6 @@ enum { };enum { -UNI_CHIP_CONFIG_CHIP_CFG =0x2 ,UNI_CHIP_CONFIG_NIC_CAPA =0x3 , };
drivers/net/wireless/mediatek/mt76/mt792x.h +1 -0
@@ -531,6 +531,7 @@ void mt792x_mac_link_bss_remove(struct mt792x_dev *dev,struct mt792x_bss_conf *mconf, struct mt792x_link_sta *mlink);void mt792x_config_mac_addr_list (struct mt792x_dev *dev); +int mt792x_mcu_chip_config (struct mt792x_dev *dev,const char *cmd);static inline char *mt792x_ram_name (struct mt792x_dev *dev) {
drivers/net/wireless/mediatek/mt76/mt792x_core.c +13 -0
@@ -1167,6 +1167,19 @@ void mt792x_config_mac_addr_list(struct mt792x_dev *dev) }EXPORT_SYMBOL_GPL (mt792x_config_mac_addr_list); +/* Pick the chip_config command form the running chip's firmware understands: +* connac3 (mt7925/mt7928) needs the unified command, connac2 (mt7921/mt7922) +* uses the legacy CE command. +*/ +int mt792x_mcu_chip_config (struct mt792x_dev *dev,const char *cmd) +{ +if (is_connac3 (&dev->mt76)) +return mt76_connac_mcu_uni_chip_config (&dev->mt76, cmd); + +return mt76_connac_mcu_chip_config (&dev->mt76, cmd); +} +EXPORT_SYMBOL_GPL (mt792x_mcu_chip_config); +MODULE_DESCRIPTION ("MediaTek MT792x core driver" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Lorenzo Bianconi <[email protected]>" );
Signature · 1 line
2.45.2
PATCH v3 3/5 wifi: mt76: add ACPI MTFG option for bus configuration
In reply to Anthony LiuExtend ACPI MTFG table parsing to support an additional MTFG bus configuration option.
--- drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c +1 -0
@@ -355,6 +355,7 @@ u8 mt792x_acpi_get_flags(struct mt792x_phy *phy) } map[] = { { 1, 1 }, { 4, 2 }, + { 13, 3 }, }; u8 flags = BIT(0); int i, j;
Signature · 1 line
2.45.2
PATCH v3 4/5 wifi: mt76: add PCIe speed tuning for mt7922/mt7928
In reply to Anthony LiuSome hardware platforms use ACPI MTFG table denoting the existence of noise that impacts Wi-Fi performance.
This patch reads the ACPI SAR info and notifies F/W to detect current status and to adjust PCIe bus to mitigate the noise.
--- .../net/wireless/mediatek/mt76/mt7921/init.c | 5 ++++ .../wireless/mediatek/mt76/mt7921/pci_mac.c | 6 ++++ .../net/wireless/mediatek/mt76/mt7925/init.c | 2 ++ .../wireless/mediatek/mt76/mt7925/pci_mac.c | 6 ++++ drivers/net/wireless/mediatek/mt76/mt792x.h | 4 +++ .../net/wireless/mediatek/mt76/mt792x_core.c | 28 +++++++++++++++++++ 6 files changed, 51 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7921/init.c +5 -0
@@ -102,6 +102,11 @@ static int __mt7921_init_hardware(struct mt792x_dev *dev) goto out; ret =mt7921_mac_init (dev); +if (ret) + goto out; + +if (is_mt7922 (&dev->mt76)) + ret =mt792x_mcu_set_dyn_pcie_gen (dev); out:return ret; }
drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c +6 -0
@@ -116,6 +116,12 @@ int mt7921e_mac_reset(struct mt792x_dev *dev)if (err) goto out; +if (is_mt7922 (&dev->mt76)) { + err =mt792x_mcu_set_dyn_pcie_gen (dev); +if (err) + goto out; + } + err =__mt7921_start (&dev->phy); out:
drivers/net/wireless/mediatek/mt76/mt7925/init.c +2 -0
@@ -126,6 +126,8 @@ static int __mt7925_init_hardware(struct mt792x_dev *dev) } } +if (is_mt7928 (&dev->mt76)) + ret =mt792x_mcu_set_dyn_pcie_gen (dev); out:return ret; }
drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c +6 -0
@@ -149,6 +149,12 @@ int mt7925e_mac_reset(struct mt792x_dev *dev) goto out; } +if (is_mt7928 (&dev->mt76)) { + err =mt792x_mcu_set_dyn_pcie_gen (dev); +if (err) + goto out; + } + err =__mt7925_start (&dev->phy); out:clear_bit (MT76_RESET , &dev->mphy.state);
drivers/net/wireless/mediatek/mt76/mt792x.h +4 -0
@@ -532,6 +532,7 @@ void mt792x_mac_link_bss_remove(struct mt792x_dev *dev, struct mt792x_link_sta *mlink);void mt792x_config_mac_addr_list (struct mt792x_dev *dev);int mt792x_mcu_chip_config (struct mt792x_dev *dev,const char *cmd); +int mt792x_mcu_set_dyn_pcie_gen (struct mt792x_dev *dev);static inline char *mt792x_ram_name (struct mt792x_dev *dev) {
@@ -630,6 +631,9 @@ int __mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev);int mt792xe_mcu_drv_pmctrl (struct mt792x_dev *dev);int mt792xe_mcu_fw_pmctrl (struct mt792x_dev *dev); +#define MT792X_ACPI_FLAG_VALID BIT(0)/* ACPI SAR is valid */ +#define MT792X_ACPI_FLAG_PCIe BIT(3)/* Valid only when valid is set */ +#ifdef CONFIG_ACPI int mt792x_init_acpi_sar (struct mt792x_dev *dev);int mt792x_init_acpi_sar_power (struct mt792x_phy *phy,bool set_default);
drivers/net/wireless/mediatek/mt76/mt792x_core.c +28 -0
@@ -1180,6 +1180,34 @@ int mt792x_mcu_chip_config(struct mt792x_dev *dev, const char *cmd) }EXPORT_SYMBOL_GPL (mt792x_mcu_chip_config); +int mt792x_mcu_set_dyn_pcie_gen (struct mt792x_dev *dev) +{ +u8 acpi_conf =mt792x_acpi_get_flags (&dev->phy); +char cmd[64 ]; +int ret =0 ; + +if (!(acpi_conf &MT792X_ACPI_FLAG_VALID ) || + !(acpi_conf & MT792X_ACPI_FLAG_PCIe)) +return 0 ; + +strscpy (cmd,"PcieGenSwitch 1 1200 0 -60" ); + ret =mt792x_mcu_chip_config (dev, cmd); +if (ret) +return ret; + +strscpy (cmd,"PcieGenSwitchAGGen2 0" ); + ret =mt792x_mcu_chip_config (dev, cmd); +if (ret) +return ret; + +if (!dev->mphy.cap.has_6ghz) +return 0 ; + +strscpy (cmd,"PcieGenSwitch6G 1" ); +return mt792x_mcu_chip_config (dev, cmd); +} +EXPORT_SYMBOL_GPL (mt792x_mcu_set_dyn_pcie_gen); +MODULE_DESCRIPTION ("MediaTek MT792x core driver" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Lorenzo Bianconi <[email protected]>" );
Signature · 1 line
2.45.2
PATCH v3 5/5 wifi: mt76: add PERF_IND for mt7922/mt7928
In reply to Anthony LiuUpdate Tx/Rx statistics to F/W for speed tuning.
--- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 15 ++ .../wireless/mediatek/mt76/mt76_connac_mcu.h | 53 ++++++ .../wireless/mediatek/mt76/mt7921/debugfs.c | 36 ++++ .../net/wireless/mediatek/mt76/mt7921/mac.c | 4 + .../net/wireless/mediatek/mt76/mt7921/main.c | 2 + .../net/wireless/mediatek/mt76/mt7921/pci.c | 8 + .../wireless/mediatek/mt76/mt7921/pci_mac.c | 2 + .../wireless/mediatek/mt76/mt7925/debugfs.c | 45 +++++ .../net/wireless/mediatek/mt76/mt7925/mac.c | 4 + .../net/wireless/mediatek/mt76/mt7925/main.c | 4 + .../net/wireless/mediatek/mt76/mt7925/pci.c | 14 ++ .../wireless/mediatek/mt76/mt7925/pci_mac.c | 2 + drivers/net/wireless/mediatek/mt76/mt792x.h | 49 +++++ .../net/wireless/mediatek/mt76/mt792x_core.c | 170 ++++++++++++++++++ 14 files changed, 408 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +15 -0
@@ -272,6 +272,21 @@ int mt76_connac_mcu_set_rts_thresh(struct mt76_dev *dev, u32 val, u8 band) }EXPORT_SYMBOL_GPL (mt76_connac_mcu_set_rts_thresh); +int mt76_connac_mcu_uni_set_perf_ind (struct mt76_dev *dev,u32 valid_period, +const u64 *tx_bytes,const u64 *rx_bytes) +{ +struct mt76_connac_uni_perf_ind req = { + .tag =cpu_to_le16 (UNI_PERF_IND_PARM ), + .len =cpu_to_le16 (sizeof (req) -sizeof (req.rsv)), + }; + +mt76_connac_perf_ind_v1_fill (&req.perf, valid_period, tx_bytes, rx_bytes); + +return mt76_mcu_send_msg (dev,MCU_UNI_CMD (PERF_IND ), &req, +sizeof (req), false); +} +EXPORT_SYMBOL_GPL (mt76_connac_mcu_uni_set_perf_ind); +void mt76_connac_mcu_beacon_loss_iter (void *priv,u8 *mac,struct ieee80211_vif *vif) {
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +53 -0
83 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c +36 -0
@@ -247,6 +247,37 @@ static int mt7921_chip_reset(void *data, u64 val)DEFINE_DEBUGFS_ATTRIBUTE (fops_reset,NULL , mt7921_chip_reset,"%lld\n" ); +/* send one perf_ind carrying the written value in every tx/rx byte field */ +static int mt7921_perf_ind_set (void *data,u64 val) +{ +struct mt792x_dev *dev = data; + +return mt792x_perf_ind_trigger (dev, val); +} + +DEFINE_DEBUGFS_ATTRIBUTE (fops_perf_ind,NULL , mt7921_perf_ind_set,"%lld\n" ); + +static int mt7921_perf_ind_enable_get (void *data,u64 *val) +{ +struct mt792x_dev *dev = data; + + *val = dev->perf.enabled; + +return 0 ; +} + +static int mt7921_perf_ind_enable_set (void *data,u64 val) +{ +struct mt792x_dev *dev = data; + + dev->perf.enabled = !!val; + +return 0 ; +} + +DEFINE_DEBUGFS_ATTRIBUTE (fops_perf_ind_enable, mt7921_perf_ind_enable_get, + mt7921_perf_ind_enable_set,"%lld\n" ); +static int mt7921s_sched_quota_read (struct seq_file *s,void *data) {
@@ -287,6 +318,11 @@ int mt7921_init_debugfs(struct mt792x_dev *dev)debugfs_create_devm_seqfile (dev->mt76.dev,"runtime_pm_stats" , dir, mt792x_pm_stats);debugfs_create_file ("deep-sleep" ,0600 , dir, dev, &fops_ds); +if (mt76_is_mmio (&dev->mt76)) { +debugfs_create_file ("enable_perf_ind" ,0600 , dir, dev, + &fops_perf_ind_enable); +debugfs_create_file ("perf_ind" ,0200 , dir, dev, &fops_perf_ind); + }if (mt76_is_sdio (&dev->mt76))debugfs_create_devm_seqfile (dev->mt76.dev,"sched-quota" , dir, mt7921s_sched_quota_read);
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +4 -0
@@ -619,6 +619,10 @@ void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,case PKT_TYPE_NORMAL_MCU :case PKT_TYPE_NORMAL :if (!mt7921_mac_fill_rx (dev, skb)) { +struct mt76_rx_status *status = + (struct mt76_rx_status *)skb->cb; + +mt792x_perf_account_rx (dev, status->wcid, skb->len);mt76_rx (&dev->mt76, q, skb);return ; }
drivers/net/wireless/mediatek/mt76/mt7921/main.c +2 -0
@@ -730,6 +730,8 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw,mt7921_mcu_sta_update (dev,NULL , vif, true,MT76_STA_INFO_STATE_ASSOC );mt7921_mcu_set_beacon_filter (dev, vif, vif->cfg.assoc); + +mt792x_perf_ind_update (dev, vif, MT792x_PERF_IND_TIME); }if (changed &BSS_CHANGED_ARP_FILTER ) {
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +8 -0
@@ -51,6 +51,7 @@ static void mt7921e_unregister_device(struct mt792x_dev *dev)wiphy_rfkill_stop_polling (hw->wiphy);cancel_work_sync (&dev->init_work); +cancel_delayed_work_sync (&dev->perf.work);mt76_unregister_device (&dev->mt76);mt76_for_each_q_rx (&dev->mt76, i)napi_disable (&dev->mt76.napi[i]);
@@ -435,6 +436,9 @@ static int mt7921_pci_probe(struct pci_dev *pdev,if (ret) goto err_free_irq; +/* the periodic performance indication is started on association */ +mt792x_perf_ind_init (dev); +if (of_property_read_bool (dev->mt76.dev->of_node,"wakeup-source" ))device_init_wakeup (dev->mt76.dev, true);
@@ -475,6 +479,7 @@ static int mt7921_pci_suspend(struct device *device) pm->suspended = true;flush_work (&dev->reset_work); +cancel_delayed_work_sync (&dev->perf.work);cancel_delayed_work_sync (&pm->ps_work);cancel_work_sync (&pm->wake_work);
@@ -598,6 +603,9 @@ static int mt7921_pci_resume(struct device *device)mt7921_mcu_regd_update (dev, mdev->alpha2, dev->country_ie_env); err =mt7921_mcu_radio_led_ctrl (dev,EXT_CMD_RADIO_ON_LED ); + +/* re-arm the periodic performance indication if any bss is connected */ +mt792x_perf_ind_resched (dev); failed: pm->suspended = false;
drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c +2 -0
@@ -21,6 +21,8 @@ int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,if (unlikely (tx_info->skb->len <=ETH_HLEN ))return -EINVAL ; +mt792x_perf_account_tx (dev, info->control.vif, tx_info->skb->len); +if (!wcid) wcid = &dev->mt76.global_wcid;
drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c +45 -0
56 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7925/mac.c +4 -0
@@ -1458,6 +1458,10 @@ void mt7925_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,case PKT_TYPE_NORMAL_MCU :case PKT_TYPE_NORMAL :if (!mt7925_mac_fill_rx (dev, skb)) { +struct mt76_rx_status *status = + (struct mt76_rx_status *)skb->cb; + +mt792x_perf_account_rx (dev, status->wcid, skb->len);mt76_rx (&dev->mt76, q, skb);return ; }
drivers/net/wireless/mediatek/mt76/mt7925/main.c +4 -0
@@ -2113,6 +2113,10 @@ static void mt7925_vif_cfg_changed(struct ieee80211_hw *hw,if (ieee80211_vif_is_mld (vif)) mvif->mlo_pm_state = MT792x_MLO_LINK_ASSOC; + +/* PERF_IND is supported on MT7928 only within this family */ +if (is_mt7928 (&dev->mt76)) +mt792x_perf_ind_update (dev, vif, MT792x_PERF_IND_TIME); }if (changed &BSS_CHANGED_ARP_FILTER ) {
drivers/net/wireless/mediatek/mt76/mt7925/pci.c +14 -0
@@ -49,6 +49,8 @@ static void mt7925e_unregister_device(struct mt792x_dev *dev)cancel_work_sync (&dev->reset_work);cancel_work_sync (&dev->init_work); +if (is_mt7928 (&dev->mt76)) +cancel_delayed_work_sync (&dev->perf.work);mt76_unregister_device (&dev->mt76);mt76_for_each_q_rx (&dev->mt76, i)napi_disable (&dev->mt76.napi[i]);
@@ -706,6 +708,12 @@ static int mt7925_pci_probe(struct pci_dev *pdev,if (ret) goto err_free_dma; +/* PERF_IND is only supported on MT7928 in this family; MT7925 opts out. +* The periodic indication itself is started on association. +*/ +if (is_mt7928 (&dev->mt76)) +mt792x_perf_ind_init (dev); +return 0 ; err_free_dma:
@@ -743,6 +751,8 @@ static int mt7925_pci_suspend(struct device *device) pm->suspended = true; dev->hif_resumed = false;flush_work (&dev->reset_work); +if (is_mt7928 (&dev->mt76)) +cancel_delayed_work_sync (&dev->perf.work);cancel_delayed_work_sync (&pm->ps_work);cancel_delayed_work_sync (&dev->mlo_pm_work);cancel_work_sync (&pm->wake_work);
@@ -878,6 +888,10 @@ static int _mt7925_pci_resume(struct device *device, bool restore)mt7925_mcu_set_deep_sleep (dev, false);mt7925_mcu_regd_update (dev, mdev->alpha2, dev->country_ie_env); + +/* re-arm the periodic performance indication if any bss is connected */ +if (is_mt7928 (&dev->mt76)) +mt792x_perf_ind_resched (dev); failed: pm->suspended = false;
drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c +2 -0
@@ -22,6 +22,8 @@ int mt7925e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,if (unlikely (tx_info->skb->len <=ETH_HLEN ))return -EINVAL ; +mt792x_perf_account_tx (dev, info->control.vif, tx_info->skb->len); +if (!wcid) wcid = &dev->mt76.global_wcid;
drivers/net/wireless/mediatek/mt76/mt792x.h +49 -0
75 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt792x_core.c +170 -0
176 lines not on this page · raw message
Signature · 1 line
2.45.2