add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/net/ethernet/stmicro/stmmac/hwif.c
..
..
@@ -23,6 +23,19 @@
23
23
 	return reg & GENMASK(7, 0);
24
24
 }
25
25
 
26
+static u32 stmmac_get_dev_id(struct stmmac_priv *priv, u32 id_reg)
27
+{
28
+	u32 reg = readl(priv->ioaddr + id_reg);
29
+
30
+	if (!reg) {
31
+		dev_info(priv->device, "Version ID not available\n");
32
+		return 0x0;
33
+	}
34
+
35
+	return (reg & GENMASK(15, 8)) >> 8;
36
+}
37
+
38
+#ifdef CONFIG_STMMAC_FULL
26
39
 static void stmmac_dwmac_mode_quirk(struct stmmac_priv *priv)
27
40
 {
28
41
 	struct mac_device_info *mac = priv->hw;
..
..
@@ -69,11 +82,19 @@
69
82
 	return 0;
70
83
 }
71
84
 
85
+static int stmmac_dwxlgmac_quirks(struct stmmac_priv *priv)
86
+{
87
+	priv->hw->xlgmac = true;
88
+	return 0;
89
+}
90
+#endif
91
+
72
92
 static const struct stmmac_hwif_entry {
73
93
 	bool gmac;
74
94
 	bool gmac4;
75
95
 	bool xgmac;
76
96
 	u32 min_id;
97
+	u32 dev_id;
77
98
 	const struct stmmac_regs_off regs;
78
99
 	const void *desc;
79
100
 	const void *dma;
..
..
@@ -81,10 +102,12 @@
81
102
 	const void *hwtimestamp;
82
103
 	const void *mode;
83
104
 	const void *tc;
105
+	const void *mmc;
84
106
 	int (*setup)(struct stmmac_priv *priv);
85
107
 	int (*quirks)(struct stmmac_priv *priv);
86
108
 } stmmac_hw[] = {
87
109
 	/* NOTE: New HW versions shall go to the end of this table */
110
+#ifdef CONFIG_STMMAC_FULL
88
111
 	{
89
112
 		.gmac = false,
90
113
 		.gmac4 = false,
..
..
@@ -100,6 +123,7 @@
100
123
 		.hwtimestamp = &stmmac_ptp,
101
124
 		.mode = NULL,
102
125
 		.tc = NULL,
126
+		.mmc = &dwmac_mmc_ops,
103
127
 		.setup = dwmac100_setup,
104
128
 		.quirks = stmmac_dwmac1_quirks,
105
129
 	}, {
..
..
@@ -117,6 +141,7 @@
117
141
 		.hwtimestamp = &stmmac_ptp,
118
142
 		.mode = NULL,
119
143
 		.tc = NULL,
144
+		.mmc = &dwmac_mmc_ops,
120
145
 		.setup = dwmac1000_setup,
121
146
 		.quirks = stmmac_dwmac1_quirks,
122
147
 	}, {
..
..
@@ -133,7 +158,8 @@
133
158
 		.mac = &dwmac4_ops,
134
159
 		.hwtimestamp = &stmmac_ptp,
135
160
 		.mode = NULL,
136
-		.tc = NULL,
161
+		.tc = &dwmac510_tc_ops,
162
+		.mmc = &dwmac_mmc_ops,
137
163
 		.setup = dwmac4_setup,
138
164
 		.quirks = stmmac_dwmac4_quirks,
139
165
 	}, {
..
..
@@ -150,10 +176,13 @@
150
176
 		.mac = &dwmac410_ops,
151
177
 		.hwtimestamp = &stmmac_ptp,
152
178
 		.mode = &dwmac4_ring_mode_ops,
153
-		.tc = NULL,
179
+		.tc = &dwmac510_tc_ops,
180
+		.mmc = &dwmac_mmc_ops,
154
181
 		.setup = dwmac4_setup,
155
182
 		.quirks = NULL,
156
-	}, {
183
+	},
184
+#endif /* CONFIG_STMMAC_FULL */
185
+	{
157
186
 		.gmac = false,
158
187
 		.gmac4 = true,
159
188
 		.xgmac = false,
..
..
@@ -167,10 +196,15 @@
167
196
 		.mac = &dwmac410_ops,
168
197
 		.hwtimestamp = &stmmac_ptp,
169
198
 		.mode = &dwmac4_ring_mode_ops,
170
-		.tc = NULL,
199
+#ifdef CONFIG_STMMAC_FULL
200
+		.tc = &dwmac510_tc_ops,
201
+#endif
202
+		.mmc = &dwmac_mmc_ops,
171
203
 		.setup = dwmac4_setup,
172
204
 		.quirks = NULL,
173
-	}, {
205
+	},
206
+#ifdef CONFIG_STMMAC_FULL
207
+	{
174
208
 		.gmac = false,
175
209
 		.gmac4 = true,
176
210
 		.xgmac = false,
..
..
@@ -185,6 +219,7 @@
185
219
 		.hwtimestamp = &stmmac_ptp,
186
220
 		.mode = &dwmac4_ring_mode_ops,
187
221
 		.tc = &dwmac510_tc_ops,
222
+		.mmc = &dwmac_mmc_ops,
188
223
 		.setup = dwmac4_setup,
189
224
 		.quirks = NULL,
190
225
 	}, {
..
..
@@ -192,19 +227,41 @@
192
227
 		.gmac4 = false,
193
228
 		.xgmac = true,
194
229
 		.min_id = DWXGMAC_CORE_2_10,
230
+		.dev_id = DWXGMAC_ID,
195
231
 		.regs = {
196
232
 			.ptp_off = PTP_XGMAC_OFFSET,
197
-			.mmc_off = 0,
233
+			.mmc_off = MMC_XGMAC_OFFSET,
198
234
 		},
199
235
 		.desc = &dwxgmac210_desc_ops,
200
236
 		.dma = &dwxgmac210_dma_ops,
201
237
 		.mac = &dwxgmac210_ops,
202
238
 		.hwtimestamp = &stmmac_ptp,
203
239
 		.mode = NULL,
204
-		.tc = NULL,
240
+		.tc = &dwmac510_tc_ops,
241
+		.mmc = &dwxgmac_mmc_ops,
205
242
 		.setup = dwxgmac2_setup,
206
243
 		.quirks = NULL,
244
+	}, {
245
+		.gmac = false,
246
+		.gmac4 = false,
247
+		.xgmac = true,
248
+		.min_id = DWXLGMAC_CORE_2_00,
249
+		.dev_id = DWXLGMAC_ID,
250
+		.regs = {
251
+			.ptp_off = PTP_XGMAC_OFFSET,
252
+			.mmc_off = MMC_XGMAC_OFFSET,
253
+		},
254
+		.desc = &dwxgmac210_desc_ops,
255
+		.dma = &dwxgmac210_dma_ops,
256
+		.mac = &dwxlgmac2_ops,
257
+		.hwtimestamp = &stmmac_ptp,
258
+		.mode = NULL,
259
+		.tc = &dwmac510_tc_ops,
260
+		.mmc = &dwxgmac_mmc_ops,
261
+		.setup = dwxlgmac2_setup,
262
+		.quirks = stmmac_dwxlgmac_quirks,
207
263
 	},
264
+#endif
208
265
 };
209
266
 
210
267
 int stmmac_hwif_init(struct stmmac_priv *priv)
..
..
@@ -215,13 +272,15 @@
215
272
 	const struct stmmac_hwif_entry *entry;
216
273
 	struct mac_device_info *mac;
217
274
 	bool needs_setup = true;
275
+	u32 id, dev_id = 0;
218
276
 	int i, ret;
219
-	u32 id;
220
277
 
221
278
 	if (needs_gmac) {
222
279
 		id = stmmac_get_id(priv, GMAC_VERSION);
223
280
 	} else if (needs_gmac4 || needs_xgmac) {
224
281
 		id = stmmac_get_id(priv, GMAC4_VERSION);
282
+		if (needs_xgmac)
283
+			dev_id = stmmac_get_dev_id(priv, GMAC4_VERSION);
225
284
 	} else {
226
285
 		id = 0;
227
286
 	}
..
..
@@ -259,6 +318,8 @@
259
318
 		/* Use synopsys_id var because some setups can override this */
260
319
 		if (priv->synopsys_id < entry->min_id)
261
320
 			continue;
321
+		if (needs_xgmac && (dev_id ^ entry->dev_id))
322
+			continue;
262
323
 
263
324
 		/* Only use generic HW helpers if needed */
264
325
 		mac->desc = mac->desc ? : entry->desc;
..
..
@@ -267,6 +328,7 @@
267
328
 		mac->ptp = mac->ptp ? : entry->hwtimestamp;
268
329
 		mac->mode = mac->mode ? : entry->mode;
269
330
 		mac->tc = mac->tc ? : entry->tc;
331
+		mac->mmc = mac->mmc ? : entry->mmc;
270
332
 
271
333
 		priv->hw = mac;
272
334
 		priv->ptpaddr = priv->ioaddr + entry->regs.ptp_off;