[PATCH net-next 2/2] dt-bindings: net: dsa: Flag unexpected ethernet ports
From: Krzysztof Kozlowski
Date: Sun Nov 22 2026 - 11:09:35 EST
Bindings which reference dsa.yaml ports and restrict their own
ports to specific subset (e.g. with pattern "^(ethernet-)?port@[0-6]$")
actually silently allow ports with any unit address, because they use
"additionalProperties: true". These additional ports are incorrect and
should be flagged by the schema. Solve this by dropping the unit
address from the pattern completely and adding proper constrain on the
'reg' property.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxxxxx>
---
.../devicetree/bindings/net/dsa/lantiq,gswip.yaml | 4 +++-
.../devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 9 +++++----
.../devicetree/bindings/net/dsa/microchip,ksz.yaml | 4 +++-
.../devicetree/bindings/net/dsa/microchip,lan937x.yaml | 7 ++++++-
.../bindings/net/dsa/microchip,lan96455s-switch.yaml | 6 +++++-
Documentation/devicetree/bindings/net/dsa/qca8k.yaml | 4 +++-
6 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/dsa/lantiq,gswip.yaml b/Documentation/devicetree/bindings/net/dsa/lantiq,gswip.yaml
index 89f78a1bc113..83cdd6c80d09 100644
--- a/Documentation/devicetree/bindings/net/dsa/lantiq,gswip.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/lantiq,gswip.yaml
@@ -108,13 +108,15 @@ patternProperties:
"^(ethernet-)?ports$":
type: object
patternProperties:
- "^(ethernet-)?port@[0-6]$":
+ "^(ethernet-)?port@":
$ref: dsa-port.yaml#
allOf:
- $ref: /schemas/phy/phy-common-props.yaml#
unevaluatedProperties: false
properties:
+ reg:
+ maximum: 6
maxlinear,slew-rate-txc:
$ref: /schemas/types.yaml#/definitions/uint32
enum: [0, 1]
diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
index 90b3582b7619..80cda7ec5cb6 100644
--- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
@@ -179,12 +179,13 @@ patternProperties:
additionalProperties: true
patternProperties:
- "^(ethernet-)?port@[0-6]$":
+ "^(ethernet-)?port@":
type: object
additionalProperties: true
properties:
reg:
+ maximum: 6
description:
Port address described must be 5 or 6 for CPU port and from 0 to 5
for user ports.
@@ -208,7 +209,7 @@ $defs:
patternProperties:
"^(ethernet-)?ports$":
patternProperties:
- "^(ethernet-)?port@[0-6]$":
+ "^(ethernet-)?port@":
if:
required: [ ethernet ]
then:
@@ -220,7 +221,7 @@ $defs:
patternProperties:
"^(ethernet-)?ports$":
patternProperties:
- "^(ethernet-)?port@[0-6]$":
+ "^(ethernet-)?port@":
if:
required: [ ethernet ]
then:
@@ -246,7 +247,7 @@ $defs:
patternProperties:
"^(ethernet-)?ports$":
patternProperties:
- "^(ethernet-)?port@[0-6]$":
+ "^(ethernet-)?port@":
if:
required: [ ethernet ]
then:
diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
index 4ed13870ed3a..9cc14aa7b4b1 100644
--- a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
@@ -129,10 +129,12 @@ allOf:
patternProperties:
"^(ethernet-)?ports$":
patternProperties:
- "^(ethernet-)?port@[0-2]$":
+ "^(ethernet-)?port@":
$ref: dsa-port.yaml#
unevaluatedProperties: false
properties:
+ reg:
+ maximum: 2
microchip,rmii-clk-internal:
$ref: /schemas/types.yaml#/definitions/flag
description:
diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
index 9973d64f15a7..36a7c81df747 100644
--- a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
@@ -39,7 +39,12 @@ patternProperties:
"^(ethernet-)?ports$":
additionalProperties: true
patternProperties:
- "^(ethernet-)?port@[0-7]$":
+ "^(ethernet-)?port@":
+ type: object
+ properties:
+ reg:
+ maximum: 7
+
allOf:
- if:
properties:
diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,lan96455s-switch.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,lan96455s-switch.yaml
index 517bc4c00de3..17e3c00f5a32 100644
--- a/Documentation/devicetree/bindings/net/dsa/microchip,lan96455s-switch.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/microchip,lan96455s-switch.yaml
@@ -105,11 +105,15 @@ properties:
type: object
additionalProperties: true
patternProperties:
- "^(ethernet-)?port@[0-8]$":
+ "^(ethernet-)?port@":
type: object
description: Ethernet switch ports
additionalProperties: true
+ properties:
+ reg:
+ maximum: 8
+
allOf:
- if:
properties:
diff --git a/Documentation/devicetree/bindings/net/dsa/qca8k.yaml b/Documentation/devicetree/bindings/net/dsa/qca8k.yaml
index 167398ab253a..3840b336bdb9 100644
--- a/Documentation/devicetree/bindings/net/dsa/qca8k.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/qca8k.yaml
@@ -75,13 +75,15 @@ patternProperties:
type: object
additionalProperties: true
patternProperties:
- "^(ethernet-)?port@[0-6]$":
+ "^(ethernet-)?port@":
type: object
description: Ethernet switch ports
$ref: dsa-port.yaml#
properties:
+ reg:
+ maximum: 6
qca,sgmii-rxclk-falling-edge:
$ref: /schemas/types.yaml#/definitions/flag
description:
--
2.53.0