Gitiles
Code Review Sign In
git01.mediatek.com / openwrt / feeds / mtk-openwrt-feeds / f6302352f5439c041e900af466926053412b0aa5 / . / autobuild_mac80211_release / mt7988_mt7996_mac80211 / package / kernel / mt76 / patches / 2999-wifi-mt76-mt7996-support-backaward-compatiable.patch
blob: a6ffa601ff7514db727132fabca1c0b32d45b018 [file] [log] [blame]
developer7e2761e2023-10-12 08:11:13 +0800[diff] [blame]1From 52c4cb0df8974126a52d907070fcd3205eb21c28 Mon Sep 17 00:00:00 2001
2From: mtk27745 <rex.lu@mediatek.com>
3Date: Fri, 6 Oct 2023 20:59:42 +0800
4Subject: [PATCH 79/98] wifi: mt76: mt7996: support backaward compatiable
5
6---
7 mmio.c | 2 +-
8 mt7996/dma.c | 2 +-
9 mt7996/main.c | 2 +-
10 mt7996/mcu.c | 2 +-
11 mt7996/mmio.c | 20 +++++++++++---------
12 mt7996/mt7996.h | 1 +
13 6 files changed, 16 insertions(+), 13 deletions(-)
14
15diff --git a/mmio.c b/mmio.c
16index 22629af..aa6fe45 100644
17--- a/mmio.c
18+++ b/mmio.c
19@@ -134,7 +134,7 @@ EXPORT_SYMBOL_GPL(mt76_mmio_wed_release_rx_buf);
20 u32 mt76_mmio_wed_init_rx_buf(struct mtk_wed_device *wed, int size)
21 {
22 struct mt76_dev *dev = container_of(wed, struct mt76_dev, mmio.wed);
23- struct mtk_wed_bm_desc *desc = wed->rx_buf_ring.desc;
24+ struct mtk_rxbm_desc *desc = wed->rx_buf_ring.desc;
25 u32 length;
26 int i;
27
28diff --git a/mt7996/dma.c b/mt7996/dma.c
29index 1163550..326fd4b 100644
30--- a/mt7996/dma.c
31+++ b/mt7996/dma.c
32@@ -430,7 +430,7 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev)
33 irq_mask = mdev->mmio.irqmask | MT_INT_RRO_RX_DONE |
34 MT_INT_TX_DONE_BAND2;
35 mt76_wr(dev, MT_INT_MASK_CSR, irq_mask);
36- mtk_wed_device_start_hw_rro(&mdev->mmio.wed, irq_mask, false);
37+ mtk_wed_device_start_hwrro(&mdev->mmio.wed, irq_mask, false);
38 mt7996_irq_enable(dev, irq_mask);
39
40 return 0;
41diff --git a/mt7996/main.c b/mt7996/main.c
42index 2e0b1f1..44612e9 100644
43--- a/mt7996/main.c
44+++ b/mt7996/main.c
45@@ -1545,7 +1545,7 @@ mt7996_net_fill_forward_path(struct ieee80211_hw *hw,
46 path->mtk_wdma.queue = 0;
47 path->mtk_wdma.wcid = msta->wcid.idx;
48
49- path->mtk_wdma.amsdu = mtk_wed_is_amsdu_supported(wed);
50+ path->mtk_wdma.amsdu_en = mtk_wed_device_support_pao(wed);
51 ctx->dev = NULL;
52
53 return 0;
54diff --git a/mt7996/mcu.c b/mt7996/mcu.c
55index 1915a22..ea52e09 100644
56--- a/mt7996/mcu.c
57+++ b/mt7996/mcu.c
58@@ -3171,7 +3171,7 @@ static int mt7996_mcu_wa_red_config(struct mt7996_dev *dev)
59
60 if (!mtk_wed_device_active(&dev->mt76.mmio.wed))
61 req.token_per_src[RED_TOKEN_SRC_CNT - 1] =
62- cpu_to_le16(MT7996_TOKEN_SIZE - MT7996_HW_TOKEN_SIZE);
63+ cpu_to_le16(MT7996_SW_TOKEN_SIZE);
64
65 return mt76_mcu_send_msg(&dev->mt76, MCU_WA_PARAM_CMD(SET),
66 &req, sizeof(req), false);
67diff --git a/mt7996/mmio.c b/mt7996/mmio.c
68index 38b8843..ab7e58e 100644
69--- a/mt7996/mmio.c
70+++ b/mt7996/mmio.c
71@@ -14,7 +14,7 @@
72 #include "../trace.h"
73 #include "../dma.h"
74
75-static bool wed_enable;
76+static bool wed_enable = true;
77 module_param(wed_enable, bool, 0644);
78
79 static const struct __base mt7996_reg_base[] = {
80@@ -360,14 +360,14 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
81 }
82
83 wed->wlan.wpdma_rx_glo = wed->wlan.phy_base + hif1_ofs + MT_WFDMA0_GLO_CFG;
84- wed->wlan.wpdma_rx = wed->wlan.phy_base + hif1_ofs +
85+ wed->wlan.wpdma_rx[0] = wed->wlan.phy_base + hif1_ofs +
86 MT_RXQ_RING_BASE(MT7996_RXQ_BAND0) +
87 MT7996_RXQ_BAND0 * MT_RING_SIZE;
88
89- wed->wlan.id = 0x7991;
90+ wed->wlan.chip_id = 0x7991;
91 wed->wlan.tx_tbit[0] = ffs(MT_INT_TX_DONE_BAND2) - 1;
92 } else {
93- wed->wlan.hw_rro = dev->has_rro; /* default on */
94+ wed->wlan.hwrro = dev->has_rro; /* default on */
95 wed->wlan.wpdma_int = wed->wlan.phy_base + MT_INT_SOURCE_CSR;
96 wed->wlan.wpdma_mask = wed->wlan.phy_base + MT_INT_MASK_CSR;
97 wed->wlan.wpdma_tx = wed->wlan.phy_base + MT_TXQ_RING_BASE(0) +
98@@ -375,7 +375,7 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
99
100 wed->wlan.wpdma_rx_glo = wed->wlan.phy_base + MT_WFDMA0_GLO_CFG;
101
102- wed->wlan.wpdma_rx = wed->wlan.phy_base +
103+ wed->wlan.wpdma_rx[0] = wed->wlan.phy_base +
104 MT_RXQ_RING_BASE(MT7996_RXQ_BAND0) +
105 MT7996_RXQ_BAND0 * MT_RING_SIZE;
106
107@@ -417,11 +417,11 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
108 dev->mt76.rx_token_size = MT7996_TOKEN_SIZE + wed->wlan.rx_npkt;
109 }
110
111- wed->wlan.nbuf = MT7996_HW_TOKEN_SIZE;
112- wed->wlan.token_start = MT7996_TOKEN_SIZE - wed->wlan.nbuf;
113+ wed->wlan.nbuf = MT7996_TOKEN_SIZE;
114+ wed->wlan.token_start = 0;
115
116- wed->wlan.amsdu_max_subframes = 8;
117- wed->wlan.amsdu_max_len = 1536;
118+ wed->wlan.max_amsdu_nums = 8;
119+ wed->wlan.max_amsdu_len = 1536;
120
121 wed->wlan.init_buf = mt7996_wed_init_buf;
122 wed->wlan.init_rx_buf = mt76_mmio_wed_init_rx_buf;
123@@ -442,6 +442,8 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
124 *irq = wed->irq;
125 dev->mt76.dma_dev = wed->dev;
126
127+ dev->mt76.token_size = MT7996_SW_TOKEN_SIZE;
128+
129 return 1;
130 #else
131 return 0;
132diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h
133index ba73520..55a4087 100644
134--- a/mt7996/mt7996.h
135+++ b/mt7996/mt7996.h
136@@ -67,6 +67,7 @@
137 #define MT7996_EEPROM_BLOCK_SIZE 16
138 #define MT7996_TOKEN_SIZE 16384
139 #define MT7996_HW_TOKEN_SIZE 8192
140+#define MT7996_SW_TOKEN_SIZE 1024
141
142 #define MT7996_CFEND_RATE_DEFAULT 0x49 /* OFDM 24M */
143 #define MT7996_CFEND_RATE_11B 0x03 /* 11B LP, 11M */
144--
1452.18.0
146