[rdkb][common][bsp][Refactor and sync wifi from openwrt]
[Description]
3a2eef0b [MAC80211][Release][Update release note for Filogic 880/860 MLO Beta release]
cfbd2411 [MAC80211][Release][Filogic 880/860 MLO Beta release]
6c180e3f [MAC80211][WiFi7][misc][Add Eagle BE14000 efem default bin]
a55f34db [MAC80211][Release][Prepare for Filogic 880/860 release]
5b45ebca [MAC80211][WiFi7][hostapd][Add puncture bitmap to ucode]
95bbea73 [MAC80211][WiFi6][mt76][Add PID to only report data-frame TX rate]
b15ced26 [MAC80211][WiFi6][hostapd][Fix DFS channel selection issue]
d59133cb [MAC80211][WiFi6][mt76][Fix pse info not correct information]
3921b4b2 [MAC80211][WiFi6][mt76][Fix incomplete QoS-map setting to FW]
4e7690c7 [MAC80211][WiFi6/7][app][Change ATECHANNEL mapping cmd]
eb37af90 [MAC80211][WiFi7][app][Add support for per-packet bw & primary selection]
0ea82adf [MAC80211][WiFi6][core][Fix DFS CAC issue after CSA]
[Release-log]
Change-Id: I9bec97ec1b2e1c49ed43a812a07a5b21fcbb70a6
diff --git a/recipes-wifi/linux-mt76/files/patches-3.x/0150-mtk-mt76-mt7996-Fix-inconsistent-QoS-mapping-between.patch b/recipes-wifi/linux-mt76/files/patches-3.x/0150-mtk-mt76-mt7996-Fix-inconsistent-QoS-mapping-between.patch
new file mode 100644
index 0000000..f185fed
--- /dev/null
+++ b/recipes-wifi/linux-mt76/files/patches-3.x/0150-mtk-mt76-mt7996-Fix-inconsistent-QoS-mapping-between.patch
@@ -0,0 +1,191 @@
+From ac20b6e9a96c45213a2bbccb051d16e4408f2969 Mon Sep 17 00:00:00 2001
+From: Rex Lu <rex.lu@mediatek.com>
+Date: Fri, 7 Jun 2024 13:51:25 +0800
+Subject: [PATCH 150/199] mtk: mt76: mt7996: Fix inconsistent QoS mapping
+ between SW and HW
+
+Fix inconsistent QoS mapping between SW and HW.
+Specifically, the mapping from IP DSCP to IEEE 802.11 user priority may be customized.
+Therefore, driver needs to pass the mapping to HW, so that the QoS type of traffic can be mapped in a consistent manner for both SW and HW paths.
+
+Refactor mt7996_mcu_set_qos_map function.
+1. According to fw logic, it will fill the dscp value 0~63 correspond tid.
+for example:
+The last set is 48-56 in the default qos map from hostapd.
+And it will set tid 7. but 57-63 in original function will not fill any value,
+so it will set zero to fw. Once the value of dscp is 57. mac80211 will correspond to tid 7.
+and fw will correspond to tid 0.
+
+Signed-off-by: Benjamin Lin <benjamin-jw.lin@mediatek.com>
+Signed-off-by: Rex Lu <rex.lu@mediatek.com>
+---
+ mt76_connac_mcu.h | 1 +
+ mt7996/main.c | 31 ++++++++++++++++++++++++++
+ mt7996/mcu.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++
+ mt7996/mt7996.h | 8 ++++++-
+ 4 files changed, 94 insertions(+), 1 deletion(-)
+
+diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
+index f7b1f0d0..0244b5aa 100644
+--- a/mt76_connac_mcu.h
++++ b/mt76_connac_mcu.h
+@@ -1262,6 +1262,7 @@ enum {
+ MCU_EXT_CMD_GROUP_PRE_CAL_INFO = 0xab,
+ MCU_EXT_CMD_DPD_PRE_CAL_INFO = 0xac,
+ MCU_EXT_CMD_PHY_STAT_INFO = 0xad,
++ MCU_EXT_CMD_SET_QOS_MAP = 0xb4,
+ };
+
+ enum {
+diff --git a/mt7996/main.c b/mt7996/main.c
+index b6231dff..3c12bd52 100644
+--- a/mt7996/main.c
++++ b/mt7996/main.c
+@@ -2365,6 +2365,9 @@ mt7996_net_fill_forward_path(struct ieee80211_hw *hw,
+
+ ctx->dev = NULL;
+
++ if (path->mtk_wdma.amsdu)
++ path->mtk_wdma.tid = mvif->qos_map[path->mtk_wdma.tid >> 2];
++
+ return 0;
+ }
+
+@@ -2794,6 +2797,33 @@ mt7996_event_callback(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ }
+ }
+
++static int
++mt7996_set_qos_map(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
++ struct cfg80211_qos_map *qos_map)
++{
++ struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
++ struct mt7996_dev *dev = mt7996_hw_dev(hw);
++ unsigned long valid_links = vif->valid_links ?: BIT(0);
++ unsigned int link_id;
++ int ret = 0;
++
++ mutex_lock(&dev->mt76.mutex);
++ for_each_set_bit(link_id, &valid_links, IEEE80211_MLD_MAX_NUM_LINKS) {
++ struct mt7996_bss_conf *mconf =
++ mconf_dereference_protected(mvif, link_id);
++
++ if (!mconf)
++ continue;
++
++ ret = mt7996_mcu_set_qos_map(dev, mconf, qos_map);
++ if(ret)
++ break;
++ }
++ mutex_unlock(&dev->mt76.mutex);
++
++ return ret;
++}
++
+ const struct ieee80211_ops mt7996_ops = {
+ .add_chanctx = ieee80211_emulate_add_chanctx,
+ .remove_chanctx = ieee80211_emulate_remove_chanctx,
+@@ -2861,4 +2891,5 @@ const struct ieee80211_ops mt7996_ops = {
+ .switch_vif_chanctx = mt7996_switch_vif_chanctx,
+ .change_vif_links = mt7996_change_vif_links,
+ .change_sta_links = mt7996_change_sta_links,
++ .set_qos_map = mt7996_set_qos_map,
+ };
+diff --git a/mt7996/mcu.c b/mt7996/mcu.c
+index db388e66..51f15928 100644
+--- a/mt7996/mcu.c
++++ b/mt7996/mcu.c
+@@ -6667,4 +6667,59 @@ int mt7996_mcu_set_csi(struct mt7996_phy *phy, u8 mode,
+ return -EINVAL;
+ }
+ }
++
++int mt7996_mcu_set_qos_map(struct mt7996_dev *dev, struct mt7996_bss_conf *mconf,
++ struct cfg80211_qos_map *usr_qos_map)
++{
++ struct {
++ u8 bss_idx;
++ u8 qos_map_enable;
++ u8 __rsv[2];
++ s8 qos_map[IP_DSCP_NUM];
++ } __packed req = {
++ .bss_idx = mconf->mt76.idx,
++ .qos_map_enable = true,
++ };
++ s8 i;
++
++ /* Default QoS map, defined in section 2.3 of RFC8325.
++ * Three most significant bits of DSCP are used as UP.
++ */
++ for (i = 0; i < IP_DSCP_NUM; ++i)
++ req.qos_map[i] = i >> 3;
++
++ /* Recommended QoS map, defined in section 4 of RFC8325.
++ * Used in cfg80211_classify8021d since kernel v6.8.
++ */
++ req.qos_map[10] = req.qos_map[12] = req.qos_map[14] = req.qos_map[16] = 0;
++ req.qos_map[18] = req.qos_map[20] = req.qos_map[22] = 3;
++ req.qos_map[24] = 4;
++ req.qos_map[40] = 5;
++ req.qos_map[44] = req.qos_map[46] = 6;
++ req.qos_map[48] = 7;
++
++ /* User-defined QoS map */
++ if (usr_qos_map) {
++ for (i = 0; i < IEEE80211_NUM_UPS; ++i) {
++ u8 low = usr_qos_map->up[i].low;
++ u8 high = usr_qos_map->up[i].high;
++
++ if (low < IP_DSCP_NUM && high < IP_DSCP_NUM && low <= high)
++ memset(req.qos_map + low, i, high - low + 1);
++ }
++
++ for (i = 0; i < usr_qos_map->num_des; ++i) {
++ u8 dscp = usr_qos_map->dscp_exception[i].dscp;
++ u8 up = usr_qos_map->dscp_exception[i].up;
++
++ if (dscp < IP_DSCP_NUM && up < IEEE80211_NUM_UPS)
++ req.qos_map[dscp] = up;
++ }
++ }
++
++ memcpy(mconf->vif->qos_map, req.qos_map, IP_DSCP_NUM);
++
++ return mt76_mcu_send_msg(&dev->mt76, MCU_WA_EXT_CMD(SET_QOS_MAP), &req,
++ sizeof(req), false);
++}
+ #endif
+diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h
+index dc0209de..302ac7bf 100644
+--- a/mt7996/mt7996.h
++++ b/mt7996/mt7996.h
+@@ -134,6 +134,8 @@
+ #define MT7996_MAX_PROBE_TIMEOUT 500
+ #define MT7996_MAX_PROBE_TRIES 2
+
++#define IP_DSCP_NUM 64
++
+ struct mt7996_vif;
+ struct mt7996_sta;
+ struct mt7996_dfs_pulse;
+@@ -376,6 +378,9 @@ struct mt7996_vif {
+ void *probe[__MT_MAX_BAND];
+ unsigned long probe_send_time[__MT_MAX_BAND];
+ int probe_send_count[__MT_MAX_BAND];
++
++ /* QoS map support */
++ u8 qos_map[IP_DSCP_NUM];
+ };
+
+ /* crash-dump */
+@@ -1333,5 +1338,6 @@ int mt7996_mcu_mlo_agc(struct mt7996_dev *dev, const void *data, int len);
+ #ifdef CONFIG_NET_MEDIATEK_SOC_WED
+ int mt7996_dma_rro_init(struct mt7996_dev *dev);
+ #endif /* CONFIG_NET_MEDIATEK_SOC_WED */
+-
++int mt7996_mcu_set_qos_map(struct mt7996_dev *dev, struct mt7996_bss_conf *mconf,
++ struct cfg80211_qos_map *usr_qos_map);
+ #endif
+--
+2.18.0
+