rtl88x2CE_WiFi_linux add concurrent mode

hc

2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad

 kernel/drivers/net/dsa/mv88e6xxx/global1_atu.c
..
..
@@ -1,14 +1,12 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Marvell 88E6xxx Address Translation Unit (ATU) support
3
4
  *
4
5
  * Copyright (c) 2008 Marvell Semiconductor
5
6
  * Copyright (c) 2017 Savoir-faire Linux, Inc.
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License as published by
9
- * the Free Software Foundation; either version 2 of the License, or
10
- * (at your option) any later version.
11
7
  */
8
+
9
+#include <linux/bitfield.h>
12
10
 #include <linux/interrupt.h>
13
11
 #include <linux/irqdomain.h>
14
12
 
..
..
@@ -75,12 +73,45 @@
75
73
 	return 0;
76
74
 }
77
75
 
76
+int mv88e6165_g1_atu_get_hash(struct mv88e6xxx_chip *chip, u8 *hash)
77
+{
78
+	int err;
79
+	u16 val;
80
+
81
+	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_CTL, &val);
82
+	if (err)
83
+		return err;
84
+
85
+	*hash = val & MV88E6161_G1_ATU_CTL_HASH_MASK;
86
+
87
+	return 0;
88
+}
89
+
90
+int mv88e6165_g1_atu_set_hash(struct mv88e6xxx_chip *chip, u8 hash)
91
+{
92
+	int err;
93
+	u16 val;
94
+
95
+	if (hash & ~MV88E6161_G1_ATU_CTL_HASH_MASK)
96
+		return -EINVAL;
97
+
98
+	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_CTL, &val);
99
+	if (err)
100
+		return err;
101
+
102
+	val &= ~MV88E6161_G1_ATU_CTL_HASH_MASK;
103
+	val |= hash;
104
+
105
+	return mv88e6xxx_g1_write(chip, MV88E6XXX_G1_ATU_CTL, val);
106
+}
107
+
78
108
 /* Offset 0x0B: ATU Operation Register */
79
109
 
80
110
 static int mv88e6xxx_g1_atu_op_wait(struct mv88e6xxx_chip *chip)
81
111
 {
82
-	return mv88e6xxx_g1_wait(chip, MV88E6XXX_G1_ATU_OP,
83
-				 MV88E6XXX_G1_ATU_OP_BUSY);
112
+	int bit = __bf_shf(MV88E6XXX_G1_ATU_OP_BUSY);
113
+
114
+	return mv88e6xxx_g1_wait_bit(chip, MV88E6XXX_G1_ATU_OP, bit, 0);
84
115
 }
85
116
 
86
117
 static int mv88e6xxx_g1_atu_op(struct mv88e6xxx_chip *chip, u16 fid, u16 op)
..
..
@@ -94,7 +125,7 @@
94
125
 		if (err)
95
126
 			return err;
96
127
 	} else {
97
-		if (mv88e6xxx_num_databases(chip) > 16) {
128
+		if (mv88e6xxx_num_databases(chip) > 64) {
98
129
 			/* ATU DBNum[7:4] are located in ATU Control 15:12 */
99
130
 			err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_CTL,
100
131
 						&val);
..
..
@@ -106,6 +137,9 @@
106
137
 						 val);
107
138
 			if (err)
108
139
 				return err;
140
+		} else if (mv88e6xxx_num_databases(chip) > 16) {
141
+			/* ATU DBNum[5:4] are located in ATU Operation 9:8 */
142
+			op |= (fid & 0x30) << 4;
109
143
 		}
110
144
 
111
145
 		/* ATU DBNum[3:0] are located in ATU Operation 3:0 */
..
..
@@ -118,6 +152,11 @@
118
152
 		return err;
119
153
 
120
154
 	return mv88e6xxx_g1_atu_op_wait(chip);
155
+}
156
+
157
+int mv88e6xxx_g1_atu_get_next(struct mv88e6xxx_chip *chip, u16 fid)
158
+{
159
+	return mv88e6xxx_g1_atu_op(chip, fid, MV88E6XXX_G1_ATU_OP_GET_NEXT_DB);
121
160
 }
122
161
 
123
162
 /* Offset 0x0C: ATU Data Register */
..
..
@@ -133,7 +172,7 @@
133
172
 		return err;
134
173
 
135
174
 	entry->state = val & 0xf;
136
-	if (entry->state != MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {
175
+	if (entry->state) {
137
176
 		entry->trunk = !!(val & MV88E6XXX_G1_ATU_DATA_TRUNK);
138
177
 		entry->portvec = (val >> 4) & mv88e6xxx_port_mask(chip);
139
178
 	}
..
..
@@ -146,7 +185,7 @@
146
185
 {
147
186
 	u16 data = entry->state & 0xf;
148
187
 
149
-	if (entry->state != MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {
188
+	if (entry->state) {
150
189
 		if (entry->trunk)
151
190
 			data |= MV88E6XXX_G1_ATU_DATA_TRUNK;
152
191
 
..
..
@@ -207,7 +246,7 @@
207
246
 		return err;
208
247
 
209
248
 	/* Write the MAC address to iterate from only once */
210
-	if (entry->state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {
249
+	if (!entry->state) {
211
250
 		err = mv88e6xxx_g1_atu_mac_write(chip, entry);
212
251
 		if (err)
213
252
 			return err;
..
..
@@ -318,7 +357,7 @@
318
357
 	int err;
319
358
 	u16 val;
320
359
 
321
-	mutex_lock(&chip->reg_lock);
360
+	mv88e6xxx_reg_lock(chip);
322
361
 
323
362
 	err = mv88e6xxx_g1_atu_op(chip, 0,
324
363
 				  MV88E6XXX_G1_ATU_OP_GET_CLR_VIOLATION);
..
..
@@ -365,12 +404,12 @@
365
404
 				    entry.mac, entry.portvec, spid);
366
405
 		chip->ports[spid].atu_full_violation++;
367
406
 	}
368
-	mutex_unlock(&chip->reg_lock);
407
+	mv88e6xxx_reg_unlock(chip);
369
408
 
370
409
 	return IRQ_HANDLED;
371
410
 
372
411
 out:
373
-	mutex_unlock(&chip->reg_lock);
412
+	mv88e6xxx_reg_unlock(chip);
374
413
 
375
414
 	dev_err(chip->dev, "ATU problem: error %d while handling interrupt\n",
376
415
 		err);
..
..
@@ -386,9 +425,12 @@
386
425
 	if (chip->atu_prob_irq < 0)
387
426
 		return chip->atu_prob_irq;
388
427
 
428
+	snprintf(chip->atu_prob_irq_name, sizeof(chip->atu_prob_irq_name),
429
+		 "mv88e6xxx-%s-g1-atu-prob", dev_name(chip->dev));
430
+
389
431
 	err = request_threaded_irq(chip->atu_prob_irq, NULL,
390
432
 				   mv88e6xxx_g1_atu_prob_irq_thread_fn,
391
-				   IRQF_ONESHOT, "mv88e6xxx-g1-atu-prob",
433
+				   IRQF_ONESHOT, chip->atu_prob_irq_name,
392
434
 				   chip);
393
435
 	if (err)
394
436
 		irq_dispose_mapping(chip->atu_prob_irq);