72e5c6b061412e41aa0cb2c409499b714d18c71b
[openwrt/staging/pepe2k.git] /
1 From 473baeab929444295b0530f8766e4becb6a08973 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Fri, 13 Oct 2023 12:33:13 +0200
4 Subject: [PATCH] ARM: dts: BCM5301X: Explicitly disable unused switch CPU
5 ports
6 MIME-Version: 1.0
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
9
10 When redescribing ports I assumed that missing "label" (like "cpu")
11 means switch port isn't used. That was incorrect and I realized my
12 change made Linux always use the first (5) CPU port (there are 3 of
13 them).
14
15 While above should technically be possible it often isn't correct:
16 1. Non-default switch ports are often connected to Ethernet interfaces
17 not fully covered by vendor setup (they may miss MACs)
18 2. On some devices non-default ports require specifying fixed link
19
20 This fixes network connectivity for some devices. It was reported &
21 tested for Netgear R8000. It also affects Linksys EA9200 with its
22 downstream DTS.
23
24 Fixes: ba4aebce23b2 ("ARM: dts: BCM5301X: Describe switch ports in the main DTS")
25 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
26 Link: https://lore.kernel.org/r/20231013103314.10306-1-zajec5@gmail.com
27 Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
28 ---
29 .../dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 8 ++++++++
30 arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts | 8 ++++++++
31 arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts | 8 ++++++++
32 arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts | 8 ++++++++
33 arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts | 8 ++++++++
34 .../boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts | 8 ++++++++
35 arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts | 8 ++++++++
36 arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts | 8 ++++++++
37 arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts | 8 ++++++++
38 arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts | 8 ++++++++
39 arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts | 8 ++++++++
40 arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts | 8 ++++++++
41 arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts | 8 ++++++++
42 arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts | 8 ++++++++
43 arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts | 8 ++++++++
44 arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts | 8 ++++++++
45 arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts | 8 ++++++++
46 arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts | 8 ++++++++
47 arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts | 8 ++++++++
48 arch/arm/boot/dts/broadcom/bcm953012er.dts | 8 ++++++++
49 20 files changed, 160 insertions(+)
50
51 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
52 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
53 @@ -181,5 +181,13 @@
54 port@5 {
55 label = "cpu";
56 };
57 +
58 + port@7 {
59 + status = "disabled";
60 + };
61 +
62 + port@8 {
63 + status = "disabled";
64 + };
65 };
66 };
67 --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
68 +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
69 @@ -85,5 +85,13 @@
70 port@5 {
71 label = "cpu";
72 };
73 +
74 + port@7 {
75 + status = "disabled";
76 + };
77 +
78 + port@8 {
79 + status = "disabled";
80 + };
81 };
82 };
83 --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
84 +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
85 @@ -88,5 +88,13 @@
86 port@5 {
87 label = "cpu";
88 };
89 +
90 + port@7 {
91 + status = "disabled";
92 + };
93 +
94 + port@8 {
95 + status = "disabled";
96 + };
97 };
98 };
99 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
100 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
101 @@ -122,5 +122,13 @@
102 port@5 {
103 label = "cpu";
104 };
105 +
106 + port@7 {
107 + status = "disabled";
108 + };
109 +
110 + port@8 {
111 + status = "disabled";
112 + };
113 };
114 };
115 --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
116 +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
117 @@ -145,6 +145,14 @@
118 port@5 {
119 label = "cpu";
120 };
121 +
122 + port@7 {
123 + status = "disabled";
124 + };
125 +
126 + port@8 {
127 + status = "disabled";
128 + };
129 };
130 };
131
132 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
133 +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
134 @@ -145,5 +145,13 @@
135 port@5 {
136 label = "cpu";
137 };
138 +
139 + port@7 {
140 + status = "disabled";
141 + };
142 +
143 + port@8 {
144 + status = "disabled";
145 + };
146 };
147 };
148 --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
149 +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
150 @@ -81,5 +81,13 @@
151 port@5 {
152 label = "cpu";
153 };
154 +
155 + port@7 {
156 + status = "disabled";
157 + };
158 +
159 + port@8 {
160 + status = "disabled";
161 + };
162 };
163 };
164 --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
165 +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
166 @@ -148,5 +148,13 @@
167 port@5 {
168 label = "cpu";
169 };
170 +
171 + port@7 {
172 + status = "disabled";
173 + };
174 +
175 + port@8 {
176 + status = "disabled";
177 + };
178 };
179 };
180 --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
181 +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
182 @@ -227,6 +227,14 @@
183 label = "wan";
184 };
185
186 + port@5 {
187 + status = "disabled";
188 + };
189 +
190 + port@7 {
191 + status = "disabled";
192 + };
193 +
194 port@8 {
195 label = "cpu";
196 };
197 --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
198 +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
199 @@ -160,6 +160,14 @@
200 nvmem-cell-names = "mac-address";
201 };
202
203 + port@5 {
204 + status = "disabled";
205 + };
206 +
207 + port@7 {
208 + status = "disabled";
209 + };
210 +
211 port@8 {
212 label = "cpu";
213 };
214 --- a/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
215 +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
216 @@ -192,6 +192,14 @@
217 label = "wan";
218 };
219
220 + port@5 {
221 + status = "disabled";
222 + };
223 +
224 + port@7 {
225 + status = "disabled";
226 + };
227 +
228 port@8 {
229 label = "cpu";
230 phy-mode = "rgmii";
231 --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
232 +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
233 @@ -107,5 +107,13 @@
234 port@5 {
235 label = "cpu";
236 };
237 +
238 + port@7 {
239 + status = "disabled";
240 + };
241 +
242 + port@8 {
243 + status = "disabled";
244 + };
245 };
246 };
247 --- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
248 +++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
249 @@ -120,5 +120,13 @@
250 port@5 {
251 label = "cpu";
252 };
253 +
254 + port@7 {
255 + status = "disabled";
256 + };
257 +
258 + port@8 {
259 + status = "disabled";
260 + };
261 };
262 };
263 --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
264 +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
265 @@ -107,5 +107,13 @@
266 port@5 {
267 label = "cpu";
268 };
269 +
270 + port@7 {
271 + status = "disabled";
272 + };
273 +
274 + port@8 {
275 + status = "disabled";
276 + };
277 };
278 };
279 --- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
280 +++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
281 @@ -75,5 +75,13 @@
282 port@5 {
283 label = "cpu";
284 };
285 +
286 + port@7 {
287 + status = "disabled";
288 + };
289 +
290 + port@8 {
291 + status = "disabled";
292 + };
293 };
294 };
295 --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
296 +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
297 @@ -147,5 +147,13 @@
298 port@5 {
299 label = "cpu";
300 };
301 +
302 + port@7 {
303 + status = "disabled";
304 + };
305 +
306 + port@8 {
307 + status = "disabled";
308 + };
309 };
310 };
311 --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
312 +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
313 @@ -158,5 +158,13 @@
314 port@5 {
315 label = "cpu";
316 };
317 +
318 + port@7 {
319 + status = "disabled";
320 + };
321 +
322 + port@8 {
323 + status = "disabled";
324 + };
325 };
326 };
327 --- a/arch/arm/boot/dts/bcm53015-meraki-mr26.dts
328 +++ b/arch/arm/boot/dts/bcm53015-meraki-mr26.dts
329 @@ -124,6 +124,14 @@
330 full-duplex;
331 };
332 };
333 +
334 + port@7 {
335 + status = "disabled";
336 + };
337 +
338 + port@8 {
339 + status = "disabled";
340 + };
341 };
342 };
343
344 --- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
345 +++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
346 @@ -185,6 +185,14 @@
347 full-duplex;
348 };
349 };
350 +
351 + port@7 {
352 + status = "disabled";
353 + };
354 +
355 + port@8 {
356 + status = "disabled";
357 + };
358 };
359 };
360
361 --- a/arch/arm/boot/dts/bcm953012er.dts
362 +++ b/arch/arm/boot/dts/bcm953012er.dts
363 @@ -84,6 +84,14 @@
364 label = "cpu";
365 ethernet = <&gmac0>;
366 };
367 +
368 + port@7 {
369 + status = "disabled";
370 + };
371 +
372 + port@8 {
373 + status = "disabled";
374 + };
375 };
376 };
377