移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/ethernet/qualcomm/qca_spi.c
..
..
@@ -69,6 +69,12 @@
69
69
 module_param(qcaspi_pluggable, int, 0);
70
70
 MODULE_PARM_DESC(qcaspi_pluggable, "Pluggable SPI connection (yes/no).");
71
71
 
72
+#define QCASPI_WRITE_VERIFY_MIN 0
73
+#define QCASPI_WRITE_VERIFY_MAX 3
74
+static int wr_verify = QCASPI_WRITE_VERIFY_MIN;
75
+module_param(wr_verify, int, 0);
76
+MODULE_PARM_DESC(wr_verify, "SPI register write verify trails. Use 0-3.");
77
+
72
78
 #define QCASPI_TX_TIMEOUT (1 * HZ)
73
79
 #define QCASPI_QCA7K_REBOOT_TIME_MS 1000
74
80
 
..
..
@@ -77,7 +83,7 @@
77
83
 {
78
84
 	*intr_cause = 0;
79
85
 
80
-	qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, 0);
86
+	qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, 0, wr_verify);
81
87
 	qcaspi_read_register(qca, SPI_REG_INTR_CAUSE, intr_cause);
82
88
 	netdev_dbg(qca->net_dev, "interrupts: 0x%04x\n", *intr_cause);
83
89
 }
..
..
@@ -90,8 +96,8 @@
90
96
 			   SPI_INT_RDBUF_ERR |
91
97
 			   SPI_INT_WRBUF_ERR);
92
98
 
93
-	qcaspi_write_register(qca, SPI_REG_INTR_CAUSE, intr_cause);
94
-	qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, intr_enable);
99
+	qcaspi_write_register(qca, SPI_REG_INTR_CAUSE, intr_cause, 0);
100
+	qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, intr_enable, wr_verify);
95
101
 	netdev_dbg(qca->net_dev, "acking int: 0x%04x\n", intr_cause);
96
102
 }
97
103
 
..
..
@@ -239,7 +245,7 @@
239
245
 
240
246
 	len = skb->len;
241
247
 
242
-	qcaspi_write_register(qca, SPI_REG_BFR_SIZE, len);
248
+	qcaspi_write_register(qca, SPI_REG_BFR_SIZE, len, wr_verify);
243
249
 	if (qca->legacy_mode)
244
250
 		qcaspi_tx_cmd(qca, QCA7K_SPI_WRITE | QCA7K_SPI_EXTERNAL);
245
251
 
..
..
@@ -282,6 +288,14 @@
282
288
 		return 0;
283
289
 
284
290
 	qcaspi_read_register(qca, SPI_REG_WRBUF_SPC_AVA, &available);
291
+
292
+	if (available > QCASPI_HW_BUF_LEN) {
293
+		/* This could only happen by interferences on the SPI line.
294
+		 * So retry later ...
295
+		 */
296
+		qca->stats.buf_avail_err++;
297
+		return -1;
298
+	}
285
299
 
286
300
 	while (qca->txr.skb[qca->txr.head]) {
287
301
 		pkt_len = qca->txr.skb[qca->txr.head]->len + QCASPI_HW_PKT_LEN;
..
..
@@ -345,15 +359,22 @@
345
359
 
346
360
 	/* Read the packet size. */
347
361
 	qcaspi_read_register(qca, SPI_REG_RDBUF_BYTE_AVA, &available);
362
+
348
363
 	netdev_dbg(net_dev, "qcaspi_receive: SPI_REG_RDBUF_BYTE_AVA: Value: %08x\n",
349
364
 		   available);
350
365
 
351
-	if (available == 0) {
366
+	if (available > QCASPI_HW_BUF_LEN + QCASPI_HW_PKT_LEN) {
367
+		/* This could only happen by interferences on the SPI line.
368
+		 * So retry later ...
369
+		 */
370
+		qca->stats.buf_avail_err++;
371
+		return -1;
372
+	} else if (available == 0) {
352
373
 		netdev_dbg(net_dev, "qcaspi_receive called without any data being available!\n");
353
374
 		return -1;
354
375
 	}
355
376
 
356
-	qcaspi_write_register(qca, SPI_REG_BFR_SIZE, available);
377
+	qcaspi_write_register(qca, SPI_REG_BFR_SIZE, available, wr_verify);
357
378
 
358
379
 	if (qca->legacy_mode)
359
380
 		qcaspi_tx_cmd(qca, QCA7K_SPI_READ | QCA7K_SPI_EXTERNAL);
..
..
@@ -523,7 +544,7 @@
523
544
 		netdev_dbg(qca->net_dev, "sync: resetting device.\n");
524
545
 		qcaspi_read_register(qca, SPI_REG_SPI_CONFIG, &spi_config);
525
546
 		spi_config |= QCASPI_SLAVE_RESET_BIT;
526
-		qcaspi_write_register(qca, SPI_REG_SPI_CONFIG, spi_config);
547
+		qcaspi_write_register(qca, SPI_REG_SPI_CONFIG, spi_config, 0);
527
548
 
528
549
 		qca->sync = QCASPI_SYNC_RESET;
529
550
 		qca->stats.trig_reset++;
..
..
@@ -683,7 +704,7 @@
683
704
 
684
705
 	netif_stop_queue(dev);
685
706
 
686
-	qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, 0);
707
+	qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, 0, wr_verify);
687
708
 	free_irq(qca->spi_dev->irq, qca);
688
709
 
689
710
 	kthread_stop(qca->spi_thread);
..
..
@@ -764,7 +785,7 @@
764
785
 }
765
786
 
766
787
 static void
767
-qcaspi_netdev_tx_timeout(struct net_device *dev)
788
+qcaspi_netdev_tx_timeout(struct net_device *dev, unsigned int txqueue)
768
789
 {
769
790
 	struct qcaspi *qca = netdev_priv(dev);
770
791
 
..
..
@@ -815,8 +836,7 @@
815
836
 
816
837
 	kfree(qca->rx_buffer);
817
838
 	qca->buffer_size = 0;
818
-	if (qca->rx_skb)
819
-		dev_kfree_skb(qca->rx_skb);
839
+	dev_kfree_skb(qca->rx_skb);
820
840
 }
821
841
 
822
842
 static const struct net_device_ops qcaspi_netdev_ops = {
..
..
@@ -903,6 +923,13 @@
903
923
 		return -EINVAL;
904
924
 	}
905
925
 
926
+	if (wr_verify < QCASPI_WRITE_VERIFY_MIN ||
927
+	    wr_verify > QCASPI_WRITE_VERIFY_MAX) {
928
+		dev_err(&spi->dev, "Invalid write verify: %d\n",
929
+			wr_verify);
930
+		return -EINVAL;
931
+	}
932
+
906
933
 	dev_info(&spi->dev, "ver=%s, clkspeed=%d, burst_len=%d, pluggable=%d\n",
907
934
 		 QCASPI_DRV_VERSION,
908
935
 		 qcaspi_clkspeed,
..
..
@@ -937,7 +964,7 @@
937
964
 
938
965
 	mac = of_get_mac_address(spi->dev.of_node);
939
966
 
940
-	if (mac)
967
+	if (!IS_ERR(mac))
941
968
 		ether_addr_copy(qca->net_dev->dev_addr, mac);
942
969
 
943
970
 	if (!is_valid_ether_addr(qca->net_dev->dev_addr)) {