ARM: dts: BCM5301X: Explicitly disable unused switch CPU ports

When redescribing ports I assumed that missing "label" (like "cpu")
means switch port isn't used. That was incorrect and I realized my
change made Linux always use the first (5) CPU port (there are 3 of
them).

While above should technically be possible it often isn't correct:
1. Non-default switch ports are often connected to Ethernet interfaces
   not fully covered by vendor setup (they may miss MACs)
2. On some devices non-default ports require specifying fixed link

This fixes network connectivity for some devices. It was reported &
tested for Netgear R8000. It also affects Linksys EA9200 with its
downstream DTS.

Fixes: ba4aebce23b2 ("ARM: dts: BCM5301X: Describe switch ports in the main DTS")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20231013103314.10306-1-zajec5@gmail.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi b/arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi
index 42bcbf10957c408b48365d2b5a388db39051f542..9f9084269ef58b3312ccf5247a48fe5b4b331345 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi
@@ -181,5 +181,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
index e04d2e5ea51aa479569baddd2a9d1ec8be2cd738..72e960c888ac86b0543a1cf3acbb139e55d430bc 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
@@ -85,5 +85,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
index a399800139d9ce9c8f90fdfd26321eeee88606e2..750e17482371cfb3daa600b0134f995d1c97bf1b 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
@@ -88,5 +88,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
index fad3473810a2e58d471339c69d1cf9c32bc26227..2bdbc7d18b0eb1706c0c3963c16be033e7486e04 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
@@ -122,5 +122,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
index 5b2b7b8b3b123f5d864f4f2176cd6424eb9f56ad..b226bef3369cf78c555fd2d62159f503cb7d5ae6 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
@@ -145,6 +145,14 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts
index d0a26b643b82feb7c6672b89472dc8a88ea412e4..192b8db5a89c39d12c774a1c73e8bb0d125869d0 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts
@@ -145,5 +145,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
index 9f21d6d6d35b7599cb96325ab4f40d7f6e97c1c9..0198b5f9e4a750d05d358448ab7ef6d3f40d7705 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
@@ -81,5 +81,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
index 2561072917021cb8efd479710ea1090544c10c47..73ff1694a4a0b303e5b527601c4dfe70a8510093 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
@@ -148,5 +148,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
index 707c561703ed81bc8055795b264b9a7261151ba1..55fc9f44cbc7f5b66da86ec767208a86b74c90bd 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
@@ -227,6 +227,14 @@
                        label = "wan";
                };
 
+               port@5 {
+                       status = "disabled";
+               };
+
+               port@7 {
+                       status = "disabled";
+               };
+
                port@8 {
                        label = "cpu";
                };

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
index abe0cb245c7ec6895cfc3d1dc35f0676fa9f055d..c5099defe9f9702936f41e6e5bc8272e979fcc45 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
@@ -160,6 +160,14 @@
                        nvmem-cell-names = "mac-address";
                };
 
+               port@5 {
+                       status = "disabled";
+               };
+
+               port@7 {
+                       status = "disabled";
+               };
+
                port@8 {
                        label = "cpu";
                };

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts b/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts
index f050acbea0b2077b7655e9270f6c3d1614514413..3124dfd01b9447e047dd9b5956a38c076ef55cec 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts
@@ -192,6 +192,14 @@
                        label = "wan";
                };
 
+               port@5 {
+                       status = "disabled";
+               };
+
+               port@7 {
+                       status = "disabled";
+               };
+
                port@8 {
                        label = "cpu";
                        phy-mode = "rgmii";

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
index e8991d4e248ce2851a8e4bcecfcccc91c27522d7..e374062eb5b762560dcea2faf4f682d06ffca247 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
@@ -107,5 +107,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
index afc635c8cdebbc8f94cc6e6bb76a8907ac565b4d..badafa024d24c56e15fda3295bbd3f96d0a93081 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
@@ -120,5 +120,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
index 7cfa4607ef311fb1b4bb97a548bbb1a177f3faf6..cf95af9db1e66d6e472a27298dde51afc7baca2d 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
@@ -107,5 +107,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
index d55e10095eae79c27412bb311575864d11211dd3..992c19e1cfa17315151d5dab6d6a06ee5d3c9bd2 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
@@ -75,5 +75,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
index ccf031c0e276d6b45d1fd1220643845b3a063713..4d0ba315a2049e1b12c2ee930b6b40706a50326b 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
@@ -147,5 +147,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
index e28f7a3501179fd949e6c9fbeffc56cba0db577a..83c429afc2974d8e0fc3ce872171b408f6dae786 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
@@ -158,5 +158,13 @@
                port@5 {
                        label = "cpu";
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts b/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
index 03ad614e6b7214665d43dda787fe66a3113fc975..0bf5106f7012c9f34f469f217619a63b4c35d87a 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
+++ b/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
@@ -124,6 +124,14 @@
                                full-duplex;
                        };
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts b/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
index 26c12bfb0bdd4a1a4d88ff980898893748ad9c7a..25eeacf6a2484cc2a144f4781f316775a7f94e07 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
+++ b/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
@@ -185,6 +185,14 @@
                                full-duplex;
                        };
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm953012er.dts b/arch/arm/boot/dts/broadcom/bcm953012er.dts
index 4fe3b365337670a1caeda1813e7d28ad542dfca4..d939ec9f4a9e794d2cb774b4960f8a99bd162a44 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm953012er.dts
+++ b/arch/arm/boot/dts/broadcom/bcm953012er.dts
@@ -84,6 +84,14 @@
                        label = "cpu";
                        ethernet = <&gmac0>;
                };
+
+               port@7 {
+                       status = "disabled";
+               };
+
+               port@8 {
+                       status = "disabled";
+               };
        };
 };