lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240325085131.182657-2-chunhau.tan@starfivetech.com>
Date: Mon, 25 Mar 2024 01:51:31 -0700
From: Tan Chun Hau <chunhau.tan@...rfivetech.com>
To: "David S . Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Rob Herring <robh+dt@...nel.org>,
	Emil Renner Berthing <kernel@...il.dk>,
	Rob Herring <robh@...nel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
	Conor Dooley <conor+dt@...nel.org>,
	Maxime Coquelin <mcoquelin.stm32@...il.com>,
	Alexandre Torgue <alexandre.torgue@...s.st.com>,
	Simon Horman <horms@...nel.org>,
	Bartosz Golaszewski <bartosz.golaszewski@...aro.org>,
	Andrew Halaney <ahalaney@...hat.com>,
	Jisheng Zhang <jszhang@...nel.org>,
	Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
	Russell King <rmk+kernel@...linux.org.uk>
Cc: Ley Foon Tan <leyfoon.tan@...rfivetech.com>,
	Jee Heng Sia <jeeheng.sia@...rfivetech.com>,
	netdev@...r.kernel.org,
	devicetree@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	linux-stm32@...md-mailman.stormreply.com,
	linux-arm-kernel@...ts.infradead.org,
	linux-riscv@...ts.infradead.org
Subject: [PATCH v3 1/1] dt-bindings: net: starfive,jh7110-dwmac: Add StarFive JH8100 support

Add StarFive JH8100 dwmac support.
The JH8100 dwmac shares the same driver code as the JH7110 dwmac
and has only one reset signal.

Please refer to below:

  JH8100: reset-names = "stmmaceth";
  JH7110: reset-names = "stmmaceth", "ahb";
  JH7100: reset-names = "ahb";

Example usage of JH8100 in the device tree:

gmac0: ethernet@...30000 {
        compatible = "starfive,jh8100-dwmac",
                     "starfive,jh7110-dwmac",
                     "snps,dwmac-5.20";
        ...
};

Signed-off-by: Tan Chun Hau <chunhau.tan@...rfivetech.com>
---
 .../devicetree/bindings/net/snps,dwmac.yaml   |  1 +
 .../bindings/net/starfive,jh7110-dwmac.yaml   | 82 +++++++++++++------
 2 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index 6b0341a8e0ea..a6d596b7dcf4 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -97,6 +97,7 @@ properties:
         - snps,dwxgmac-2.10
         - starfive,jh7100-dwmac
         - starfive,jh7110-dwmac
+        - starfive,jh8100-dwmac
 
   reg:
     minItems: 1
diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
index 0d1962980f57..da3cc984fec9 100644
--- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
@@ -18,6 +18,7 @@ select:
         enum:
           - starfive,jh7100-dwmac
           - starfive,jh7110-dwmac
+          - starfive,jh8100-dwmac
   required:
     - compatible
 
@@ -30,6 +31,10 @@ properties:
       - items:
           - const: starfive,jh7110-dwmac
           - const: snps,dwmac-5.20
+      - items:
+          - const: starfive,jh8100-dwmac
+          - const: starfive,jh7110-dwmac
+          - const: snps,dwmac-5.20
 
   reg:
     maxItems: 1
@@ -83,29 +88,13 @@ allOf:
   - if:
       properties:
         compatible:
-          contains:
-            const: starfive,jh7100-dwmac
-    then:
-      properties:
-        interrupts:
-          minItems: 2
-          maxItems: 2
-
-        interrupt-names:
-          minItems: 2
-          maxItems: 2
-
-        resets:
-          maxItems: 1
-
-        reset-names:
-          const: ahb
-
-  - if:
-      properties:
-        compatible:
-          contains:
-            const: starfive,jh7110-dwmac
+          allOf:
+            - contains:
+                enum:
+                  - starfive,jh8100-dwmac
+            - contains:
+                enum:
+                  - starfive,jh7110-dwmac
     then:
       properties:
         interrupts:
@@ -117,10 +106,53 @@ allOf:
           maxItems: 3
 
         resets:
-          minItems: 2
+          maxItems: 1
 
         reset-names:
-          minItems: 2
+          const: stmmaceth
+
+    else:
+      if:
+        properties:
+          compatible:
+            contains:
+              const: starfive,jh7100-dwmac
+      then:
+        properties:
+          interrupts:
+            minItems: 2
+            maxItems: 2
+
+          interrupt-names:
+            minItems: 2
+            maxItems: 2
+
+          resets:
+            maxItems: 1
+
+          reset-names:
+            const: ahb
+
+        if:
+          properties:
+            compatible:
+              contains:
+                const: starfive,jh7110-dwmac
+        then:
+          properties:
+            interrupts:
+              minItems: 3
+              maxItems: 3
+
+            interrupt-names:
+              minItems: 3
+              maxItems: 3
+
+            resets:
+              minItems: 2
+
+            reset-names:
+              minItems: 2
 
 unevaluatedProperties: false
 
-- 
2.25.1


Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ