enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/usb/mtu3/mtu3_qmu.c
..
..
@@ -22,17 +22,49 @@
22
22
 #include <linux/iopoll.h>
23
23
 
24
24
 #include "mtu3.h"
25
+#include "mtu3_trace.h"
25
26
 
26
27
 #define QMU_CHECKSUM_LEN	16
27
28
 
28
29
 #define GPD_FLAGS_HWO	BIT(0)
29
30
 #define GPD_FLAGS_BDP	BIT(1)
30
31
 #define GPD_FLAGS_BPS	BIT(2)
32
+#define GPD_FLAGS_ZLP	BIT(6)
31
33
 #define GPD_FLAGS_IOC	BIT(7)
34
+#define GET_GPD_HWO(gpd)	(le32_to_cpu((gpd)->dw0_info) & GPD_FLAGS_HWO)
32
35
 
33
-#define GPD_EXT_FLAG_ZLP	BIT(5)
34
-#define GPD_EXT_NGP(x)		(((x) & 0xf) << 4)
35
-#define GPD_EXT_BUF(x)		(((x) & 0xf) << 0)
36
+#define GPD_RX_BUF_LEN_OG(x)	(((x) & 0xffff) << 16)
37
+#define GPD_RX_BUF_LEN_EL(x)	(((x) & 0xfffff) << 12)
38
+#define GPD_RX_BUF_LEN(mtu, x)	\
39
+({				\
40
+	typeof(x) x_ = (x);	\
41
+	((mtu)->gen2cp) ? GPD_RX_BUF_LEN_EL(x_) : GPD_RX_BUF_LEN_OG(x_); \
42
+})
43
+
44
+#define GPD_DATA_LEN_OG(x)	((x) & 0xffff)
45
+#define GPD_DATA_LEN_EL(x)	((x) & 0xfffff)
46
+#define GPD_DATA_LEN(mtu, x)	\
47
+({				\
48
+	typeof(x) x_ = (x);	\
49
+	((mtu)->gen2cp) ? GPD_DATA_LEN_EL(x_) : GPD_DATA_LEN_OG(x_); \
50
+})
51
+
52
+#define GPD_EXT_FLAG_ZLP	BIT(29)
53
+#define GPD_EXT_NGP_OG(x)	(((x) & 0xf) << 20)
54
+#define GPD_EXT_BUF_OG(x)	(((x) & 0xf) << 16)
55
+#define GPD_EXT_NGP_EL(x)	(((x) & 0xf) << 28)
56
+#define GPD_EXT_BUF_EL(x)	(((x) & 0xf) << 24)
57
+#define GPD_EXT_NGP(mtu, x)	\
58
+({				\
59
+	typeof(x) x_ = (x);	\
60
+	((mtu)->gen2cp) ? GPD_EXT_NGP_EL(x_) : GPD_EXT_NGP_OG(x_); \
61
+})
62
+
63
+#define GPD_EXT_BUF(mtu, x)	\
64
+({				\
65
+	typeof(x) x_ = (x);	\
66
+	((mtu)->gen2cp) ? GPD_EXT_BUF_EL(x_) : GPD_EXT_BUF_OG(x_); \
67
+})
36
68
 
37
69
 #define HILO_GEN64(hi, lo) (((u64)(hi) << 32) + (lo))
38
70
 #define HILO_DMA(hi, lo)	\
..
..
@@ -125,7 +157,7 @@
125
157
 	struct qmu_gpd *gpd = ring->start;
126
158
 
127
159
 	if (gpd) {
128
-		gpd->flag &= ~GPD_FLAGS_HWO;
160
+		gpd->dw0_info &= cpu_to_le32(~GPD_FLAGS_HWO);
129
161
 		gpd_ring_init(ring, gpd);
130
162
 	}
131
163
 }
..
..
@@ -152,27 +184,6 @@
152
184
 	dma_pool_free(mep->mtu->qmu_gpd_pool,
153
185
 			ring->start, ring->dma);
154
186
 	memset(ring, 0, sizeof(*ring));
155
-}
156
-
157
-/*
158
- * calculate check sum of a gpd or bd
159
- * add "noinline" and "mb" to prevent wrong calculation
160
- */
161
-static noinline u8 qmu_calc_checksum(u8 *data)
162
-{
163
-	u8 chksum = 0;
164
-	int i;
165
-
166
-	data[1] = 0x0;  /* set checksum to 0 */
167
-
168
-	mb();	/* ensure the gpd/bd is really up-to-date */
169
-	for (i = 0; i < QMU_CHECKSUM_LEN; i++)
170
-		chksum += data[i];
171
-
172
-	/* Default: HWO=1, @flag[bit0] */
173
-	chksum += 1;
174
-
175
-	return 0xFF - chksum;
176
187
 }
177
188
 
178
189
 void mtu3_qmu_resume(struct mtu3_ep *mep)
..
..
@@ -235,16 +246,14 @@
235
246
 	struct mtu3_gpd_ring *ring = &mep->gpd_ring;
236
247
 	struct qmu_gpd *gpd = ring->enqueue;
237
248
 	struct usb_request *req = &mreq->request;
249
+	struct mtu3 *mtu = mep->mtu;
238
250
 	dma_addr_t enq_dma;
239
-	u16 ext_addr;
251
+	u32 ext_addr;
240
252
 
241
-	/* set all fields to zero as default value */
242
-	memset(gpd, 0, sizeof(*gpd));
243
-
253
+	gpd->dw0_info = 0;	/* SW own it */
244
254
 	gpd->buffer = cpu_to_le32(lower_32_bits(req->dma));
245
-	ext_addr = GPD_EXT_BUF(upper_32_bits(req->dma));
246
-	gpd->buf_len = cpu_to_le16(req->length);
247
-	gpd->flag |= GPD_FLAGS_IOC;
255
+	ext_addr = GPD_EXT_BUF(mtu, upper_32_bits(req->dma));
256
+	gpd->dw3_info = cpu_to_le32(GPD_DATA_LEN(mtu, req->length));
248
257
 
249
258
 	/* get the next GPD */
250
259
 	enq = advance_enq_gpd(ring);
..
..
@@ -252,18 +261,24 @@
252
261
 	dev_dbg(mep->mtu->dev, "TX-EP%d queue gpd=%p, enq=%p, qdma=%pad\n",
253
262
 		mep->epnum, gpd, enq, &enq_dma);
254
263
 
255
-	enq->flag &= ~GPD_FLAGS_HWO;
264
+	enq->dw0_info &= cpu_to_le32(~GPD_FLAGS_HWO);
256
265
 	gpd->next_gpd = cpu_to_le32(lower_32_bits(enq_dma));
257
-	ext_addr |= GPD_EXT_NGP(upper_32_bits(enq_dma));
258
-	gpd->tx_ext_addr = cpu_to_le16(ext_addr);
266
+	ext_addr |= GPD_EXT_NGP(mtu, upper_32_bits(enq_dma));
267
+	gpd->dw0_info = cpu_to_le32(ext_addr);
259
268
 
260
-	if (req->zero)
261
-		gpd->ext_flag |= GPD_EXT_FLAG_ZLP;
269
+	if (req->zero) {
270
+		if (mtu->gen2cp)
271
+			gpd->dw0_info |= cpu_to_le32(GPD_FLAGS_ZLP);
272
+		else
273
+			gpd->dw3_info |= cpu_to_le32(GPD_EXT_FLAG_ZLP);
274
+	}
262
275
 
263
-	gpd->chksum = qmu_calc_checksum((u8 *)gpd);
264
-	gpd->flag |= GPD_FLAGS_HWO;
276
+	/* prevent reorder, make sure GPD's HWO is set last */
277
+	mb();
278
+	gpd->dw0_info |= cpu_to_le32(GPD_FLAGS_IOC | GPD_FLAGS_HWO);
265
279
 
266
280
 	mreq->gpd = gpd;
281
+	trace_mtu3_prepare_gpd(mep, gpd);
267
282
 
268
283
 	return 0;
269
284
 }
..
..
@@ -274,16 +289,14 @@
274
289
 	struct mtu3_gpd_ring *ring = &mep->gpd_ring;
275
290
 	struct qmu_gpd *gpd = ring->enqueue;
276
291
 	struct usb_request *req = &mreq->request;
292
+	struct mtu3 *mtu = mep->mtu;
277
293
 	dma_addr_t enq_dma;
278
-	u16 ext_addr;
294
+	u32 ext_addr;
279
295
 
280
-	/* set all fields to zero as default value */
281
-	memset(gpd, 0, sizeof(*gpd));
282
-
296
+	gpd->dw0_info = 0;	/* SW own it */
283
297
 	gpd->buffer = cpu_to_le32(lower_32_bits(req->dma));
284
-	ext_addr = GPD_EXT_BUF(upper_32_bits(req->dma));
285
-	gpd->data_buf_len = cpu_to_le16(req->length);
286
-	gpd->flag |= GPD_FLAGS_IOC;
298
+	ext_addr = GPD_EXT_BUF(mtu, upper_32_bits(req->dma));
299
+	gpd->dw0_info = cpu_to_le32(GPD_RX_BUF_LEN(mtu, req->length));
287
300
 
288
301
 	/* get the next GPD */
289
302
 	enq = advance_enq_gpd(ring);
..
..
@@ -291,14 +304,16 @@
291
304
 	dev_dbg(mep->mtu->dev, "RX-EP%d queue gpd=%p, enq=%p, qdma=%pad\n",
292
305
 		mep->epnum, gpd, enq, &enq_dma);
293
306
 
294
-	enq->flag &= ~GPD_FLAGS_HWO;
307
+	enq->dw0_info &= cpu_to_le32(~GPD_FLAGS_HWO);
295
308
 	gpd->next_gpd = cpu_to_le32(lower_32_bits(enq_dma));
296
-	ext_addr |= GPD_EXT_NGP(upper_32_bits(enq_dma));
297
-	gpd->rx_ext_addr = cpu_to_le16(ext_addr);
298
-	gpd->chksum = qmu_calc_checksum((u8 *)gpd);
299
-	gpd->flag |= GPD_FLAGS_HWO;
309
+	ext_addr |= GPD_EXT_NGP(mtu, upper_32_bits(enq_dma));
310
+	gpd->dw3_info = cpu_to_le32(ext_addr);
311
+	/* prevent reorder, make sure GPD's HWO is set last */
312
+	mb();
313
+	gpd->dw0_info |= cpu_to_le32(GPD_FLAGS_IOC | GPD_FLAGS_HWO);
300
314
 
301
315
 	mreq->gpd = gpd;
316
+	trace_mtu3_prepare_gpd(mep, gpd);
302
317
 
303
318
 	return 0;
304
319
 }
..
..
@@ -323,7 +338,6 @@
323
338
 		/* set QMU start address */
324
339
 		write_txq_start_addr(mbase, epnum, ring->dma);
325
340
 		mtu3_setbits(mbase, MU3D_EP_TXCR0(epnum), TX_DMAREQEN);
326
-		mtu3_setbits(mbase, U3D_QCR0, QMU_TX_CS_EN(epnum));
327
341
 		/* send zero length packet according to ZLP flag in GPD */
328
342
 		mtu3_setbits(mbase, U3D_QCR1, QMU_TX_ZLP(epnum));
329
343
 		mtu3_writel(mbase, U3D_TQERRIESR0,
..
..
@@ -338,7 +352,6 @@
338
352
 	} else {
339
353
 		write_rxq_start_addr(mbase, epnum, ring->dma);
340
354
 		mtu3_setbits(mbase, MU3D_EP_RXCR0(epnum), RX_DMAREQEN);
341
-		mtu3_setbits(mbase, U3D_QCR0, QMU_RX_CS_EN(epnum));
342
355
 		/* don't expect ZLP */
343
356
 		mtu3_clrbits(mbase, U3D_QCR3, QMU_RX_ZLP(epnum));
344
357
 		/* move to next GPD when receive ZLP */
..
..
@@ -407,27 +420,25 @@
407
420
 	struct mtu3_gpd_ring *ring = &mep->gpd_ring;
408
421
 	void __iomem *mbase = mtu->mac_base;
409
422
 	struct qmu_gpd *gpd_current = NULL;
410
-	struct usb_request *req = NULL;
411
423
 	struct mtu3_request *mreq;
412
424
 	dma_addr_t cur_gpd_dma;
413
425
 	u32 txcsr = 0;
414
426
 	int ret;
415
427
 
416
428
 	mreq = next_request(mep);
417
-	if (mreq && mreq->request.length == 0)
418
-		req = &mreq->request;
419
-	else
429
+	if (mreq && mreq->request.length != 0)
420
430
 		return;
421
431
 
422
432
 	cur_gpd_dma = read_txq_cur_addr(mbase, epnum);
423
433
 	gpd_current = gpd_dma_to_virt(ring, cur_gpd_dma);
424
434
 
425
-	if (le16_to_cpu(gpd_current->buf_len) != 0) {
435
+	if (GPD_DATA_LEN(mtu, le32_to_cpu(gpd_current->dw3_info)) != 0) {
426
436
 		dev_err(mtu->dev, "TX EP%d buffer length error(!=0)\n", epnum);
427
437
 		return;
428
438
 	}
429
439
 
430
-	dev_dbg(mtu->dev, "%s send ZLP for req=%p\n", __func__, req);
440
+	dev_dbg(mtu->dev, "%s send ZLP for req=%p\n", __func__, mreq);
441
+	trace_mtu3_zlp_exp_gpd(mep, gpd_current);
431
442
 
432
443
 	mtu3_clrbits(mbase, MU3D_EP_TXCR0(mep->epnum), TX_DMAREQEN);
433
444
 
..
..
@@ -438,11 +449,10 @@
438
449
 		return;
439
450
 	}
440
451
 	mtu3_setbits(mbase, MU3D_EP_TXCR0(mep->epnum), TX_TXPKTRDY);
441
-
452
+	/* prevent reorder, make sure GPD's HWO is set last */
453
+	mb();
442
454
 	/* by pass the current GDP */
443
-	gpd_current->flag |= GPD_FLAGS_BPS;
444
-	gpd_current->chksum = qmu_calc_checksum((u8 *)gpd_current);
445
-	gpd_current->flag |= GPD_FLAGS_HWO;
455
+	gpd_current->dw0_info |= cpu_to_le32(GPD_FLAGS_BPS | GPD_FLAGS_HWO);
446
456
 
447
457
 	/*enable DMAREQEN, switch back to QMU mode */
448
458
 	mtu3_setbits(mbase, MU3D_EP_TXCR0(mep->epnum), TX_DMAREQEN);
..
..
@@ -474,7 +484,7 @@
474
484
 	dev_dbg(mtu->dev, "%s EP%d, last=%p, current=%p, enq=%p\n",
475
485
 		__func__, epnum, gpd, gpd_current, ring->enqueue);
476
486
 
477
-	while (gpd != gpd_current && !(gpd->flag & GPD_FLAGS_HWO)) {
487
+	while (gpd != gpd_current && !GET_GPD_HWO(gpd)) {
478
488
 
479
489
 		mreq = next_request(mep);
480
490
 
..
..
@@ -484,7 +494,8 @@
484
494
 		}
485
495
 
486
496
 		request = &mreq->request;
487
-		request->actual = le16_to_cpu(gpd->buf_len);
497
+		request->actual = GPD_DATA_LEN(mtu, le32_to_cpu(gpd->dw3_info));
498
+		trace_mtu3_complete_gpd(mep, gpd);
488
499
 		mtu3_req_complete(mep, request, 0);
489
500
 
490
501
 		gpd = advance_deq_gpd(ring);
..
..
@@ -512,7 +523,7 @@
512
523
 	dev_dbg(mtu->dev, "%s EP%d, last=%p, current=%p, enq=%p\n",
513
524
 		__func__, epnum, gpd, gpd_current, ring->enqueue);
514
525
 
515
-	while (gpd != gpd_current && !(gpd->flag & GPD_FLAGS_HWO)) {
526
+	while (gpd != gpd_current && !GET_GPD_HWO(gpd)) {
516
527
 
517
528
 		mreq = next_request(mep);
518
529
 
..
..
@@ -522,7 +533,8 @@
522
533
 		}
523
534
 		req = &mreq->request;
524
535
 
525
-		req->actual = le16_to_cpu(gpd->buf_len);
536
+		req->actual = GPD_DATA_LEN(mtu, le32_to_cpu(gpd->dw3_info));
537
+		trace_mtu3_complete_gpd(mep, gpd);
526
538
 		mtu3_req_complete(mep, req, 0);
527
539
 
528
540
 		gpd = advance_deq_gpd(ring);
..
..
@@ -600,6 +612,7 @@
600
612
 	dev_dbg(mtu->dev, "=== QMUdone[tx=%x, rx=%x] QMUexp[%x] ===\n",
601
613
 		(qmu_done_status & 0xFFFF), qmu_done_status >> 16,
602
614
 		qmu_status);
615
+	trace_mtu3_qmu_isr(qmu_done_status, qmu_status);
603
616
 
604
617
 	if (qmu_done_status)
605
618
 		qmu_done_isr(mtu, qmu_done_status);