* [PATCH v3 1/7] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version
2023-01-06 2:59 [PATCH v3 0/7] Add Ethernet driver for StarFive JH7110 SoC Yanhong Wang
@ 2023-01-06 2:59 ` Yanhong Wang
2023-01-06 12:37 ` Krzysztof Kozlowski
2023-01-06 2:59 ` [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names Yanhong Wang
` (5 subsequent siblings)
6 siblings, 1 reply; 20+ messages in thread
From: Yanhong Wang @ 2023-01-06 2:59 UTC (permalink / raw)
To: linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis,
Yanhong Wang
From: Emil Renner Berthing <kernel@esmil.dk>
Add dwmac-5.20 IP version to snps.dwmac.yaml
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
---
Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index 13b984076af5..e26c3e76ebb7 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -30,6 +30,7 @@ select:
- snps,dwmac-4.10a
- snps,dwmac-4.20a
- snps,dwmac-5.10a
+ - snps,dwmac-5.20
- snps,dwxgmac
- snps,dwxgmac-2.10
@@ -87,6 +88,7 @@ properties:
- snps,dwmac-4.10a
- snps,dwmac-4.20a
- snps,dwmac-5.10a
+ - snps,dwmac-5.20
- snps,dwxgmac
- snps,dwxgmac-2.10
@@ -393,6 +395,7 @@ allOf:
- snps,dwmac-3.50a
- snps,dwmac-4.10a
- snps,dwmac-4.20a
+ - snps,dwmac-5.20
- snps,dwxgmac
- snps,dwxgmac-2.10
- st,spear600-gmac
@@ -447,6 +450,7 @@ allOf:
- snps,dwmac-4.10a
- snps,dwmac-4.20a
- snps,dwmac-5.10a
+ - snps,dwmac-5.20
- snps,dwxgmac
- snps,dwxgmac-2.10
- st,spear600-gmac
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v3 1/7] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version
2023-01-06 2:59 ` [PATCH v3 1/7] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version Yanhong Wang
@ 2023-01-06 12:37 ` Krzysztof Kozlowski
0 siblings, 0 replies; 20+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-06 12:37 UTC (permalink / raw)
To: Yanhong Wang, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 06/01/2023 03:59, Yanhong Wang wrote:
> From: Emil Renner Berthing <kernel@esmil.dk>
>
> Add dwmac-5.20 IP version to snps.dwmac.yaml
>
> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
> ---
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names
2023-01-06 2:59 [PATCH v3 0/7] Add Ethernet driver for StarFive JH7110 SoC Yanhong Wang
2023-01-06 2:59 ` [PATCH v3 1/7] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version Yanhong Wang
@ 2023-01-06 2:59 ` Yanhong Wang
2023-01-06 12:38 ` Krzysztof Kozlowski
2023-01-06 12:44 ` Krzysztof Kozlowski
2023-01-06 2:59 ` [PATCH v3 3/7] net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string Yanhong Wang
` (4 subsequent siblings)
6 siblings, 2 replies; 20+ messages in thread
From: Yanhong Wang @ 2023-01-06 2:59 UTC (permalink / raw)
To: linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis,
Yanhong Wang
Some boards(such as StarFive VisionFive v2) require more than one value
which defined by resets property, so the original definition can not
meet the requirements. In order to adapt to different requirements,
adjust the maxitems number definition.
Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
---
.../devicetree/bindings/net/snps,dwmac.yaml | 36 ++++++++++++++-----
1 file changed, 28 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index e26c3e76ebb7..f7693e8c8d6d 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -132,14 +132,6 @@ properties:
- pclk
- ptp_ref
- resets:
- maxItems: 1
- description:
- MAC Reset signal.
-
- reset-names:
- const: stmmaceth
-
power-domains:
maxItems: 1
@@ -463,6 +455,34 @@ allOf:
Enables the TSO feature otherwise it will be managed by
MAC HW capability register.
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: starfive,jh7110-dwmac
+
+ then:
+ properties:
+ resets:
+ minItems: 2
+ maxItems: 2
+ reset-names:
+ items:
+ - const: stmmaceth
+ - const: ahb
+ required:
+ - resets
+ - reset-names
+ else:
+ properties:
+ resets:
+ maxItems: 1
+ description:
+ MAC Reset signal.
+
+ reset-names:
+ const: stmmaceth
+
additionalProperties: true
examples:
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names
2023-01-06 2:59 ` [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names Yanhong Wang
@ 2023-01-06 12:38 ` Krzysztof Kozlowski
2023-01-06 12:44 ` Krzysztof Kozlowski
1 sibling, 0 replies; 20+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-06 12:38 UTC (permalink / raw)
To: Yanhong Wang, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 06/01/2023 03:59, Yanhong Wang wrote:
> Some boards(such as StarFive VisionFive v2) require more than one value
> which defined by resets property, so the original definition can not
> meet the requirements. In order to adapt to different requirements,
> adjust the maxitems number definition.
>
> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
> ---
> .../devicetree/bindings/net/snps,dwmac.yaml | 36 ++++++++++++++-----
> 1 file changed, 28 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> index e26c3e76ebb7..f7693e8c8d6d 100644
> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> @@ -132,14 +132,6 @@ properties:
> - pclk
> - ptp_ref
>
> - resets:
> - maxItems: 1
> - description:
> - MAC Reset signal.
> -
> - reset-names:
> - const: stmmaceth
Do not remove properties from top-level properties. Instead these should
have widest constraints which are further constrain in allOf:if:then.
Here you should list items with minItems: 1.
> -
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names
2023-01-06 2:59 ` [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names Yanhong Wang
2023-01-06 12:38 ` Krzysztof Kozlowski
@ 2023-01-06 12:44 ` Krzysztof Kozlowski
2023-01-17 6:52 ` yanhong wang
1 sibling, 1 reply; 20+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-06 12:44 UTC (permalink / raw)
To: Yanhong Wang, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 06/01/2023 03:59, Yanhong Wang wrote:
> Some boards(such as StarFive VisionFive v2) require more than one value
> which defined by resets property, so the original definition can not
> meet the requirements. In order to adapt to different requirements,
> adjust the maxitems number definition.
>
> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
> ---
> .../devicetree/bindings/net/snps,dwmac.yaml | 36 ++++++++++++++-----
> 1 file changed, 28 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> index e26c3e76ebb7..f7693e8c8d6d 100644
> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> @@ -132,14 +132,6 @@ properties:
> - pclk
> - ptp_ref
>
> - resets:
> - maxItems: 1
> - description:
> - MAC Reset signal.
> -
> - reset-names:
> - const: stmmaceth
> -
> power-domains:
> maxItems: 1
>
> @@ -463,6 +455,34 @@ allOf:
> Enables the TSO feature otherwise it will be managed by
> MAC HW capability register.
>
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: starfive,jh7110-dwmac
> +
Looking at your next binding patch, this seems a bit clearer. First of
all, this patch on itself has little sense. It's not usable on its own,
because you need the next one.
Probably the snps,dwmac should be just split into common parts used by
devices. It makes code much less readable and unnecessary complicated to
support in one schema both devices and re-usability.
Otherwise I propose to make the resets/reset-names just like clocks are
made: define here wide constraints and update all other users of this
binding to explicitly restrict resets.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names
2023-01-06 12:44 ` Krzysztof Kozlowski
@ 2023-01-17 6:52 ` yanhong wang
2023-01-17 7:46 ` Krzysztof Kozlowski
0 siblings, 1 reply; 20+ messages in thread
From: yanhong wang @ 2023-01-17 6:52 UTC (permalink / raw)
To: Krzysztof Kozlowski, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 2023/1/6 20:44, Krzysztof Kozlowski wrote:
> On 06/01/2023 03:59, Yanhong Wang wrote:
>> Some boards(such as StarFive VisionFive v2) require more than one value
>> which defined by resets property, so the original definition can not
>> meet the requirements. In order to adapt to different requirements,
>> adjust the maxitems number definition.
>>
>> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
>> ---
>> .../devicetree/bindings/net/snps,dwmac.yaml | 36 ++++++++++++++-----
>> 1 file changed, 28 insertions(+), 8 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>> index e26c3e76ebb7..f7693e8c8d6d 100644
>> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>> @@ -132,14 +132,6 @@ properties:
>> - pclk
>> - ptp_ref
>>
>> - resets:
>> - maxItems: 1
>> - description:
>> - MAC Reset signal.
>> -
>> - reset-names:
>> - const: stmmaceth
>> -
>> power-domains:
>> maxItems: 1
>>
>> @@ -463,6 +455,34 @@ allOf:
>> Enables the TSO feature otherwise it will be managed by
>> MAC HW capability register.
>>
>> + - if:
>> + properties:
>> + compatible:
>> + contains:
>> + const: starfive,jh7110-dwmac
>> +
>
> Looking at your next binding patch, this seems a bit clearer. First of
> all, this patch on itself has little sense. It's not usable on its own,
> because you need the next one.
>
> Probably the snps,dwmac should be just split into common parts used by
> devices. It makes code much less readable and unnecessary complicated to
> support in one schema both devices and re-usability.
>
> Otherwise I propose to make the resets/reset-names just like clocks are
> made: define here wide constraints and update all other users of this
> binding to explicitly restrict resets.
>
>
Thanks, refer to the definition of clocks. If it is defined as follows, is it OK?
properties:
resets:
minItems: 1
maxItems: 3
additionalItems: true
items:
- description: MAC Reset signal.
reset-names:
minItems: 1
maxItems: 3
additionalItems: true
contains:
enum:
- stmmaceth
allOf:
- if:
properties:
compatible:
contains:
const: starfive,jh7110-dwmac
then:
properties:
resets:
minItems: 2
maxItems: 2
reset-names:
items:
- const: stmmaceth
- const: ahb
required:
- resets
- reset-names
else:
properties:
resets:
maxItems: 1
description:
MAC Reset signal.
reset-names:
const: stmmaceth
Do you have any other better suggestions?
> Best regards,
> Krzysztof
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names
2023-01-17 6:52 ` yanhong wang
@ 2023-01-17 7:46 ` Krzysztof Kozlowski
2023-01-17 8:14 ` yanhong wang
0 siblings, 1 reply; 20+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-17 7:46 UTC (permalink / raw)
To: yanhong wang, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 17/01/2023 07:52, yanhong wang wrote:
>
>
> On 2023/1/6 20:44, Krzysztof Kozlowski wrote:
>> On 06/01/2023 03:59, Yanhong Wang wrote:
>>> Some boards(such as StarFive VisionFive v2) require more than one value
>>> which defined by resets property, so the original definition can not
>>> meet the requirements. In order to adapt to different requirements,
>>> adjust the maxitems number definition.
>>>
>>> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
>>> ---
>>> .../devicetree/bindings/net/snps,dwmac.yaml | 36 ++++++++++++++-----
>>> 1 file changed, 28 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>>> index e26c3e76ebb7..f7693e8c8d6d 100644
>>> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>>> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>>> @@ -132,14 +132,6 @@ properties:
>>> - pclk
>>> - ptp_ref
>>>
>>> - resets:
>>> - maxItems: 1
>>> - description:
>>> - MAC Reset signal.
>>> -
>>> - reset-names:
>>> - const: stmmaceth
>>> -
>>> power-domains:
>>> maxItems: 1
>>>
>>> @@ -463,6 +455,34 @@ allOf:
>>> Enables the TSO feature otherwise it will be managed by
>>> MAC HW capability register.
>>>
>>> + - if:
>>> + properties:
>>> + compatible:
>>> + contains:
>>> + const: starfive,jh7110-dwmac
>>> +
>>
>> Looking at your next binding patch, this seems a bit clearer. First of
>> all, this patch on itself has little sense. It's not usable on its own,
>> because you need the next one.
>>
>> Probably the snps,dwmac should be just split into common parts used by
>> devices. It makes code much less readable and unnecessary complicated to
>> support in one schema both devices and re-usability.
>>
>> Otherwise I propose to make the resets/reset-names just like clocks are
>> made: define here wide constraints and update all other users of this
>> binding to explicitly restrict resets.
>>
>>
>
> Thanks, refer to the definition of clocks. If it is defined as follows, is it OK?
>
> properties:
> resets:
> minItems: 1
> maxItems: 3
> additionalItems: true
Drop
> items:
> - description: MAC Reset signal.
Drop both
>
> reset-names:
> minItems: 1
> maxItems: 3
> additionalItems: true
Drop
> contains:
> enum:
> - stmmaceth
Drop all
>
>
> allOf:
> - if:
> properties:
> compatible:
> contains:
> const: starfive,jh7110-dwmac
> then:
> properties:
> resets:
> minItems: 2
> maxItems: 2
> reset-names:
> items:
> - const: stmmaceth
> - const: ahb
> required:
> - resets
> - reset-names
> else:
> properties:
> resets:
> maxItems: 1
> description:
> MAC Reset signal.
>
> reset-names:
> const: stmmaceth
>
> Do you have any other better suggestions?
More or less like this but the allOf should not be in snps,dwmac schema
but in individual schemas. The snps,dwmac is growing unmaintainable...
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names
2023-01-17 7:46 ` Krzysztof Kozlowski
@ 2023-01-17 8:14 ` yanhong wang
2023-01-17 8:43 ` Krzysztof Kozlowski
0 siblings, 1 reply; 20+ messages in thread
From: yanhong wang @ 2023-01-17 8:14 UTC (permalink / raw)
To: Krzysztof Kozlowski, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 2023/1/17 15:46, Krzysztof Kozlowski wrote:
> On 17/01/2023 07:52, yanhong wang wrote:
>>
>>
>> On 2023/1/6 20:44, Krzysztof Kozlowski wrote:
>>> On 06/01/2023 03:59, Yanhong Wang wrote:
>>>> Some boards(such as StarFive VisionFive v2) require more than one value
>>>> which defined by resets property, so the original definition can not
>>>> meet the requirements. In order to adapt to different requirements,
>>>> adjust the maxitems number definition.
>>>>
>>>> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
>>>> ---
>>>> .../devicetree/bindings/net/snps,dwmac.yaml | 36 ++++++++++++++-----
>>>> 1 file changed, 28 insertions(+), 8 deletions(-)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>>>> index e26c3e76ebb7..f7693e8c8d6d 100644
>>>> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>>>> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>>>> @@ -132,14 +132,6 @@ properties:
>>>> - pclk
>>>> - ptp_ref
>>>>
>>>> - resets:
>>>> - maxItems: 1
>>>> - description:
>>>> - MAC Reset signal.
>>>> -
>>>> - reset-names:
>>>> - const: stmmaceth
>>>> -
>>>> power-domains:
>>>> maxItems: 1
>>>>
>>>> @@ -463,6 +455,34 @@ allOf:
>>>> Enables the TSO feature otherwise it will be managed by
>>>> MAC HW capability register.
>>>>
>>>> + - if:
>>>> + properties:
>>>> + compatible:
>>>> + contains:
>>>> + const: starfive,jh7110-dwmac
>>>> +
>>>
>>> Looking at your next binding patch, this seems a bit clearer. First of
>>> all, this patch on itself has little sense. It's not usable on its own,
>>> because you need the next one.
>>>
>>> Probably the snps,dwmac should be just split into common parts used by
>>> devices. It makes code much less readable and unnecessary complicated to
>>> support in one schema both devices and re-usability.
>>>
>>> Otherwise I propose to make the resets/reset-names just like clocks are
>>> made: define here wide constraints and update all other users of this
>>> binding to explicitly restrict resets.
>>>
>>>
>>
>> Thanks, refer to the definition of clocks. If it is defined as follows, is it OK?
>>
>> properties:
>> resets:
>> minItems: 1
>> maxItems: 3
>> additionalItems: true
>
> Drop
>
>> items:
>> - description: MAC Reset signal.
>
> Drop both
>
>>
>> reset-names:
>> minItems: 1
>> maxItems: 3
>> additionalItems: true
>
> Drop
>
>> contains:
>> enum:
>> - stmmaceth
>
> Drop all
>
>>
>>
>> allOf:
>> - if:
>> properties:
>> compatible:
>> contains:
>> const: starfive,jh7110-dwmac
>> then:
>> properties:
>> resets:
>> minItems: 2
>> maxItems: 2
>> reset-names:
>> items:
>> - const: stmmaceth
>> - const: ahb
>> required:
>> - resets
>> - reset-names
>> else:
>> properties:
>> resets:
>> maxItems: 1
>> description:
>> MAC Reset signal.
>>
>> reset-names:
>> const: stmmaceth
>>
>> Do you have any other better suggestions?
>
> More or less like this but the allOf should not be in snps,dwmac schema
> but in individual schemas. The snps,dwmac is growing unmaintainable...
>
Thanks, it is defined as follows, is it right?
properties:
resets:
minItems: 1
maxItems: 3
additionalItems: true
reset-names:
minItems: 1
maxItems: 3
additionalItems: true
> Best regards,
> Krzysztof
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names
2023-01-17 8:14 ` yanhong wang
@ 2023-01-17 8:43 ` Krzysztof Kozlowski
0 siblings, 0 replies; 20+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-17 8:43 UTC (permalink / raw)
To: yanhong wang, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 17/01/2023 09:14, yanhong wang wrote:
>>> Thanks, refer to the definition of clocks. If it is defined as follows, is it OK?
>>>
>>> properties:
>>> resets:
>>> minItems: 1
>>> maxItems: 3
>>> additionalItems: true
>>
>> Drop
>>
>>> items:
>>> - description: MAC Reset signal.
>>
>> Drop both
>>
>>>
>>> reset-names:
>>> minItems: 1
>>> maxItems: 3
>>> additionalItems: true
>>
>> Drop
>>
>>> contains:
>>> enum:
>>> - stmmaceth
>>
>> Drop all
>>
>>>
>>>
>>> allOf:
>>> - if:
>>> properties:
>>> compatible:
>>> contains:
>>> const: starfive,jh7110-dwmac
>>> then:
>>> properties:
>>> resets:
>>> minItems: 2
>>> maxItems: 2
>>> reset-names:
>>> items:
>>> - const: stmmaceth
>>> - const: ahb
>>> required:
>>> - resets
>>> - reset-names
>>> else:
>>> properties:
>>> resets:
>>> maxItems: 1
>>> description:
>>> MAC Reset signal.
>>>
>>> reset-names:
>>> const: stmmaceth
>>>
>>> Do you have any other better suggestions?
>>
>> More or less like this but the allOf should not be in snps,dwmac schema
>> but in individual schemas. The snps,dwmac is growing unmaintainable...
>>
>
> Thanks, it is defined as follows, is it right?
>
> properties:
> resets:
> minItems: 1
> maxItems: 3
> additionalItems: true
>
Read my comments above. Drop.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 3/7] net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string
2023-01-06 2:59 [PATCH v3 0/7] Add Ethernet driver for StarFive JH7110 SoC Yanhong Wang
2023-01-06 2:59 ` [PATCH v3 1/7] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version Yanhong Wang
2023-01-06 2:59 ` [PATCH v3 2/7] dt-bindings: net: snps,dwmac: Update the maxitems number of resets and reset-names Yanhong Wang
@ 2023-01-06 2:59 ` Yanhong Wang
2023-01-06 2:59 ` [PATCH v3 4/7] dt-bindings: net: Add support StarFive dwmac Yanhong Wang
` (3 subsequent siblings)
6 siblings, 0 replies; 20+ messages in thread
From: Yanhong Wang @ 2023-01-06 2:59 UTC (permalink / raw)
To: linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis,
Yanhong Wang
From: Emil Renner Berthing <kernel@esmil.dk>
Add "snps,dwmac-5.20" compatible string for 5.20 version that can avoid
to define some platform data in the glue layer.
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 50f6b4a14be4..cc3b701af802 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -519,7 +519,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
if (of_device_is_compatible(np, "snps,dwmac-4.00") ||
of_device_is_compatible(np, "snps,dwmac-4.10a") ||
of_device_is_compatible(np, "snps,dwmac-4.20a") ||
- of_device_is_compatible(np, "snps,dwmac-5.10a")) {
+ of_device_is_compatible(np, "snps,dwmac-5.10a") ||
+ of_device_is_compatible(np, "snps,dwmac-5.20")) {
plat->has_gmac4 = 1;
plat->has_gmac = 0;
plat->pmt = 1;
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 4/7] dt-bindings: net: Add support StarFive dwmac
2023-01-06 2:59 [PATCH v3 0/7] Add Ethernet driver for StarFive JH7110 SoC Yanhong Wang
` (2 preceding siblings ...)
2023-01-06 2:59 ` [PATCH v3 3/7] net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string Yanhong Wang
@ 2023-01-06 2:59 ` Yanhong Wang
2023-01-06 12:45 ` Krzysztof Kozlowski
2023-01-06 2:59 ` [PATCH v3 5/7] net: stmmac: Add glue layer for StarFive JH7110 SoCs Yanhong Wang
` (2 subsequent siblings)
6 siblings, 1 reply; 20+ messages in thread
From: Yanhong Wang @ 2023-01-06 2:59 UTC (permalink / raw)
To: linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis,
Yanhong Wang
Add documentation to describe StarFive dwmac driver(GMAC).
Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
---
.../devicetree/bindings/net/snps,dwmac.yaml | 1 +
.../bindings/net/starfive,jh7110-dwmac.yaml | 113 ++++++++++++++++++
MAINTAINERS | 5 +
3 files changed, 119 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index f7693e8c8d6d..2542f3a0538c 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -91,6 +91,7 @@ properties:
- snps,dwmac-5.20
- snps,dwxgmac
- snps,dwxgmac-2.10
+ - starfive,jh7110-dwmac
reg:
minItems: 1
diff --git a/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
new file mode 100644
index 000000000000..eb0767da834a
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
@@ -0,0 +1,113 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+# Copyright (C) 2022 StarFive Technology Co., Ltd.
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/starfive,jh7110-dwmac.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 DWMAC glue layer
+
+maintainers:
+ - Yanhong Wang <yanhong.wang@starfivetech.com>
+
+select:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - starfive,jh7110-dwmac
+ required:
+ - compatible
+
+properties:
+ compatible:
+ items:
+ - enum:
+ - starfive,jh7110-dwmac
+ - const: snps,dwmac-5.20
+
+ clocks:
+ items:
+ - description: GMAC main clock
+ - description: GMAC AHB clock
+ - description: PTP clock
+ - description: TX clock
+ - description: GTXC clock
+ - description: GTX clock
+
+ clock-names:
+ items:
+ - const: stmmaceth
+ - const: pclk
+ - const: ptp_ref
+ - const: tx
+ - const: gtxc
+ - const: gtx
+
+ resets:
+ items:
+ - description: MAC Reset signal.
+ - description: AHB Reset signal.
+
+ reset-names:
+ items:
+ - const: stmmaceth
+ - const: ahb
+
+allOf:
+ - $ref: snps,dwmac.yaml#
+
+unevaluatedProperties: true
+
+required:
+ - compatible
+ - clocks
+ - clock-names
+ - resets
+ - reset-names
+
+examples:
+ - |
+ ethernet@16030000 {
+ compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20";
+ reg = <0x16030000 0x10000>;
+ clocks = <&clk 3>, <&clk 2>, <&clk 109>,
+ <&clk 5>, <&clk 111>, <&clk 108>;
+ clock-names = "stmmaceth", "pclk", "ptp_ref",
+ "tx", "gtxc", "gtx";
+ resets = <&rst 1>, <&rst 2>;
+ reset-names = "stmmaceth", "ahb";
+ interrupts = <7>, <6>, <5>;
+ interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
+ phy-mode = "rgmii-id";
+ snps,multicast-filter-bins = <64>;
+ snps,perfect-filter-entries = <8>;
+ rx-fifo-depth = <2048>;
+ tx-fifo-depth = <2048>;
+ snps,fixed-burst;
+ snps,no-pbl-x8;
+ snps,tso;
+ snps,force_thresh_dma_mode;
+ snps,axi-config = <&stmmac_axi_setup>;
+ snps,en-tx-lpi-clockgating;
+ snps,txpbl = <16>;
+ snps,rxpbl = <16>;
+ phy-handle = <&phy0>;
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "snps,dwmac-mdio";
+
+ phy0: ethernet-phy@0 {
+ reg = <0>;
+ };
+ };
+
+ stmmac_axi_setup: stmmac-axi-config {
+ snps,lpi_en;
+ snps,wr_osr_lmt = <4>;
+ snps,rd_osr_lmt = <4>;
+ snps,blen = <256 128 64 32 0 0 0>;
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index a70c1d0f303e..56be59bb09f7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19606,6 +19606,11 @@ F: Documentation/devicetree/bindings/clock/starfive*
F: drivers/clk/starfive/
F: include/dt-bindings/clock/starfive*
+STARFIVE DWMAC GLUE LAYER
+M: Yanhong Wang <yanhong.wang@starfivetech.com>
+S: Maintained
+F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+
STARFIVE PINCTRL DRIVER
M: Emil Renner Berthing <kernel@esmil.dk>
M: Jianlong Huang <jianlong.huang@starfivetech.com>
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v3 4/7] dt-bindings: net: Add support StarFive dwmac
2023-01-06 2:59 ` [PATCH v3 4/7] dt-bindings: net: Add support StarFive dwmac Yanhong Wang
@ 2023-01-06 12:45 ` Krzysztof Kozlowski
2023-01-18 1:45 ` yanhong wang
0 siblings, 1 reply; 20+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-06 12:45 UTC (permalink / raw)
To: Yanhong Wang, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 06/01/2023 03:59, Yanhong Wang wrote:
> Add documentation to describe StarFive dwmac driver(GMAC).
>
> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
> ---
> .../devicetree/bindings/net/snps,dwmac.yaml | 1 +
> .../bindings/net/starfive,jh7110-dwmac.yaml | 113 ++++++++++++++++++
> MAINTAINERS | 5 +
Order the patches correctly. Why this binding patch is split from previous?
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 4/7] dt-bindings: net: Add support StarFive dwmac
2023-01-06 12:45 ` Krzysztof Kozlowski
@ 2023-01-18 1:45 ` yanhong wang
2023-01-18 8:00 ` Krzysztof Kozlowski
0 siblings, 1 reply; 20+ messages in thread
From: yanhong wang @ 2023-01-18 1:45 UTC (permalink / raw)
To: Krzysztof Kozlowski, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 2023/1/6 20:45, Krzysztof Kozlowski wrote:
> On 06/01/2023 03:59, Yanhong Wang wrote:
>> Add documentation to describe StarFive dwmac driver(GMAC).
>>
>> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
>> ---
>> .../devicetree/bindings/net/snps,dwmac.yaml | 1 +
>> .../bindings/net/starfive,jh7110-dwmac.yaml | 113 ++++++++++++++++++
>> MAINTAINERS | 5 +
>
> Order the patches correctly. Why this binding patch is split from previous?
>
The previous binding patch was considered to be compatible with JH7100, but after discussion,
it is not compatible with JH7100 for the time being, so the name of binding has been modified
in this patch.
> Best regards,
> Krzysztof
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 4/7] dt-bindings: net: Add support StarFive dwmac
2023-01-18 1:45 ` yanhong wang
@ 2023-01-18 8:00 ` Krzysztof Kozlowski
0 siblings, 0 replies; 20+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-18 8:00 UTC (permalink / raw)
To: yanhong wang, linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis
On 18/01/2023 02:45, yanhong wang wrote:
>
>
> On 2023/1/6 20:45, Krzysztof Kozlowski wrote:
>> On 06/01/2023 03:59, Yanhong Wang wrote:
>>> Add documentation to describe StarFive dwmac driver(GMAC).
>>>
>>> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
>>> ---
>>> .../devicetree/bindings/net/snps,dwmac.yaml | 1 +
>>> .../bindings/net/starfive,jh7110-dwmac.yaml | 113 ++++++++++++++++++
>>> MAINTAINERS | 5 +
>>
>> Order the patches correctly. Why this binding patch is split from previous?
>>
>
> The previous binding patch was considered to be compatible with JH7100, but after discussion,
> it is not compatible with JH7100 for the time being, so the name of binding has been modified
> in this patch.
I am not asking about name, but why this was split from the patch using
the compatible in the first time. This does not make any sense. Please
squash.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 5/7] net: stmmac: Add glue layer for StarFive JH7110 SoCs
2023-01-06 2:59 [PATCH v3 0/7] Add Ethernet driver for StarFive JH7110 SoC Yanhong Wang
` (3 preceding siblings ...)
2023-01-06 2:59 ` [PATCH v3 4/7] dt-bindings: net: Add support StarFive dwmac Yanhong Wang
@ 2023-01-06 2:59 ` Yanhong Wang
2023-01-08 11:11 ` Arun.Ramadoss
2023-01-06 3:00 ` [PATCH v3 6/7] riscv: dts: starfive: jh7110: Add ethernet device node Yanhong Wang
2023-01-06 3:00 ` [PATCH v3 7/7] riscv: dts: starfive: visionfive-v2: Enable gmac device tree node Yanhong Wang
6 siblings, 1 reply; 20+ messages in thread
From: Yanhong Wang @ 2023-01-06 2:59 UTC (permalink / raw)
To: linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis,
Yanhong Wang
This adds StarFive dwmac driver support on the StarFive JH7110 SoCs.
Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
Co-developed-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
---
MAINTAINERS | 1 +
drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 ++
drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
.../stmicro/stmmac/dwmac-starfive-plat.c | 123 ++++++++++++++++++
4 files changed, 137 insertions(+)
create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-plat.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 56be59bb09f7..5b50b52d3dbb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19609,6 +19609,7 @@ F: include/dt-bindings/clock/starfive*
STARFIVE DWMAC GLUE LAYER
M: Yanhong Wang <yanhong.wang@starfivetech.com>
S: Maintained
+F: Documentation/devicetree/bindings/net/dwmac-starfive-plat.c
F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
STARFIVE PINCTRL DRIVER
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 31ff35174034..f9a4ad4abd54 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -235,6 +235,18 @@ config DWMAC_INTEL_PLAT
the stmmac device driver. This driver is used for the Intel Keem Bay
SoC.
+config DWMAC_STARFIVE_PLAT
+ tristate "StarFive dwmac support"
+ depends on OF && COMMON_CLK
+ depends on STMMAC_ETH
+ default SOC_STARFIVE
+ help
+ Support for ethernet controllers on StarFive RISC-V SoCs
+
+ This selects the StarFive platform specific glue layer support for
+ the stmmac device driver. This driver is used for StarFive JH7110
+ ethernet controller.
+
config DWMAC_VISCONTI
tristate "Toshiba Visconti DWMAC support"
default ARCH_VISCONTI
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
index d4e12e9ace4f..a63ab0ab5071 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_DWMAC_DWC_QOS_ETH) += dwmac-dwc-qos-eth.o
obj-$(CONFIG_DWMAC_INTEL_PLAT) += dwmac-intel-plat.o
obj-$(CONFIG_DWMAC_GENERIC) += dwmac-generic.o
obj-$(CONFIG_DWMAC_IMX8) += dwmac-imx.o
+obj-$(CONFIG_DWMAC_STARFIVE_PLAT) += dwmac-starfive-plat.o
obj-$(CONFIG_DWMAC_VISCONTI) += dwmac-visconti.o
stmmac-platform-objs:= stmmac_platform.o
dwmac-altr-socfpga-objs := altr_tse_pcs.o dwmac-socfpga.o
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-plat.c
new file mode 100644
index 000000000000..910095b10fe4
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-plat.c
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * StarFive DWMAC platform driver
+ *
+ * Copyright(C) 2022 StarFive Technology Co., Ltd.
+ *
+ */
+
+#include <linux/of_device.h>
+#include "stmmac_platform.h"
+
+struct starfive_dwmac {
+ struct device *dev;
+ struct clk *clk_tx;
+ struct clk *clk_gtx;
+ struct clk *clk_gtxc;
+};
+
+static void starfive_eth_plat_fix_mac_speed(void *priv, unsigned int speed)
+{
+ struct starfive_dwmac *dwmac = priv;
+ unsigned long rate;
+ int err;
+
+ switch (speed) {
+ case SPEED_1000:
+ rate = 125000000;
+ break;
+ case SPEED_100:
+ rate = 25000000;
+ break;
+ case SPEED_10:
+ rate = 2500000;
+ break;
+ default:
+ dev_err(dwmac->dev, "invalid speed %u\n", speed);
+ return;
+ }
+
+ err = clk_set_rate(dwmac->clk_gtx, rate);
+ if (err)
+ dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
+}
+
+static int starfive_eth_plat_probe(struct platform_device *pdev)
+{
+ struct plat_stmmacenet_data *plat_dat;
+ struct stmmac_resources stmmac_res;
+ struct starfive_dwmac *dwmac;
+ int (*syscon_init)(struct device *dev);
+ int err;
+
+ err = stmmac_get_platform_resources(pdev, &stmmac_res);
+ if (err)
+ return err;
+
+ plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
+ if (IS_ERR(plat_dat)) {
+ dev_err(&pdev->dev, "dt configuration failed\n");
+ return PTR_ERR(plat_dat);
+ }
+
+ dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
+ if (!dwmac)
+ return -ENOMEM;
+
+ syscon_init = of_device_get_match_data(&pdev->dev);
+ if (syscon_init) {
+ err = syscon_init(&pdev->dev);
+ if (err)
+ return err;
+ }
+
+ dwmac->clk_tx = devm_clk_get_enabled(&pdev->dev, "tx");
+ if (IS_ERR(dwmac->clk_tx))
+ return dev_err_probe(&pdev->dev, PTR_ERR(dwmac->clk_tx),
+ "error getting tx clock\n");
+
+ dwmac->clk_gtx = devm_clk_get_enabled(&pdev->dev, "gtx");
+ if (IS_ERR(dwmac->clk_gtx))
+ return dev_err_probe(&pdev->dev, PTR_ERR(dwmac->clk_gtx),
+ "error getting gtx clock\n");
+
+ dwmac->clk_gtxc = devm_clk_get_enabled(&pdev->dev, "gtxc");
+ if (IS_ERR(dwmac->clk_gtxc))
+ return dev_err_probe(&pdev->dev, PTR_ERR(dwmac->clk_gtxc),
+ "error getting gtxc clock\n");
+
+ dwmac->dev = &pdev->dev;
+ plat_dat->fix_mac_speed = starfive_eth_plat_fix_mac_speed;
+ plat_dat->init = NULL;
+ plat_dat->bsp_priv = dwmac;
+ plat_dat->dma_cfg->dche = true;
+
+ err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+ if (err) {
+ stmmac_remove_config_dt(pdev, plat_dat);
+ return err;
+ }
+
+ return 0;
+}
+
+static const struct of_device_id starfive_eth_plat_match[] = {
+ { .compatible = "starfive,jh7110-dwmac" },
+ { }
+};
+
+static struct platform_driver starfive_eth_plat_driver = {
+ .probe = starfive_eth_plat_probe,
+ .remove = stmmac_pltfr_remove,
+ .driver = {
+ .name = "starfive-eth-plat",
+ .pm = &stmmac_pltfr_pm_ops,
+ .of_match_table = starfive_eth_plat_match,
+ },
+};
+
+module_platform_driver(starfive_eth_plat_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("StarFive DWMAC platform driver");
+MODULE_AUTHOR("Yanhong Wang <yanhong.wang@starfivetech.com>");
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v3 5/7] net: stmmac: Add glue layer for StarFive JH7110 SoCs
2023-01-06 2:59 ` [PATCH v3 5/7] net: stmmac: Add glue layer for StarFive JH7110 SoCs Yanhong Wang
@ 2023-01-08 11:11 ` Arun.Ramadoss
2023-01-09 1:13 ` yanhong wang
0 siblings, 1 reply; 20+ messages in thread
From: Arun.Ramadoss @ 2023-01-08 11:11 UTC (permalink / raw)
To: netdev, linux-riscv, yanhong.wang, linux-kernel, devicetree
Cc: andrew, robh+dt, pgwipeout, kernel, kuba, pabeni, edumazet,
richardcochran, krzysztof.kozlowski+dt, davem, hkallweit1
Hi Yanhong,
On Fri, 2023-01-06 at 10:59 +0800, Yanhong Wang wrote:
> This adds StarFive dwmac driver support on the StarFive JH7110 SoCs.
>
> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
> Co-developed-by: Emil Renner Berthing <kernel@esmil.dk>
> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
> ---
> MAINTAINERS | 1 +
> drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 ++
> drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
> .../stmicro/stmmac/dwmac-starfive-plat.c | 123
> ++++++++++++++++++
> 4 files changed, 137 insertions(+)
> create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-
> starfive-plat.c
>
>
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-
> plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-plat.c
> new file mode 100644
> index 000000000000..910095b10fe4
> --- /dev/null
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-plat.c
> @@ -0,0 +1,123 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * StarFive DWMAC platform driver
> + *
> + * Copyright(C) 2022 StarFive Technology Co., Ltd.
> + *
> + */
> +
> +#include <linux/of_device.h>
Blank line between header with < > and " "
> +#include "stmmac_platform.h"
> +
> +struct starfive_dwmac {
> + struct device *dev;
> + struct clk *clk_tx;
> + struct clk *clk_gtx;
> + struct clk *clk_gtxc;
> +};
> +
> +static void starfive_eth_plat_fix_mac_speed(void *priv, unsigned int
> speed)
> +{
> + struct starfive_dwmac *dwmac = priv;
> + unsigned long rate;
> + int err;
> +
> + switch (speed) {
> + case SPEED_1000:
> + rate = 125000000;
> + break;
> + case SPEED_100:
> + rate = 25000000;
> + break;
> + case SPEED_10:
> + rate = 2500000;
> + break;
> + default:
> + dev_err(dwmac->dev, "invalid speed %u\n", speed);
> + return;
Do we need to return value, since it is invalid speed. But the return
value of function is void.
> + }
> +
> + err = clk_set_rate(dwmac->clk_gtx, rate);
> + if (err)
> + dev_err(dwmac->dev, "failed to set tx rate %lu\n",
> rate);
> +}
> +
> +static int starfive_eth_plat_probe(struct platform_device *pdev)
> +{
> + struct plat_stmmacenet_data *plat_dat;
> + struct stmmac_resources stmmac_res;
> + struct starfive_dwmac *dwmac;
> + int (*syscon_init)(struct device *dev);
Reverse christmas tree.
> + int err;
> +
> + err = stmmac_get_platform_resources(pdev, &stmmac_res);
> + if (err)
> + return err;
> +
> + plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
> + if (IS_ERR(plat_dat)) {
> + dev_err(&pdev->dev, "dt configuration failed\n");
> + return PTR_ERR(plat_dat);
> + }
> +
> + dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
> + if (!dwmac)
> + return -ENOMEM;
> +
> + syscon_init = of_device_get_match_data(&pdev->dev);
> + if (syscon_init) {
> + err = syscon_init(&pdev->dev);
> + if (err)
> + return err;
> + }
> +
> + dwmac->clk_tx = devm_clk_get_enabled(&pdev->dev, "tx");
> + if (IS_ERR(dwmac->clk_tx))
> + return dev_err_probe(&pdev->dev, PTR_ERR(dwmac-
> >clk_tx),
> + "error getting tx
> clock\n");
> +
> + dwmac->clk_gtx = devm_clk_get_enabled(&pdev->dev, "gtx");
> + if (IS_ERR(dwmac->clk_gtx))
> + return dev_err_probe(&pdev->dev, PTR_ERR(dwmac-
> >clk_gtx),
> + "error getting gtx
> clock\n");
> +
> + dwmac->clk_gtxc = devm_clk_get_enabled(&pdev->dev, "gtxc");
> + if (IS_ERR(dwmac->clk_gtxc))
> + return dev_err_probe(&pdev->dev, PTR_ERR(dwmac-
> >clk_gtxc),
> + "error getting gtxc
> clock\n");
> +
> + dwmac->dev = &pdev->dev;
> + plat_dat->fix_mac_speed = starfive_eth_plat_fix_mac_speed;
> + plat_dat->init = NULL;
> + plat_dat->bsp_priv = dwmac;
> + plat_dat->dma_cfg->dche = true;
> +
> + err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
> + if (err) {
> + stmmac_remove_config_dt(pdev, plat_dat);
> + return err;
> + }
> +
> + return 0;
> +}
> +
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v3 5/7] net: stmmac: Add glue layer for StarFive JH7110 SoCs
2023-01-08 11:11 ` Arun.Ramadoss
@ 2023-01-09 1:13 ` yanhong wang
0 siblings, 0 replies; 20+ messages in thread
From: yanhong wang @ 2023-01-09 1:13 UTC (permalink / raw)
To: Arun.Ramadoss, netdev, linux-riscv, linux-kernel, devicetree
Cc: andrew, robh+dt, pgwipeout, kernel, kuba, pabeni, edumazet,
richardcochran, krzysztof.kozlowski+dt, davem, hkallweit1
On 2023/1/8 19:11, Arun.Ramadoss@microchip.com wrote:
> Hi Yanhong,
>
> On Fri, 2023-01-06 at 10:59 +0800, Yanhong Wang wrote:
>> This adds StarFive dwmac driver support on the StarFive JH7110 SoCs.
>>
>> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
>> Co-developed-by: Emil Renner Berthing <kernel@esmil.dk>
>> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
>> ---
>> MAINTAINERS | 1 +
>> drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 ++
>> drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
>> .../stmicro/stmmac/dwmac-starfive-plat.c | 123
>> ++++++++++++++++++
>> 4 files changed, 137 insertions(+)
>> create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-
>> starfive-plat.c
>>
>>
>>
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-
>> plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-plat.c
>> new file mode 100644
>> index 000000000000..910095b10fe4
>> --- /dev/null
>> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive-plat.c
>> @@ -0,0 +1,123 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * StarFive DWMAC platform driver
>> + *
>> + * Copyright(C) 2022 StarFive Technology Co., Ltd.
>> + *
>> + */
>> +
>> +#include <linux/of_device.h>
>
> Blank line between header with < > and " "
>
Thanks, i will fix.
>> +#include "stmmac_platform.h"
>> +
>> +struct starfive_dwmac {
>> + struct device *dev;
>> + struct clk *clk_tx;
>> + struct clk *clk_gtx;
>> + struct clk *clk_gtxc;
>> +};
>> +
>> +static void starfive_eth_plat_fix_mac_speed(void *priv, unsigned int
>> speed)
>> +{
>> + struct starfive_dwmac *dwmac = priv;
>> + unsigned long rate;
>> + int err;
>> +
>> + switch (speed) {
>> + case SPEED_1000:
>> + rate = 125000000;
>> + break;
>> + case SPEED_100:
>> + rate = 25000000;
>> + break;
>> + case SPEED_10:
>> + rate = 2500000;
>> + break;
>> + default:
>> + dev_err(dwmac->dev, "invalid speed %u\n", speed);
>> + return;
>
> Do we need to return value, since it is invalid speed. But the return
> value of function is void.
>
I will fix.
>> + }
>> +
>> + err = clk_set_rate(dwmac->clk_gtx, rate);
>> + if (err)
>> + dev_err(dwmac->dev, "failed to set tx rate %lu\n",
>> rate);
>> +}
>> +
>> +static int starfive_eth_plat_probe(struct platform_device *pdev)
>> +{
>> + struct plat_stmmacenet_data *plat_dat;
>> + struct stmmac_resources stmmac_res;
>> + struct starfive_dwmac *dwmac;
>> + int (*syscon_init)(struct device *dev);
>
> Reverse christmas tree.
>
I will delete the unused variable syscon_init.
>> + int err;
>> +
>> + err = stmmac_get_platform_resources(pdev, &stmmac_res);
>> + if (err)
>> + return err;
>> +
>> + plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
>> + if (IS_ERR(plat_dat)) {
>> + dev_err(&pdev->dev, "dt configuration failed\n");
>> + return PTR_ERR(plat_dat);
>> + }
>> +
>> + dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
>> + if (!dwmac)
>> + return -ENOMEM;
>> +
>> + syscon_init = of_device_get_match_data(&pdev->dev);
>> + if (syscon_init) {
>> + err = syscon_init(&pdev->dev);
>> + if (err)
>> + return err;
>> + }
>> +
>> + dwmac->clk_tx = devm_clk_get_enabled(&pdev->dev, "tx");
>> + if (IS_ERR(dwmac->clk_tx))
>> + return dev_err_probe(&pdev->dev, PTR_ERR(dwmac-
>> >clk_tx),
>> + "error getting tx
>> clock\n");
>> +
>> + dwmac->clk_gtx = devm_clk_get_enabled(&pdev->dev, "gtx");
>> + if (IS_ERR(dwmac->clk_gtx))
>> + return dev_err_probe(&pdev->dev, PTR_ERR(dwmac-
>> >clk_gtx),
>> + "error getting gtx
>> clock\n");
>> +
>> + dwmac->clk_gtxc = devm_clk_get_enabled(&pdev->dev, "gtxc");
>> + if (IS_ERR(dwmac->clk_gtxc))
>> + return dev_err_probe(&pdev->dev, PTR_ERR(dwmac-
>> >clk_gtxc),
>> + "error getting gtxc
>> clock\n");
>> +
>> + dwmac->dev = &pdev->dev;
>> + plat_dat->fix_mac_speed = starfive_eth_plat_fix_mac_speed;
>> + plat_dat->init = NULL;
>> + plat_dat->bsp_priv = dwmac;
>> + plat_dat->dma_cfg->dche = true;
>> +
>> + err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
>> + if (err) {
>> + stmmac_remove_config_dt(pdev, plat_dat);
>> + return err;
>> + }
>> +
>> + return 0;
>> +}
>> +
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 6/7] riscv: dts: starfive: jh7110: Add ethernet device node
2023-01-06 2:59 [PATCH v3 0/7] Add Ethernet driver for StarFive JH7110 SoC Yanhong Wang
` (4 preceding siblings ...)
2023-01-06 2:59 ` [PATCH v3 5/7] net: stmmac: Add glue layer for StarFive JH7110 SoCs Yanhong Wang
@ 2023-01-06 3:00 ` Yanhong Wang
2023-01-06 3:00 ` [PATCH v3 7/7] riscv: dts: starfive: visionfive-v2: Enable gmac device tree node Yanhong Wang
6 siblings, 0 replies; 20+ messages in thread
From: Yanhong Wang @ 2023-01-06 3:00 UTC (permalink / raw)
To: linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis,
Yanhong Wang
Add JH7110 ethernet device node to support gmac driver for the JH7110
RISC-V SoC.
Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
---
arch/riscv/boot/dts/starfive/jh7110.dtsi | 93 ++++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index c22e8f1d2640..c6de6e3b1a25 100644
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -433,5 +433,98 @@
reg-shift = <2>;
status = "disabled";
};
+
+ stmmac_axi_setup: stmmac-axi-config {
+ snps,lpi_en;
+ snps,wr_osr_lmt = <4>;
+ snps,rd_osr_lmt = <4>;
+ snps,blen = <256 128 64 32 0 0 0>;
+ };
+
+ gmac0: ethernet@16030000 {
+ compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20";
+ reg = <0x0 0x16030000 0x0 0x10000>;
+ clocks = <&aoncrg JH7110_AONCLK_GMAC0_AXI>,
+ <&aoncrg JH7110_AONCLK_GMAC0_AHB>,
+ <&syscrg JH7110_SYSCLK_GMAC0_PTP>,
+ <&aoncrg JH7110_AONCLK_GMAC0_TX>,
+ <&syscrg JH7110_SYSCLK_GMAC0_GTXC>,
+ <&syscrg JH7110_SYSCLK_GMAC0_GTXCLK>;
+ clock-names = "stmmaceth", "pclk", "ptp_ref",
+ "tx", "gtxc", "gtx";
+ resets = <&aoncrg JH7110_AONRST_GMAC0_AXI>,
+ <&aoncrg JH7110_AONRST_GMAC0_AHB>;
+ reset-names = "stmmaceth", "ahb";
+ interrupts = <7>, <6>, <5>;
+ interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
+ phy-mode = "rgmii-id";
+ snps,multicast-filter-bins = <64>;
+ snps,perfect-filter-entries = <8>;
+ rx-fifo-depth = <2048>;
+ tx-fifo-depth = <2048>;
+ snps,fixed-burst;
+ snps,no-pbl-x8;
+ snps,force_thresh_dma_mode;
+ snps,axi-config = <&stmmac_axi_setup>;
+ snps,tso;
+ snps,en-tx-lpi-clockgating;
+ snps,txpbl = <16>;
+ snps,rxpbl = <16>;
+ status = "disabled";
+ phy-handle = <&phy0>;
+
+ mdio0: mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "snps,dwmac-mdio";
+
+ phy0: ethernet-phy@0 {
+ reg = <0>;
+ };
+ };
+ };
+
+ gmac1: ethernet@16040000 {
+ compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20";
+ reg = <0x0 0x16040000 0x0 0x10000>;
+ clocks = <&syscrg JH7110_SYSCLK_GMAC1_AXI>,
+ <&syscrg JH7110_SYSCLK_GMAC1_AHB>,
+ <&syscrg JH7110_SYSCLK_GMAC1_PTP>,
+ <&syscrg JH7110_SYSCLK_GMAC1_TX>,
+ <&syscrg JH7110_SYSCLK_GMAC1_GTXC>,
+ <&syscrg JH7110_SYSCLK_GMAC1_GTXCLK>;
+ clock-names = "stmmaceth", "pclk", "ptp_ref",
+ "tx", "gtxc", "gtx";
+ resets = <&syscrg JH7110_SYSRST_GMAC1_AXI>,
+ <&syscrg JH7110_SYSRST_GMAC1_AHB>;
+ reset-names = "stmmaceth", "ahb";
+ interrupts = <78>, <77>, <76>;
+ interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
+ phy-mode = "rgmii-id";
+ snps,multicast-filter-bins = <64>;
+ snps,perfect-filter-entries = <8>;
+ rx-fifo-depth = <2048>;
+ tx-fifo-depth = <2048>;
+ snps,fixed-burst;
+ snps,no-pbl-x8;
+ snps,force_thresh_dma_mode;
+ snps,axi-config = <&stmmac_axi_setup>;
+ snps,tso;
+ snps,en-tx-lpi-clockgating;
+ snps,txpbl = <16>;
+ snps,rxpbl = <16>;
+ status = "disabled";
+ phy-handle = <&phy1>;
+
+ mdio1: mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "snps,dwmac-mdio";
+
+ phy1: ethernet-phy@1 {
+ reg = <1>;
+ };
+ };
+ };
};
};
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 7/7] riscv: dts: starfive: visionfive-v2: Enable gmac device tree node
2023-01-06 2:59 [PATCH v3 0/7] Add Ethernet driver for StarFive JH7110 SoC Yanhong Wang
` (5 preceding siblings ...)
2023-01-06 3:00 ` [PATCH v3 6/7] riscv: dts: starfive: jh7110: Add ethernet device node Yanhong Wang
@ 2023-01-06 3:00 ` Yanhong Wang
6 siblings, 0 replies; 20+ messages in thread
From: Yanhong Wang @ 2023-01-06 3:00 UTC (permalink / raw)
To: linux-riscv, netdev, devicetree, linux-kernel
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Richard Cochran, Andrew Lunn, Heiner Kallweit, Peter Geis,
Yanhong Wang
Update gmac device tree node status to okay.
Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
---
.../dts/starfive/jh7110-starfive-visionfive-v2.dts | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-v2.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-v2.dts
index c8946cf3a268..b22363d5f9dc 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-v2.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-v2.dts
@@ -15,6 +15,8 @@
aliases {
serial0 = &uart0;
+ ethernet0 = &gmac0;
+ ethernet1 = &gmac1;
};
chosen {
@@ -114,3 +116,11 @@
pinctrl-0 = <&uart0_pins>;
status = "okay";
};
+
+&gmac0 {
+ status = "okay";
+};
+
+&gmac1 {
+ status = "okay";
+};
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread