[rdkb][common][bsp][Refactor and sync wifi from openwrt]
[Description]
d34487c3 [MAC80211][WiFi6][mt76][Add mt7981 mt7916 mt7915 fw_wm_info support]
327eaf76 [MAC80211][wifi7][Release][Update WiFi7 Filogic680/660 Firmware]
fa03d7ea [MAC80211][WiFi6][hostapd][Fix 2/6G channel switch fail issue]
c0bf67d9 [MAC80211][misc][Add Filogic 880 Non-MLO SDK Release]
e5d03217 [MAC80211][WiFi6][Rebase Patches][Refactor set_offchan_ctrl]
6cad79ae [MAC80211][WiFi6][hostapd][Add support for DFS channel switch with CSA sent]
cde50012 [MAC80211][WiFi6][core][Add DFS channel CSA flow]
0142fd16 [MAC80211][WiFi6][mt76][Add post channel switch callback for DFS channel switch support]
cb3f4c58 [MAC80211][WiFi6][mt76][Update Connac2 CSI Feature]
1b66ac4c [MAC80211][WiFi6][mt76][Refactor precal loading and binfile mode to align upstream]
0ece467b [MAC80211][WiFi6][mt76][Fix scs feature calltrace issue]
1dca03f1 [MAC80211][WiFi6/7][Misc][Change group mgmt cipher setting to align group cipher]
0aa52762 [MAC80211][WiFi6][mt76][Fix muru_onoff as all enabled by default]
c3e5f505 [MAC80211][WiFi6][hostapd][Fix mu_onoff was overwritten with unexpected values]
7090eabe [MAC80211][WiFi6/7][core][Add tx_burst option in wireless configuration file for Kite]
669d3071 [MAC80211][WiFi6][mt76][rebase patches]
c5d6b3e7 [mac80211][mt76][Fix patch fail]
55ef4059 [MAC80211][WiFi6][mt76][Fix TxS ACK is incorrectly reported]
e166eae1 [MAC80211][WiFi6][Misc][Add Filogic 820 Build]
118ffd7e [mac80211][wifi6][mt76][Fix crash caused by per-BSS counter updating]
68015098 [MAC80211][WiFi7][mt76][Add Eagle 2adie TBTC default bin]
eae6e8c0 [MAC80211][WiFi7][mt76][Add Eagle 2adie TBTC support in mt76 Makefile]
cccc8eb9 [MAC80211[WiFi6][hostapd][Fix wds AP interface adding issue]
173fe3b0 [MAC80211][WiFi6][mt76][Add scs feature for connac2 mt76]
1b8af8d9 [MAC80211][WiFi6][mt76][rebase patches]
6dc40325 [MAC80211][WiFi7][misc][fix hostapd udebug init fail]
aa4b39ae [[mt76][csi][mt7915][mt7986] update csi feature]
7d458da2 [MAC80211][WiFi6][hostapd][Auto Channel Selection channel time issue]
f0b5502f [MAC80211][WiFi7][misc][fix build error]
b63c9cf6 [MAC80211][WiFi6/7][misc][fix ucode and backport 6.5 patch fail]
ce056dc7 [mac80211][wifi6][mt76][Add variant support for Cheetah MT76]
c5ae3f9c [MAC80211][WiFi6/7][Misc][Add country setting consistent check before enable AP.]
d57d9c5a [mac80211][misc][wifi6/7][Update libubox to the latest version]
be7dbf21 [mac80211][misc][wifi7][Revert libubox to 20230523 to prevent build fail]
ae9b4428 [MAC80211][WiFi6][mt76][Add cal free data support]
52fd5d80 [MAC80211][WiFi7][Misc][Adjust MU EDCA timer in mac80211.sh]
66c649de [mac80211][hostapd][netifd][Revert udebug for build pass]
136c7f11 [MAC80211][hostapd][wifi7][Fix build fail]
8911e727 [MAC80211][WiFi6][hostapd][Auto Channel Selection issue and patch sync]
75161456 [MAC80211][WiFi7][mt76][Fix issue for testmode bit in eagle defaut bin]
4dc2d646 [MAC80211][WiFi6][mt76][Fix cheetah 5G ibf issue]
d4561158 [MAC80211][WiFi6][Misc][Add Filogic 820 Build]
2e5a1997 [MAC80211][WiFi6][hostapd][Backport hostapd ACS patches and some ACS fixes]
b0305b6e [MAC80211][WiFi6/7][Misc][Add 6g band default enable mbo IE]
[Release-log]
Change-Id: I872b422c1fc56ebd3a1cff3252cb403a2015eabe
diff --git a/recipes-wifi/linux-mt76/files/patches/1045-wifi-mt76-mt7915-support-scs-feature.patch b/recipes-wifi/linux-mt76/files/patches/1045-wifi-mt76-mt7915-support-scs-feature.patch
new file mode 100644
index 0000000..4cb13d3
--- /dev/null
+++ b/recipes-wifi/linux-mt76/files/patches/1045-wifi-mt76-mt7915-support-scs-feature.patch
@@ -0,0 +1,383 @@
+From 775a9c8aa928a43fd4eaf8d252c5691dcce8fd08 Mon Sep 17 00:00:00 2001
+From: Howard Hsu <howard-yh.hsu@mediatek.com>
+Date: Wed, 6 Dec 2023 08:53:03 +0800
+Subject: [PATCH] wifi: mt76: mt7915: support scs feature
+
+Add support scs feature for connac2 codebase. This commit includes three
+parts.
+1. enable scs feature when interface is up.
+2. support configure scs feature on/off by debugfs scs_enable.
+3. Firmware needs driver to provide the tx_bytes, rx_bytes,
+active_station_number, total throughtput and min rssi of all connected
+stations. In mt76 driver, we run a delayed work to send all must-need
+statistics through mcu command every second.
+
+Please noted that the scs feature is only enable for apsoc is 7986 or
+7981 (WED Rx 2.0).
+
+Signed-off-by: Howard Hsu <howard-yh.hsu@mediatek.com>
+---
+ mt76.h | 2 +
+ mt76_connac_mcu.h | 1 +
+ mt7915/init.c | 1 +
+ mt7915/mac.c | 11 ++++
+ mt7915/main.c | 13 +++++
+ mt7915/mcu.c | 118 +++++++++++++++++++++++++++++++++++++++++++
+ mt7915/mcu.h | 4 ++
+ mt7915/mt7915.h | 13 +++++
+ mt7915/mtk_debugfs.c | 24 +++++++++
+ 9 files changed, 187 insertions(+)
+
+diff --git a/mt76.h b/mt76.h
+index 4704c50..c0fdbd6 100644
+--- a/mt76.h
++++ b/mt76.h
+@@ -310,6 +310,7 @@ struct mt76_sta_stats {
+ u64 tx_nss[4]; /* 1, 2, 3, 4 */
+ u64 tx_mcs[16]; /* mcs idx */
+ u64 tx_bytes;
++ u64 last_tx_bytes;
+ /* WED TX */
+ u32 tx_packets; /* unit: MSDU */
+ u32 tx_retries;
+@@ -319,6 +320,7 @@ struct mt76_sta_stats {
+ u32 rx_packets;
+ u32 rx_errors;
+ u32 rx_drops;
++ u64 last_rx_bytes;
+ };
+
+ enum mt76_wcid_flags {
+diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
+index bf5ab81..48874d1 100644
+--- a/mt76_connac_mcu.h
++++ b/mt76_connac_mcu.h
+@@ -1222,6 +1222,7 @@ enum {
+ MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d,
+ MCU_EXT_CMD_MWDS_SUPPORT = 0x80,
+ MCU_EXT_CMD_SET_SER_TRIGGER = 0x81,
++ MCU_EXT_CMD_SCS_FEATURE_CTRL = 0x82,
+ MCU_EXT_CMD_TWT_AGRT_UPDATE = 0x94,
+ MCU_EXT_CMD_FW_DBG_CTRL = 0x95,
+ MCU_EXT_CMD_OFFCH_SCAN_CTRL = 0x9a,
+diff --git a/mt7915/init.c b/mt7915/init.c
+index 53dea70..cab711c 100644
+--- a/mt7915/init.c
++++ b/mt7915/init.c
+@@ -1244,6 +1244,7 @@ int mt7915_register_device(struct mt7915_dev *dev)
+ spin_lock_init(&dev->phy.stats_lock);
+ INIT_WORK(&dev->rc_work, mt7915_mac_sta_rc_work);
+ INIT_DELAYED_WORK(&dev->mphy.mac_work, mt7915_mac_work);
++ INIT_DELAYED_WORK(&dev->scs_work, mt7915_mcu_scs_sta_poll);
+ INIT_LIST_HEAD(&dev->sta_rc_list);
+ INIT_LIST_HEAD(&dev->twt_list);
+
+diff --git a/mt7915/mac.c b/mt7915/mac.c
+index e5480ee..0e8c64e 100644
+--- a/mt7915/mac.c
++++ b/mt7915/mac.c
+@@ -1503,6 +1503,8 @@ mt7915_mac_full_reset(struct mt7915_dev *dev)
+ if (ext_phy)
+ cancel_delayed_work_sync(&ext_phy->mac_work);
+
++ cancel_delayed_work_sync(&dev->scs_work);
++
+ mutex_lock(&dev->mt76.mutex);
+ for (i = 0; i < 10; i++) {
+ if (!mt7915_mac_restart(dev))
+@@ -1528,6 +1530,10 @@ mt7915_mac_full_reset(struct mt7915_dev *dev)
+ ieee80211_queue_delayed_work(ext_phy->hw,
+ &ext_phy->mac_work,
+ MT7915_WATCHDOG_TIME);
++
++ if (mtk_wed_device_active(&dev->mt76.mmio.wed) &&
++ mtk_wed_get_rx_capa(&dev->mt76.mmio.wed))
++ ieee80211_queue_delayed_work(mt76_hw(dev), &dev->scs_work, HZ);
+ }
+
+ /* system error recovery */
+@@ -1592,6 +1598,7 @@ void mt7915_mac_reset_work(struct work_struct *work)
+ set_bit(MT76_RESET, &phy2->mt76->state);
+ cancel_delayed_work_sync(&phy2->mt76->mac_work);
+ }
++ cancel_delayed_work_sync(&dev->scs_work);
+ mt76_worker_disable(&dev->mt76.tx_worker);
+ mt76_for_each_q_rx(&dev->mt76, i)
+ napi_disable(&dev->mt76.napi[i]);
+@@ -1653,6 +1660,10 @@ void mt7915_mac_reset_work(struct work_struct *work)
+ &phy2->mt76->mac_work,
+ MT7915_WATCHDOG_TIME);
+
++ if (mtk_wed_device_active(&dev->mt76.mmio.wed) &&
++ mtk_wed_get_rx_capa(&dev->mt76.mmio.wed))
++ ieee80211_queue_delayed_work(mt76_hw(dev), &dev->scs_work, HZ);
++
+ dev_info(dev->mt76.dev,"\n%s L1 SER recovery completed.",
+ wiphy_name(dev->mt76.hw->wiphy));
+ }
+diff --git a/mt7915/main.c b/mt7915/main.c
+index 0318254..5be931b 100644
+--- a/mt7915/main.c
++++ b/mt7915/main.c
+@@ -95,12 +95,24 @@ int mt7915_run(struct ieee80211_hw *hw)
+ if (ret)
+ goto out;
+
++ /* Enable SCS if and only if WED Rx (2.0 and after) is supported. */
++ if (mtk_wed_device_active(&dev->mt76.mmio.wed) &&
++ mtk_wed_get_rx_capa(&dev->mt76.mmio.wed) &&
++ !mt76_testmode_enabled(phy->mt76)) {
++ ret = mt7915_mcu_set_scs_en(phy, true);
++ if (ret)
++ goto out;
++ }
++
+ set_bit(MT76_STATE_RUNNING, &phy->mt76->state);
+
+ if (!mt76_testmode_enabled(phy->mt76))
+ ieee80211_queue_delayed_work(hw, &phy->mt76->mac_work,
+ MT7915_WATCHDOG_TIME);
+
++ if (!running && phy->scs_ctrl.scs_enable)
++ ieee80211_queue_delayed_work(hw, &dev->scs_work, HZ);
++
+ if (!running)
+ mt7915_mac_reset_counters(phy);
+
+@@ -141,6 +153,7 @@ static void mt7915_stop(struct ieee80211_hw *hw)
+ }
+
+ if (!mt7915_dev_running(dev)) {
++ cancel_delayed_work_sync(&dev->scs_work);
+ mt76_connac_mcu_set_pm(&dev->mt76, dev->phy.mt76->band_idx, 1);
+ mt7915_mcu_set_mac(dev, dev->phy.mt76->band_idx, false, false);
+ }
+diff --git a/mt7915/mcu.c b/mt7915/mcu.c
+index 2b41feb..38679d2 100644
+--- a/mt7915/mcu.c
++++ b/mt7915/mcu.c
+@@ -5043,3 +5043,121 @@ int mt7915_mcu_sw_aci_set(struct mt7915_dev *dev, bool val)
+ return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(SWLNA_ACI_CTRL), &req,
+ sizeof(req), NULL);
+ }
++
++int mt7915_mcu_set_scs_en(struct mt7915_phy *phy, u8 enable)
++{
++ struct mt7915_dev *dev = phy->dev;
++ struct {
++ __le32 subcmd;
++ u8 band_idx;
++ u8 enable;
++ } __packed req = {
++ .subcmd = cpu_to_le32(SCS_ENABLE),
++ .band_idx = phy->mt76->band_idx,
++ .enable = enable + 1,
++ };
++
++ phy->scs_ctrl.scs_enable = !!enable;
++
++ return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(SCS_FEATURE_CTRL),
++ &req, sizeof(req), NULL);
++}
++
++void mt7915_sta_scs_para(void *data, struct ieee80211_sta *sta)
++{
++#define SCS_ACTIVE_STA_CRITERIA_2M 250000
++ struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
++ struct mt7915_phy *poll_phy = (struct mt7915_phy *)data;
++ u8 band_idx = msta->wcid.phy_idx;
++ s64 tx_bytes_last_sec, rx_bytes_last_sec;
++ u64 total_bytes_last_sec;
++
++ if (band_idx > MT_BAND1)
++ return;
++
++ tx_bytes_last_sec = (s64)msta->wcid.stats.tx_bytes -
++ (s64)msta->wcid.stats.last_tx_bytes;
++ rx_bytes_last_sec = (s64)msta->wcid.stats.rx_bytes -
++ (s64)msta->wcid.stats.last_rx_bytes;
++
++ /**
++ * Since wo reports rx stats every 900ms, it needs to be converted as
++ * statistics every one second.
++ */
++ rx_bytes_last_sec = rx_bytes_last_sec / 9 * 10;
++
++ poll_phy->scs_ctrl.tx_bytes_last_sec += tx_bytes_last_sec;
++ poll_phy->scs_ctrl.rx_bytes_last_sec += rx_bytes_last_sec;
++
++ total_bytes_last_sec = tx_bytes_last_sec + rx_bytes_last_sec;
++ if (total_bytes_last_sec > SCS_ACTIVE_STA_CRITERIA_2M) {
++ poll_phy->scs_ctrl.tput += total_bytes_last_sec >> 17;
++ poll_phy->scs_ctrl.active_sta++;
++ }
++
++ msta->wcid.stats.last_tx_bytes = msta->wcid.stats.tx_bytes;
++ msta->wcid.stats.last_rx_bytes = msta->wcid.stats.rx_bytes;
++
++ if (poll_phy->scs_ctrl.sta_min_rssi > msta->ack_signal)
++ poll_phy->scs_ctrl.sta_min_rssi = msta->ack_signal;
++}
++
++int mt7915_mcu_set_scs_stats(struct mt7915_phy *phy)
++{
++ struct mt7915_dev *dev = phy->dev;
++ struct {
++ __le32 subcmd;
++ u8 band_idx;
++ u8 active_sta;
++ __le16 tput;
++ bool rx_only_mode;
++ u8 __rsv;
++ s8 min_rssi;
++ } __packed req = {
++ .subcmd = cpu_to_le32(SCS_SEND_DATA),
++ .band_idx = phy->mt76->band_idx,
++ .active_sta = phy->scs_ctrl.active_sta,
++ .tput = cpu_to_le16(phy->scs_ctrl.tput),
++ .rx_only_mode = false,
++ .min_rssi = phy->scs_ctrl.sta_min_rssi,
++ };
++
++ /* Rx only mode is that Rx percentage is larger than 90% */
++ if (phy->scs_ctrl.tx_bytes_last_sec < phy->scs_ctrl.rx_bytes_last_sec / 9)
++ req.rx_only_mode = true;
++
++ return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(SCS_FEATURE_CTRL),
++ &req, sizeof(req), NULL);
++}
++
++void mt7915_mcu_scs_sta_poll(struct work_struct *work)
++{
++ struct mt7915_dev *dev = container_of(work, struct mt7915_dev,
++ scs_work.work);
++ struct mt7915_phy *phy;
++ bool scs_enable_flag = false;
++ u8 i;
++
++ for (i = MT_BAND0; i < MT_BAND2; i++) {
++ if (!dev->mt76.phys[i])
++ continue;
++
++ phy = dev->mt76.phys[i]->priv;
++ if (!phy->scs_ctrl.scs_enable ||
++ !test_bit(MT76_STATE_RUNNING, &phy->mt76->state))
++ continue;
++
++ ieee80211_iterate_stations_atomic(dev->mt76.phys[i]->hw,
++ mt7915_sta_scs_para, phy);
++
++ mt7915_mcu_set_scs_stats(phy);
++
++ memset(&phy->scs_ctrl, 0, sizeof(phy->scs_ctrl));
++ phy->scs_ctrl.scs_enable = true;
++
++ scs_enable_flag = true;
++ }
++
++ if (scs_enable_flag)
++ ieee80211_queue_delayed_work(mt76_hw(dev), &dev->scs_work, HZ);
++}
+diff --git a/mt7915/mcu.h b/mt7915/mcu.h
+index 6e6f320..723f23e 100644
+--- a/mt7915/mcu.h
++++ b/mt7915/mcu.h
+@@ -1188,4 +1188,8 @@ struct mt7915_mcu_edcca_info {
+ };
+ #endif
+
++enum {
++ SCS_SEND_DATA = 0,
++ SCS_ENABLE = 3,
++};
+ #endif
+diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
+index 47349b9..464eb3f 100644
+--- a/mt7915/mt7915.h
++++ b/mt7915/mt7915.h
+@@ -233,6 +233,15 @@ struct mt7915_air_monitor_ctrl {
+ };
+ #endif
+
++struct mt7915_scs_ctrl {
++ u64 tx_bytes_last_sec;
++ u64 rx_bytes_last_sec;
++ bool scs_enable;
++ s8 sta_min_rssi;
++ u16 tput;
++ u8 active_sta;
++};
++
+ struct mt7915_phy {
+ struct mt76_phy *mt76;
+ struct mt7915_dev *dev;
+@@ -306,6 +315,7 @@ struct mt7915_phy {
+
+ struct mt7915_air_monitor_ctrl amnt_ctrl;
+ #endif
++ struct mt7915_scs_ctrl scs_ctrl;
+ };
+
+ struct mt7915_dev {
+@@ -424,6 +434,7 @@ struct mt7915_dev {
+ } dbg;
+ const struct mt7915_dbg_reg_desc *dbg_reg;
+ #endif
++ struct delayed_work scs_work;
+ };
+
+ enum {
+@@ -746,6 +757,8 @@ int mt7915_mcu_sw_aci_set(struct mt7915_dev *dev, bool val);
+ int mt7915_mcu_ipi_hist_ctrl(struct mt7915_phy *phy, void *data, u8 cmd, bool wait_resp);
+ int mt7915_mcu_ipi_hist_scan(struct mt7915_phy *phy, void *data, u8 mode, bool wait_resp);
+ int mt7915_mcu_enable_obss_spr(struct mt7915_phy *phy, u8 action, u8 val);
++int mt7915_mcu_set_scs_en(struct mt7915_phy *phy, u8 enable);
++void mt7915_mcu_scs_sta_poll(struct work_struct *work);
+
+ #ifdef MTK_DEBUG
+ int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir);
+diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
+index 49fd6c5..d8e7589 100644
+--- a/mt7915/mtk_debugfs.c
++++ b/mt7915/mtk_debugfs.c
+@@ -3676,6 +3676,29 @@ mt7915_sr_enable_set(void *data, u64 val)
+ DEFINE_DEBUGFS_ATTRIBUTE(fops_sr_enable, NULL,
+ mt7915_sr_enable_set, "%llx\n");
+
++static int
++mt7915_scs_enable_set(void *data, u64 val)
++{
++ struct mt7915_phy *phy = data;
++ int ret;
++
++ /* Enable scs if and only if WED Rx (2.0 and after) is supported */
++ if (!mtk_wed_device_active(&phy->dev->mt76.mmio.wed) ||
++ !mtk_wed_get_rx_capa(&phy->dev->mt76.mmio.wed))
++ return 0;
++
++ ret = mt7915_mcu_set_scs_en(phy, (u8) val);
++ if (ret)
++ return ret;
++
++ if (phy->scs_ctrl.scs_enable)
++ ieee80211_queue_delayed_work(phy->mt76->hw, &phy->dev->scs_work, HZ);
++
++ return 0;
++}
++DEFINE_DEBUGFS_ATTRIBUTE(fops_scs_enable, NULL,
++ mt7915_scs_enable_set, "%lld\n");
++
+ int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir)
+ {
+ struct mt7915_dev *dev = phy->dev;
+@@ -3768,6 +3791,7 @@ int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir)
+ debugfs_create_file("sw_aci", 0600, dir, dev,
+ &fops_sw_aci);
+ debugfs_create_file("sr_enable", 0200, dir, phy, &fops_sr_enable);
++ debugfs_create_file("scs_enable", 0200, dir, phy, &fops_scs_enable);
+ return 0;
+ }
+ #endif
+--
+2.18.0
+