[rdkb][common][bsp][Refactor and sync wifi from openwrt]
[Description]
efe66c5 [mac80211][rebase patches][fix build error]
af9a941 [MAC80211][rebase patches][Filogic 830 MP3.0 release update]
e523662 [MAC80211][Rebase Patches][Fix git am fail]
b79cb34 [MAC80211][core][Fix max_bssid_indicator variable]
8b7450b [MAC80211][misc][Refactor patches]
ae844f0 [MAC80211][mt76][Fix incorrect HE TX GI report]
0ae3b98 [MAC80211][misc][Refactor patch]
11aed5b [MAC80211][mt76][Fix the beamformer issue]
1901608 [[MAC80211][misc] increase beacon loss count from 7 to 20]
6a39cde [mac80211][mt76][stop dma tx in ser flow]
c5c7657 [MAC80211][mt76][Update bss offload size]
02c6169 [MAC80211][mt76][Fix low throughput on software path with wed enable]
[Release-log]
Change-Id: Ifcf9d01cc294554ed954479fce579d0810ad43e5
diff --git a/recipes-wifi/linux-mt76/files/patches/3008-wifi-mt76-get-tx-count-and-tx-failed-from-mcu-comman.patch b/recipes-wifi/linux-mt76/files/patches/3008-wifi-mt76-get-tx-count-and-tx-failed-from-mcu-comman.patch
index f5a9398..b989b63 100644
--- a/recipes-wifi/linux-mt76/files/patches/3008-wifi-mt76-get-tx-count-and-tx-failed-from-mcu-comman.patch
+++ b/recipes-wifi/linux-mt76/files/patches/3008-wifi-mt76-get-tx-count-and-tx-failed-from-mcu-comman.patch
@@ -1,7 +1,7 @@
-From eb824d2b3b30afc97387d9f94e6e5b075cc9c843 Mon Sep 17 00:00:00 2001
+From 03ed3a6af6c489136ead033dfbfe6b3a67e208c0 Mon Sep 17 00:00:00 2001
From: Peter Chiu <chui-hao.chiu@mediatek.com>
Date: Wed, 11 Jan 2023 10:56:27 +0800
-Subject: [PATCH 3008/3012] wifi: mt76: get tx count and tx failed from mcu
+Subject: [PATCH 3008/3013] wifi: mt76: get tx count and tx failed from mcu
command
---
@@ -10,15 +10,15 @@
mt76_connac_mcu.h | 1 +
mt7915/main.c | 8 ++--
mt7915/mcu.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++
- mt7915/mcu.h | 22 ++++++++++
+ mt7915/mcu.h | 21 ++++++++-
mt7915/mt7915.h | 1 +
- 7 files changed, 138 insertions(+), 5 deletions(-)
+ 7 files changed, 136 insertions(+), 6 deletions(-)
diff --git a/mt76.h b/mt76.h
-index f95a73cf..d17650d0 100644
+index c7bd147..ee7e1b1 100644
--- a/mt76.h
+++ b/mt76.h
-@@ -285,6 +285,7 @@ struct mt76_sta_stats {
+@@ -289,6 +289,7 @@ struct mt76_sta_stats {
u64 tx_bytes;
/* WED TX */
u32 tx_packets; /* unit: MSDU */
@@ -27,7 +27,7 @@
u32 tx_failed;
/* WED RX */
diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index 1816bcbc..abcb9a27 100644
+index 1816bcb..abcb9a2 100644
--- a/mt76_connac_mac.c
+++ b/mt76_connac_mac.c
@@ -579,8 +579,6 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
@@ -40,7 +40,7 @@
le32_get_bits(txs_data[7], MT_TXS7_MPDU_RETRY_CNT);
diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index dd7ee32f..b80a1011 100644
+index dd7ee32..b80a101 100644
--- a/mt76_connac_mcu.h
+++ b/mt76_connac_mcu.h
@@ -1160,6 +1160,7 @@ enum {
@@ -52,10 +52,10 @@
MCU_EXT_CMD_SET_DRR_CTRL = 0x36,
MCU_EXT_CMD_SET_FEATURE_CTRL = 0x38,
diff --git a/mt7915/main.c b/mt7915/main.c
-index 4c9090a4..e7c3bc04 100644
+index 64709e1..3074091 100644
--- a/mt7915/main.c
+++ b/mt7915/main.c
-@@ -1103,9 +1103,6 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
+@@ -1118,9 +1118,6 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
sinfo->tx_bytes = msta->wcid.stats.tx_bytes;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64);
@@ -65,7 +65,7 @@
sinfo->tx_retries = msta->wcid.stats.tx_retries;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_RETRIES);
-@@ -1123,6 +1120,11 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
+@@ -1138,6 +1135,11 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);
}
@@ -78,10 +78,10 @@
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_ACK_SIGNAL);
diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 8e340f5b..58b884ca 100644
+index fd72eba..083034e 100644
--- a/mt7915/mcu.c
+++ b/mt7915/mcu.c
-@@ -4148,6 +4148,114 @@ out:
+@@ -4258,6 +4258,114 @@ out:
return ret;
}
@@ -197,10 +197,20 @@
struct cfg80211_he_bss_color *he_bss_color)
{
diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 768c7d74..ce02bd9b 100644
+index f91f4bc..73e2957 100644
--- a/mt7915/mcu.h
+++ b/mt7915/mcu.h
-@@ -1017,6 +1017,28 @@ struct mt7915_muru {
+@@ -778,7 +778,8 @@ mt7915_get_power_bound(struct mt7915_phy *phy, s8 txpower)
+ }
+
+ enum {
+- MCU_GET_TX_RATE = 4
++ MCU_GET_TX_RATE = 4,
++ MCU_GET_TX_STAT_CNT = 8
+ };
+
+ #ifdef CONFIG_MTK_VENDOR
+@@ -1056,6 +1057,24 @@ struct mt7915_muru {
/* DL&UL User config */
#define MURU_USER_CNT BIT(4)
@@ -222,18 +232,14 @@
+ __le32 tx_failed;
+};
+
-+enum {
-+ MCU_GET_TX_STAT_CNT = 8,
-+};
-+
enum {
CAPI_SU,
CAPI_MU,
diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 80d6a43c..66dd79f3 100644
+index 943253c..4879130 100644
--- a/mt7915/mt7915.h
+++ b/mt7915/mt7915.h
-@@ -716,6 +716,7 @@ int mt7915_mcu_set_thermal_protect(struct mt7915_phy *phy);
+@@ -723,6 +723,7 @@ int mt7915_mcu_get_tx_rate(struct mt7915_phy *phy, u16 wcidx);
int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,
struct ieee80211_sta *sta, struct rate_info *rate);
int mt7915_mcu_get_tx_stat_wa(struct mt7915_dev *dev, u16 wcid);
@@ -242,5 +248,5 @@
struct cfg80211_chan_def *chandef);
int mt7915_mcu_rf_regval(struct mt7915_dev *dev, u32 regidx, u32 *val, bool set);
--
-2.39.0
+2.18.0