projects / openwrt / staging / stintel.git / blob
? search:


43fbffc51b8783b30b40b0686754f0ab3c1c3d8e
[openwrt/staging/stintel.git] /
1 From 25ce45fe40b574e5d7ffa407f7f2db03e7d5a910 Mon Sep 17 00:00:00 2001
2 From: Daniel Golle <daniel@makrotopia.org>
3 Date: Tue, 22 Aug 2023 17:32:54 +0100
4 Subject: [PATCH 112/250] net: ethernet: mtk_eth_soc: add support for in-SoC
5 SRAM
6
7 MT7981, MT7986 and MT7988 come with in-SoC SRAM dedicated for Ethernet
8 DMA rings. Support using the SRAM without breaking existing device tree
9 bindings, ie. only new SoC starting from MT7988 will have the SRAM
10 declared as additional resource in device tree. For MT7981 and MT7986
11 an offset on top of the main I/O base is used.
12
13 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
14 Link: https://lore.kernel.org/r/e45e0f230c63ad58869e8fe35b95a2fb8925b625.1692721443.git.daniel@makrotopia.org
15 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
16 ---
17 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 88 ++++++++++++++++-----
18 drivers/net/ethernet/mediatek/mtk_eth_soc.h | 12 ++-
19 2 files changed, 78 insertions(+), 22 deletions(-)
20
21 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
22 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
23 @@ -1119,10 +1119,13 @@ static int mtk_init_fq_dma(struct mtk_et
24 dma_addr_t dma_addr;
25 int i;
26
27 - eth->scratch_ring = dma_alloc_coherent(eth->dma_dev,
28 - cnt * soc->txrx.txd_size,
29 - &eth->phy_scratch_ring,
30 - GFP_KERNEL);
31 + if (MTK_HAS_CAPS(eth->soc->caps, MTK_SRAM))
32 + eth->scratch_ring = eth->sram_base;
33 + else
34 + eth->scratch_ring = dma_alloc_coherent(eth->dma_dev,
35 + cnt * soc->txrx.txd_size,
36 + &eth->phy_scratch_ring,
37 + GFP_KERNEL);
38 if (unlikely(!eth->scratch_ring))
39 return -ENOMEM;
40
41 @@ -2430,8 +2433,14 @@ static int mtk_tx_alloc(struct mtk_eth *
42 if (!ring->buf)
43 goto no_tx_mem;
44
45 - ring->dma = dma_alloc_coherent(eth->dma_dev, ring_size * sz,
46 - &ring->phys, GFP_KERNEL);
47 + if (MTK_HAS_CAPS(soc->caps, MTK_SRAM)) {
48 + ring->dma = eth->sram_base + ring_size * sz;
49 + ring->phys = eth->phy_scratch_ring + ring_size * (dma_addr_t)sz;
50 + } else {
51 + ring->dma = dma_alloc_coherent(eth->dma_dev, ring_size * sz,
52 + &ring->phys, GFP_KERNEL);
53 + }
54 +
55 if (!ring->dma)
56 goto no_tx_mem;
57
58 @@ -2530,8 +2539,7 @@ static void mtk_tx_clean(struct mtk_eth
59 kfree(ring->buf);
60 ring->buf = NULL;
61 }
62 -
63 - if (ring->dma) {
64 + if (!MTK_HAS_CAPS(soc->caps, MTK_SRAM) && ring->dma) {
65 dma_free_coherent(eth->dma_dev,
66 ring->dma_size * soc->txrx.txd_size,
67 ring->dma, ring->phys);
68 @@ -2550,9 +2558,14 @@ static int mtk_rx_alloc(struct mtk_eth *
69 {
70 const struct mtk_reg_map *reg_map = eth->soc->reg_map;
71 struct mtk_rx_ring *ring;
72 - int rx_data_len, rx_dma_size;
73 + int rx_data_len, rx_dma_size, tx_ring_size;
74 int i;
75
76 + if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
77 + tx_ring_size = MTK_QDMA_RING_SIZE;
78 + else
79 + tx_ring_size = MTK_DMA_SIZE;
80 +
81 if (rx_flag == MTK_RX_FLAGS_QDMA) {
82 if (ring_no)
83 return -EINVAL;
84 @@ -2587,9 +2600,20 @@ static int mtk_rx_alloc(struct mtk_eth *
85 ring->page_pool = pp;
86 }
87
88 - ring->dma = dma_alloc_coherent(eth->dma_dev,
89 - rx_dma_size * eth->soc->txrx.rxd_size,
90 - &ring->phys, GFP_KERNEL);
91 + if (!MTK_HAS_CAPS(eth->soc->caps, MTK_SRAM) ||
92 + rx_flag != MTK_RX_FLAGS_NORMAL) {
93 + ring->dma = dma_alloc_coherent(eth->dma_dev,
94 + rx_dma_size * eth->soc->txrx.rxd_size,
95 + &ring->phys, GFP_KERNEL);
96 + } else {
97 + struct mtk_tx_ring *tx_ring = &eth->tx_ring;
98 +
99 + ring->dma = tx_ring->dma + tx_ring_size *
100 + eth->soc->txrx.txd_size * (ring_no + 1);
101 + ring->phys = tx_ring->phys + tx_ring_size *
102 + eth->soc->txrx.txd_size * (ring_no + 1);
103 + }
104 +
105 if (!ring->dma)
106 return -ENOMEM;
107
108 @@ -2674,7 +2698,7 @@ static int mtk_rx_alloc(struct mtk_eth *
109 return 0;
110 }
111
112 -static void mtk_rx_clean(struct mtk_eth *eth, struct mtk_rx_ring *ring)
113 +static void mtk_rx_clean(struct mtk_eth *eth, struct mtk_rx_ring *ring, bool in_sram)
114 {
115 int i;
116
117 @@ -2697,7 +2721,7 @@ static void mtk_rx_clean(struct mtk_eth
118 ring->data = NULL;
119 }
120
121 - if (ring->dma) {
122 + if (!in_sram && ring->dma) {
123 dma_free_coherent(eth->dma_dev,
124 ring->dma_size * eth->soc->txrx.rxd_size,
125 ring->dma, ring->phys);
126 @@ -3057,7 +3081,7 @@ static void mtk_dma_free(struct mtk_eth
127 for (i = 0; i < MTK_MAX_DEVS; i++)
128 if (eth->netdev[i])
129 netdev_reset_queue(eth->netdev[i]);
130 - if (eth->scratch_ring) {
131 + if (!MTK_HAS_CAPS(soc->caps, MTK_SRAM) && eth->scratch_ring) {
132 dma_free_coherent(eth->dma_dev,
133 MTK_QDMA_RING_SIZE * soc->txrx.txd_size,
134 eth->scratch_ring, eth->phy_scratch_ring);
135 @@ -3065,13 +3089,13 @@ static void mtk_dma_free(struct mtk_eth
136 eth->phy_scratch_ring = 0;
137 }
138 mtk_tx_clean(eth);
139 - mtk_rx_clean(eth, &eth->rx_ring[0]);
140 - mtk_rx_clean(eth, &eth->rx_ring_qdma);
141 + mtk_rx_clean(eth, &eth->rx_ring[0], MTK_HAS_CAPS(soc->caps, MTK_SRAM));
142 + mtk_rx_clean(eth, &eth->rx_ring_qdma, false);
143
144 if (eth->hwlro) {
145 mtk_hwlro_rx_uninit(eth);
146 for (i = 1; i < MTK_MAX_RX_RING_NUM; i++)
147 - mtk_rx_clean(eth, &eth->rx_ring[i]);
148 + mtk_rx_clean(eth, &eth->rx_ring[i], false);
149 }
150
151 kfree(eth->scratch_head);
152 @@ -4639,7 +4663,7 @@ static int mtk_sgmii_init(struct mtk_eth
153
154 static int mtk_probe(struct platform_device *pdev)
155 {
156 - struct resource *res = NULL;
157 + struct resource *res = NULL, *res_sram;
158 struct device_node *mac_np;
159 struct mtk_eth *eth;
160 int err, i;
161 @@ -4659,6 +4683,20 @@ static int mtk_probe(struct platform_dev
162 if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
163 eth->ip_align = NET_IP_ALIGN;
164
165 + if (MTK_HAS_CAPS(eth->soc->caps, MTK_SRAM)) {
166 + /* SRAM is actual memory and supports transparent access just like DRAM.
167 + * Hence we don't require __iomem being set and don't need to use accessor
168 + * functions to read from or write to SRAM.
169 + */
170 + if (mtk_is_netsys_v3_or_greater(eth)) {
171 + eth->sram_base = (void __force *)devm_platform_ioremap_resource(pdev, 1);
172 + if (IS_ERR(eth->sram_base))
173 + return PTR_ERR(eth->sram_base);
174 + } else {
175 + eth->sram_base = (void __force *)eth->base + MTK_ETH_SRAM_OFFSET;
176 + }
177 + }
178 +
179 spin_lock_init(&eth->page_lock);
180 spin_lock_init(&eth->tx_irq_lock);
181 spin_lock_init(&eth->rx_irq_lock);
182 @@ -4722,6 +4760,18 @@ static int mtk_probe(struct platform_dev
183 err = -EINVAL;
184 goto err_destroy_sgmii;
185 }
186 + if (MTK_HAS_CAPS(eth->soc->caps, MTK_SRAM)) {
187 + if (mtk_is_netsys_v3_or_greater(eth)) {
188 + res_sram = platform_get_resource(pdev, IORESOURCE_MEM, 1);
189 + if (!res_sram) {
190 + err = -EINVAL;
191 + goto err_destroy_sgmii;
192 + }
193 + eth->phy_scratch_ring = res_sram->start;
194 + } else {
195 + eth->phy_scratch_ring = res->start + MTK_ETH_SRAM_OFFSET;
196 + }
197 + }
198 }
199
200 if (eth->soc->offload_version) {
201 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
202 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
203 @@ -139,6 +139,9 @@
204 #define MTK_GDMA_MAC_ADRH(x) ({ typeof(x) _x = (x); (_x == MTK_GMAC3_ID) ? \
205 0x54C : 0x50C + (_x * 0x1000); })
206
207 +/* Internal SRAM offset */
208 +#define MTK_ETH_SRAM_OFFSET 0x40000
209 +
210 /* FE global misc reg*/
211 #define MTK_FE_GLO_MISC 0x124
212
213 @@ -938,6 +941,7 @@ enum mkt_eth_capabilities {
214 MTK_RSTCTRL_PPE1_BIT,
215 MTK_RSTCTRL_PPE2_BIT,
216 MTK_U3_COPHY_V2_BIT,
217 + MTK_SRAM_BIT,
218
219 /* MUX BITS*/
220 MTK_ETH_MUX_GDM1_TO_GMAC1_ESW_BIT,
221 @@ -973,6 +977,7 @@ enum mkt_eth_capabilities {
222 #define MTK_RSTCTRL_PPE1 BIT_ULL(MTK_RSTCTRL_PPE1_BIT)
223 #define MTK_RSTCTRL_PPE2 BIT_ULL(MTK_RSTCTRL_PPE2_BIT)
224 #define MTK_U3_COPHY_V2 BIT_ULL(MTK_U3_COPHY_V2_BIT)
225 +#define MTK_SRAM BIT_ULL(MTK_SRAM_BIT)
226
227 #define MTK_ETH_MUX_GDM1_TO_GMAC1_ESW \
228 BIT_ULL(MTK_ETH_MUX_GDM1_TO_GMAC1_ESW_BIT)
229 @@ -1048,14 +1053,14 @@ enum mkt_eth_capabilities {
230 #define MT7981_CAPS (MTK_GMAC1_SGMII | MTK_GMAC2_SGMII | MTK_GMAC2_GEPHY | \
231 MTK_MUX_GMAC12_TO_GEPHY_SGMII | MTK_QDMA | \
232 MTK_MUX_U3_GMAC2_TO_QPHY | MTK_U3_COPHY_V2 | \
233 - MTK_RSTCTRL_PPE1)
234 + MTK_RSTCTRL_PPE1 | MTK_SRAM)
235
236 #define MT7986_CAPS (MTK_GMAC1_SGMII | MTK_GMAC2_SGMII | \
237 MTK_MUX_GMAC12_TO_GEPHY_SGMII | MTK_QDMA | \
238 - MTK_RSTCTRL_PPE1)
239 + MTK_RSTCTRL_PPE1 | MTK_SRAM)
240
241 #define MT7988_CAPS (MTK_GDM1_ESW | MTK_QDMA | MTK_RSTCTRL_PPE1 | \
242 - MTK_RSTCTRL_PPE2)
243 + MTK_RSTCTRL_PPE2 | MTK_SRAM)
244
245 struct mtk_tx_dma_desc_info {
246 dma_addr_t addr;
247 @@ -1215,6 +1220,7 @@ struct mtk_eth {
248 struct device *dev;
249 struct device *dma_dev;
250 void __iomem *base;
251 + void *sram_base;
252 spinlock_t page_lock;
253 spinlock_t tx_irq_lock;
254 spinlock_t rx_irq_lock;
Staging tree of Stijn Tintel