| Message ID | 20231029042712.520010-5-cristian.ciocaltea@collabora.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Enable networking support for StarFive JH7100 SoC | expand |
On 30/10/2023 02:37, Rob Herring wrote: > > On Sun, 29 Oct 2023 06:27:04 +0200, Cristian Ciocaltea wrote: >> The Synopsys DesignWare MAC found on StarFive JH7100 SoC is quite >> similar to the newer JH7110, but it requires only two interrupts and a >> single reset line. >> >> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> >> --- >> .../devicetree/bindings/net/snps,dwmac.yaml | 1 + >> .../bindings/net/starfive,jh7110-dwmac.yaml | 74 +++++++++++++------ >> 2 files changed, 54 insertions(+), 21 deletions(-) >> > > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.example.dtb: ethernet@c9410000: compatible: 'oneOf' conditional failed, one must be fixed: > 'starfive,jh7100-dwmac' was expected > 'amlogic,meson-gxbb-dwmac' is not one of ['starfive,jh7110-dwmac'] > 'snps,dwmac-5.20' was expected > from schema $id: http://devicetree.org/schemas/net/starfive,jh7110-dwmac.yaml# And here you have proof of missing testing of patch #2. Best regards, Krzysztof
On 29/10/2023 23:15, Cristian Ciocaltea wrote: > On 10/29/23 13:24, Krzysztof Kozlowski wrote: >> On 29/10/2023 05:27, Cristian Ciocaltea wrote: >>> The Synopsys DesignWare MAC found on StarFive JH7100 SoC is quite >>> similar to the newer JH7110, but it requires only two interrupts and a >>> single reset line. >>> >>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> >>> --- >>> .../devicetree/bindings/net/snps,dwmac.yaml | 1 + >>> .../bindings/net/starfive,jh7110-dwmac.yaml | 74 +++++++++++++------ >>> 2 files changed, 54 insertions(+), 21 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >>> index a4d7172ea701..c1380ff1c054 100644 >>> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml >>> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >>> @@ -95,6 +95,7 @@ properties: >>> - snps,dwmac-5.20 >>> - snps,dwxgmac >>> - snps,dwxgmac-2.10 >>> + - starfive,jh7100-dwmac >>> - starfive,jh7110-dwmac >>> >>> reg: >>> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>> index 44e58755a5a2..70e35a3401f4 100644 >>> --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>> @@ -13,10 +13,14 @@ maintainers: >>> >>> properties: >>> compatible: >>> - items: >>> - - enum: >>> - - starfive,jh7110-dwmac >>> - - const: snps,dwmac-5.20 >>> + oneOf: >>> + - items: >>> + - const: starfive,jh7100-dwmac >>> + - const: snps,dwmac >>> + - items: >>> + - enum: >>> + - starfive,jh7110-dwmac >>> + - const: snps,dwmac-5.20 >> >> Why do you use different fallback? > > AFAIK, dwmac-5.20 is currently only used by JH7110. What is used by JH7000? > >>> >>> reg: >>> maxItems: 1 >>> @@ -37,23 +41,6 @@ properties: >>> - const: tx >>> - const: gtx >>> >>> - interrupts: >>> - minItems: 3 >>> - maxItems: 3 >>> - >>> - interrupt-names: >>> - minItems: 3 >>> - maxItems: 3 >>> - >>> - resets: >>> - minItems: 2 >>> - maxItems: 2 >> >> You just changed it in previous patches... So the previous code allowing >> one item was correct? > > I mentioned the possible use-cases in the previous email. So yes, JH7110 > requires 2 resets, while JH7100 just one. Your previous patch does not make sense now... Best regards, Krzysztof
On 10/30/23 09:30, Krzysztof Kozlowski wrote: > On 29/10/2023 23:15, Cristian Ciocaltea wrote: >> On 10/29/23 13:24, Krzysztof Kozlowski wrote: >>> On 29/10/2023 05:27, Cristian Ciocaltea wrote: >>>> The Synopsys DesignWare MAC found on StarFive JH7100 SoC is quite >>>> similar to the newer JH7110, but it requires only two interrupts and a >>>> single reset line. >>>> >>>> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> >>>> --- >>>> .../devicetree/bindings/net/snps,dwmac.yaml | 1 + >>>> .../bindings/net/starfive,jh7110-dwmac.yaml | 74 +++++++++++++------ >>>> 2 files changed, 54 insertions(+), 21 deletions(-) >>>> >>>> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >>>> index a4d7172ea701..c1380ff1c054 100644 >>>> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml >>>> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml >>>> @@ -95,6 +95,7 @@ properties: >>>> - snps,dwmac-5.20 >>>> - snps,dwxgmac >>>> - snps,dwxgmac-2.10 >>>> + - starfive,jh7100-dwmac >>>> - starfive,jh7110-dwmac >>>> >>>> reg: >>>> diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>>> index 44e58755a5a2..70e35a3401f4 100644 >>>> --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>>> +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml >>>> @@ -13,10 +13,14 @@ maintainers: >>>> >>>> properties: >>>> compatible: >>>> - items: >>>> - - enum: >>>> - - starfive,jh7110-dwmac >>>> - - const: snps,dwmac-5.20 >>>> + oneOf: >>>> + - items: >>>> + - const: starfive,jh7100-dwmac >>>> + - const: snps,dwmac >>>> + - items: >>>> + - enum: >>>> + - starfive,jh7110-dwmac >>>> + - const: snps,dwmac-5.20 >>> >>> Why do you use different fallback? >> >> AFAIK, dwmac-5.20 is currently only used by JH7110. > > What is used by JH7000? Driver reports "Synopsys ID: 0x37", so it could be 3.70a or 3.710, as those are the only compatibles available for 3.7x. It's worth noting the driver does not rely on the compatibles for implementing version specific logic, as it gets the IDs directly from chip registers. The usage of generic snps,dwmac fallback was borrowed from downstream code. Regards, Cristian
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index a4d7172ea701..c1380ff1c054 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -95,6 +95,7 @@ properties: - snps,dwmac-5.20 - snps,dwxgmac - snps,dwxgmac-2.10 + - starfive,jh7100-dwmac - starfive,jh7110-dwmac reg: diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml index 44e58755a5a2..70e35a3401f4 100644 --- a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml @@ -13,10 +13,14 @@ maintainers: properties: compatible: - items: - - enum: - - starfive,jh7110-dwmac - - const: snps,dwmac-5.20 + oneOf: + - items: + - const: starfive,jh7100-dwmac + - const: snps,dwmac + - items: + - enum: + - starfive,jh7110-dwmac + - const: snps,dwmac-5.20 reg: maxItems: 1 @@ -37,23 +41,6 @@ properties: - const: tx - const: gtx - interrupts: - minItems: 3 - maxItems: 3 - - interrupt-names: - minItems: 3 - maxItems: 3 - - resets: - minItems: 2 - maxItems: 2 - - reset-names: - items: - - const: stmmaceth - - const: ahb - starfive,tx-use-rgmii-clk: description: Tx clock is provided by external rgmii clock. @@ -84,6 +71,51 @@ required: allOf: - $ref: snps,dwmac.yaml# + - 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 + maxItems: 2 + + reset-names: + items: + - const: stmmaceth + - const: ahb + unevaluatedProperties: false examples:
The Synopsys DesignWare MAC found on StarFive JH7100 SoC is quite similar to the newer JH7110, but it requires only two interrupts and a single reset line. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> --- .../devicetree/bindings/net/snps,dwmac.yaml | 1 + .../bindings/net/starfive,jh7110-dwmac.yaml | 74 +++++++++++++------ 2 files changed, 54 insertions(+), 21 deletions(-)