* [PATCH v8 1/6] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version
2023-03-24 2:28 [PATCH v8 0/6] Add Ethernet driver for StarFive JH7110 SoC Samin Guo
@ 2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 2/6] net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string Samin Guo
` (4 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Samin Guo @ 2023-03-24 2:28 UTC (permalink / raw)
To: linux-kernel, linux-riscv, devicetree, netdev
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Jose Abreu, Richard Cochran, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Andrew Lunn, Heiner Kallweit,
Peter Geis, Yanhong Wang, Samin Guo, Tommaso Merciai
From: Emil Renner Berthing <kernel@esmil.dk>
Add dwmac-5.20 IP version to snps.dwmac.yaml
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Samin Guo <samin.guo@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 16b7d2904696..01b056ab71f7 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
@@ -575,6 +577,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
@@ -629,6 +632,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] 14+ messages in thread* [PATCH v8 2/6] net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string
2023-03-24 2:28 [PATCH v8 0/6] Add Ethernet driver for StarFive JH7110 SoC Samin Guo
2023-03-24 2:28 ` [PATCH v8 1/6] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version Samin Guo
@ 2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 3/6] dt-bindings: net: snps,dwmac: Add 'ahb' reset/reset-name Samin Guo
` (3 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Samin Guo @ 2023-03-24 2:28 UTC (permalink / raw)
To: linux-kernel, linux-riscv, devicetree, netdev
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Jose Abreu, Richard Cochran, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Andrew Lunn, Heiner Kallweit,
Peter Geis, Yanhong Wang, Samin Guo, Tommaso Merciai
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.
Tested-by: Tommaso Merciai <tomm.merciai@gmail.com>
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Samin Guo <samin.guo@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 067a40fe0a23..eb0b2898daa3 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] 14+ messages in thread* [PATCH v8 3/6] dt-bindings: net: snps,dwmac: Add 'ahb' reset/reset-name
2023-03-24 2:28 [PATCH v8 0/6] Add Ethernet driver for StarFive JH7110 SoC Samin Guo
2023-03-24 2:28 ` [PATCH v8 1/6] dt-bindings: net: snps,dwmac: Add dwmac-5.20 version Samin Guo
2023-03-24 2:28 ` [PATCH v8 2/6] net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string Samin Guo
@ 2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac Samin Guo
` (2 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Samin Guo @ 2023-03-24 2:28 UTC (permalink / raw)
To: linux-kernel, linux-riscv, devicetree, netdev
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Jose Abreu, Richard Cochran, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Andrew Lunn, Heiner Kallweit,
Peter Geis, Yanhong Wang, Samin Guo, Tommaso Merciai
According to:
stmmac_platform.c: stmmac_probe_config_dt
stmmac_main.c: stmmac_dvr_probe
dwmac controller may require one (stmmaceth) or two (stmmaceth+ahb)
reset signals, and the maxItems of resets/reset-names is going to be 2.
The gmac of Starfive Jh7110 SOC must have two resets.
it uses snps,dwmac-5.20 IP.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
---
.../devicetree/bindings/net/snps,dwmac.yaml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index 01b056ab71f7..e4519cf722ab 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -133,12 +133,16 @@ properties:
- ptp_ref
resets:
- maxItems: 1
- description:
- MAC Reset signal.
+ minItems: 1
+ items:
+ - description: GMAC stmmaceth reset
+ - description: AHB reset
reset-names:
- const: stmmaceth
+ minItems: 1
+ items:
+ - const: stmmaceth
+ - const: ahb
power-domains:
maxItems: 1
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
2023-03-24 2:28 [PATCH v8 0/6] Add Ethernet driver for StarFive JH7110 SoC Samin Guo
` (2 preceding siblings ...)
2023-03-24 2:28 ` [PATCH v8 3/6] dt-bindings: net: snps,dwmac: Add 'ahb' reset/reset-name Samin Guo
@ 2023-03-24 2:28 ` Samin Guo
2023-03-25 2:24 ` Jakub Kicinski
2023-03-28 11:57 ` Krzysztof Kozlowski
2023-03-24 2:28 ` [PATCH v8 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC Samin Guo
2023-03-24 2:28 ` [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings Samin Guo
5 siblings, 2 replies; 14+ messages in thread
From: Samin Guo @ 2023-03-24 2:28 UTC (permalink / raw)
To: linux-kernel, linux-riscv, devicetree, netdev
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Jose Abreu, Richard Cochran, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Andrew Lunn, Heiner Kallweit,
Peter Geis, Yanhong Wang, Samin Guo, Tommaso Merciai
From: Yanhong Wang <yanhong.wang@starfivetech.com>
Add documentation to describe StarFive dwmac driver(GMAC).
Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
---
.../devicetree/bindings/net/snps,dwmac.yaml | 1 +
.../bindings/net/starfive,jh7110-dwmac.yaml | 144 ++++++++++++++++++
MAINTAINERS | 6 +
3 files changed, 151 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 e4519cf722ab..245f7d713261 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..5861426032bd
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
@@ -0,0 +1,144 @@
+# 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:
+ - Emil Renner Berthing <kernel@esmil.dk>
+ - Samin Guo <samin.guo@starfivetech.com>
+
+select:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - starfive,jh7110-dwmac
+ required:
+ - compatible
+
+properties:
+ compatible:
+ items:
+ - enum:
+ - starfive,jh7110-dwmac
+ - const: snps,dwmac-5.20
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ items:
+ - description: GMAC main clock
+ - description: GMAC AHB clock
+ - description: PTP clock
+ - description: TX clock
+ - description: GTX clock
+
+ clock-names:
+ items:
+ - const: stmmaceth
+ - const: pclk
+ - const: ptp_ref
+ - const: tx
+ - const: gtx
+
+ interrupts:
+ minItems: 3
+ maxItems: 3
+
+ interrupt-names:
+ minItems: 3
+ maxItems: 3
+
+ resets:
+ items:
+ - description: MAC Reset signal.
+ - description: AHB Reset signal.
+
+ reset-names:
+ items:
+ - const: stmmaceth
+ - const: ahb
+
+ starfive,tx-use-rgmii-clk:
+ description:
+ Tx clock is provided by external rgmii clock.
+ type: boolean
+
+ starfive,syscon:
+ $ref: /schemas/types.yaml#/definitions/phandle-array
+ items:
+ - items:
+ - description: phandle to syscon that configures phy mode
+ - description: Offset of phy mode selection
+ - description: Shift of phy mode selection
+ description:
+ A phandle to syscon with two arguments that configure phy mode.
+ The argument one is the offset of phy mode selection, the
+ argument two is the shift of phy mode selection.
+
+allOf:
+ - $ref: snps,dwmac.yaml#
+
+unevaluatedProperties: false
+
+required:
+ - compatible
+ - reg
+ - clocks
+ - clock-names
+ - interrupts
+ - interrupt-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 6>, <&clk 111>;
+ clock-names = "stmmaceth", "pclk", "ptp_ref",
+ "tx", "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>;
+ starfive,syscon = <&aon_syscon 0xc 0x12>;
+ 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 ebc97c6c922f..5c6d53a9f62a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19905,6 +19905,12 @@ M: Emil Renner Berthing <kernel@esmil.dk>
S: Maintained
F: arch/riscv/boot/dts/starfive/
+STARFIVE DWMAC GLUE LAYER
+M: Emil Renner Berthing <kernel@esmil.dk>
+M: Samin Guo <samin.guo@starfivetech.com>
+S: Maintained
+F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+
STARFIVE JH7110 MMC/SD/SDIO DRIVER
M: William Qiu <william.qiu@starfivetech.com>
S: Supported
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
2023-03-24 2:28 ` [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac Samin Guo
@ 2023-03-25 2:24 ` Jakub Kicinski
2023-03-27 1:53 ` Guo Samin
2023-03-28 11:57 ` Krzysztof Kozlowski
1 sibling, 1 reply; 14+ messages in thread
From: Jakub Kicinski @ 2023-03-25 2:24 UTC (permalink / raw)
To: Samin Guo
Cc: linux-kernel, linux-riscv, devicetree, netdev, David S . Miller,
Eric Dumazet, Paolo Abeni, Rob Herring, Krzysztof Kozlowski,
Emil Renner Berthing, Jose Abreu, Richard Cochran, Conor Dooley,
Paul Walmsley, Palmer Dabbelt, Albert Ou, Andrew Lunn,
Heiner Kallweit, Peter Geis, Yanhong Wang, Tommaso Merciai
On Fri, 24 Mar 2023 10:28:17 +0800 Samin Guo wrote:
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ebc97c6c922f..5c6d53a9f62a 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -19905,6 +19905,12 @@ M: Emil Renner Berthing <kernel@esmil.dk>
> S: Maintained
> F: arch/riscv/boot/dts/starfive/
>
> +STARFIVE DWMAC GLUE LAYER
> +M: Emil Renner Berthing <kernel@esmil.dk>
> +M: Samin Guo <samin.guo@starfivetech.com>
> +S: Maintained
> +F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
> +
> STARFIVE JH7110 MMC/SD/SDIO DRIVER
> M: William Qiu <william.qiu@starfivetech.com>
> S: Supported
The context is wrong here, could you regen the series on top of
net-next (and resend with [PATCH net-next v9] in the subject while
at it)?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
2023-03-25 2:24 ` Jakub Kicinski
@ 2023-03-27 1:53 ` Guo Samin
2023-03-28 0:38 ` Jakub Kicinski
0 siblings, 1 reply; 14+ messages in thread
From: Guo Samin @ 2023-03-27 1:53 UTC (permalink / raw)
To: Jakub Kicinski
Cc: linux-kernel, linux-riscv, devicetree, netdev, David S . Miller,
Eric Dumazet, Paolo Abeni, Rob Herring, Krzysztof Kozlowski,
Emil Renner Berthing, Jose Abreu, Richard Cochran, Conor Dooley,
Paul Walmsley, Palmer Dabbelt, Albert Ou, Andrew Lunn,
Heiner Kallweit, Peter Geis, Yanhong Wang, Tommaso Merciai
Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
From: Jakub Kicinski <kuba@kernel.org>
to: Samin Guo <samin.guo@starfivetech.com>
data: 2023/3/25
> On Fri, 24 Mar 2023 10:28:17 +0800 Samin Guo wrote:
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index ebc97c6c922f..5c6d53a9f62a 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -19905,6 +19905,12 @@ M: Emil Renner Berthing <kernel@esmil.dk>
>> S: Maintained
>> F: arch/riscv/boot/dts/starfive/
>>
>> +STARFIVE DWMAC GLUE LAYER
>> +M: Emil Renner Berthing <kernel@esmil.dk>
>> +M: Samin Guo <samin.guo@starfivetech.com>
>> +S: Maintained
>> +F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
>> +
>> STARFIVE JH7110 MMC/SD/SDIO DRIVER
>> M: William Qiu <william.qiu@starfivetech.com>
>> S: Supported
>
> The context is wrong here, could you regen the series on top of
> net-next (and resend with [PATCH net-next v9] in the subject while
> at it)?
Hi Jakub,
Thanks, I will resent with [PATCH net-next v9].
My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch.
[1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@starfivetech.com
[2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@starfivetech.com
Do I need to remove their context?
Best regards,
Samin
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
2023-03-27 1:53 ` Guo Samin
@ 2023-03-28 0:38 ` Jakub Kicinski
2023-03-28 1:28 ` Guo Samin
0 siblings, 1 reply; 14+ messages in thread
From: Jakub Kicinski @ 2023-03-28 0:38 UTC (permalink / raw)
To: Guo Samin
Cc: linux-kernel, linux-riscv, devicetree, netdev, David S . Miller,
Eric Dumazet, Paolo Abeni, Rob Herring, Krzysztof Kozlowski,
Emil Renner Berthing, Jose Abreu, Richard Cochran, Conor Dooley,
Paul Walmsley, Palmer Dabbelt, Albert Ou, Andrew Lunn,
Heiner Kallweit, Peter Geis, Yanhong Wang, Tommaso Merciai
On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote:
> Thanks, I will resent with [PATCH net-next v9].
> My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch.
>
> [1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@starfivetech.com
> [2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@starfivetech.com
>
> Do I need to remove their context?
If the conflict is just on MAINTAINERS it should be safe to ignore.
Resend your patches on top of net-next as if their patches didn't
exist. Stephen/Linus will have not trouble resolving the conflict.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
2023-03-28 0:38 ` Jakub Kicinski
@ 2023-03-28 1:28 ` Guo Samin
0 siblings, 0 replies; 14+ messages in thread
From: Guo Samin @ 2023-03-28 1:28 UTC (permalink / raw)
To: Jakub Kicinski
Cc: linux-kernel, linux-riscv, devicetree, netdev, David S . Miller,
Eric Dumazet, Paolo Abeni, Rob Herring, Krzysztof Kozlowski,
Emil Renner Berthing, Jose Abreu, Richard Cochran, Conor Dooley,
Paul Walmsley, Palmer Dabbelt, Albert Ou, Andrew Lunn,
Heiner Kallweit, Peter Geis, Yanhong Wang, Tommaso Merciai
Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
From: Jakub Kicinski <kuba@kernel.org>
to: Guo Samin <samin.guo@starfivetech.com>
data: 2023/3/28
> On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote:
>> Thanks, I will resent with [PATCH net-next v9].
>> My series of patches will depend on Hal's minimal system[1] and william's syscon patch[2], and this context comes from their patch.
>>
>> [1]: https://patchwork.kernel.org/project/linux-riscv/cover/20230320103750.60295-1-hal.feng@starfivetech.com
>> [2]: https://patchwork.kernel.org/project/linux-riscv/cover/20230315055813.94740-1-william.qiu@starfivetech.com
>>
>> Do I need to remove their context?
>
> If the conflict is just on MAINTAINERS it should be safe to ignore.
> Resend your patches on top of net-next as if their patches didn't
> exist. Stephen/Linus will have not trouble resolving the conflict.
I see, I'll send net-next as you suggest.
Best regards,
Samin
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
2023-03-24 2:28 ` [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac Samin Guo
2023-03-25 2:24 ` Jakub Kicinski
@ 2023-03-28 11:57 ` Krzysztof Kozlowski
1 sibling, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2023-03-28 11:57 UTC (permalink / raw)
To: Samin Guo, linux-kernel, linux-riscv, devicetree, netdev
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Jose Abreu, Richard Cochran, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Andrew Lunn, Heiner Kallweit,
Peter Geis, Yanhong Wang, Tommaso Merciai
On 24/03/2023 03:28, Samin Guo wrote:
> From: Yanhong Wang <yanhong.wang@starfivetech.com>
>
> Add documentation to describe StarFive dwmac driver(GMAC).
>
> Signed-off-by: Yanhong Wang <yanhong.wang@starfivetech.com>
> Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
> + starfive,syscon:
> + $ref: /schemas/types.yaml#/definitions/phandle-array
> + items:
> + - items:
> + - description: phandle to syscon that configures phy mode
> + - description: Offset of phy mode selection
> + - description: Shift of phy mode selection
> + description:
> + A phandle to syscon with two arguments that configure phy mode.
> + The argument one is the offset of phy mode selection, the
> + argument two is the shift of phy mode selection.
> +
> +allOf:
> + - $ref: snps,dwmac.yaml#
> +
> +unevaluatedProperties: false
> +
> +required:
> + - compatible
> + - reg
> + - clocks
> + - clock-names
> + - interrupts
> + - interrupt-names
> + - resets
> + - reset-names
required: goes after properties:
Just like in example-schema.
*With* fix above:
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v8 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
2023-03-24 2:28 [PATCH v8 0/6] Add Ethernet driver for StarFive JH7110 SoC Samin Guo
` (3 preceding siblings ...)
2023-03-24 2:28 ` [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac Samin Guo
@ 2023-03-24 2:28 ` Samin Guo
2023-03-24 2:28 ` [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings Samin Guo
5 siblings, 0 replies; 14+ messages in thread
From: Samin Guo @ 2023-03-24 2:28 UTC (permalink / raw)
To: linux-kernel, linux-riscv, devicetree, netdev
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Jose Abreu, Richard Cochran, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Andrew Lunn, Heiner Kallweit,
Peter Geis, Yanhong Wang, Samin Guo, Tommaso Merciai
This adds StarFive dwmac driver support on the StarFive JH7110 SoC.
Tested-by: Tommaso Merciai <tomm.merciai@gmail.com>
Co-developed-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
---
MAINTAINERS | 1 +
drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 ++
drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
.../ethernet/stmicro/stmmac/dwmac-starfive.c | 121 ++++++++++++++++++
4 files changed, 135 insertions(+)
create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 5c6d53a9f62a..c27182492a6c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19909,6 +19909,7 @@ STARFIVE DWMAC GLUE LAYER
M: Emil Renner Berthing <kernel@esmil.dk>
M: Samin Guo <samin.guo@starfivetech.com>
S: Maintained
+F: Documentation/devicetree/bindings/net/dwmac-starfive.c
F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
STARFIVE JH7110 MMC/SD/SDIO DRIVER
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index f77511fe4e87..5f5a997f21f3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -165,6 +165,18 @@ config DWMAC_SOCFPGA
for the stmmac device driver. This driver is used for
arria5 and cyclone5 FPGA SoCs.
+config DWMAC_STARFIVE
+ tristate "StarFive dwmac support"
+ depends on OF && (ARCH_STARFIVE || COMPILE_TEST)
+ select MFD_SYSCON
+ default m if ARCH_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_STI
tristate "STi GMAC support"
default ARCH_STI
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
index 057e4bab5c08..8738fdbb4b2d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_DWMAC_OXNAS) += dwmac-oxnas.o
obj-$(CONFIG_DWMAC_QCOM_ETHQOS) += dwmac-qcom-ethqos.o
obj-$(CONFIG_DWMAC_ROCKCHIP) += dwmac-rk.o
obj-$(CONFIG_DWMAC_SOCFPGA) += dwmac-altr-socfpga.o
+obj-$(CONFIG_DWMAC_STARFIVE) += dwmac-starfive.o
obj-$(CONFIG_DWMAC_STI) += dwmac-sti.o
obj-$(CONFIG_DWMAC_STM32) += dwmac-stm32.o
obj-$(CONFIG_DWMAC_SUNXI) += dwmac-sunxi.o
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
new file mode 100644
index 000000000000..ef5a769b1c75
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * StarFive DWMAC platform driver
+ *
+ * Copyright (C) 2021 Emil Renner Berthing <kernel@esmil.dk>
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
+ *
+ */
+
+#include <linux/mfd/syscon.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+
+#include "stmmac_platform.h"
+
+struct starfive_dwmac {
+ struct device *dev;
+ struct clk *clk_tx;
+};
+
+static void starfive_dwmac_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);
+ break;
+ }
+
+ err = clk_set_rate(dwmac->clk_tx, rate);
+ if (err)
+ dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
+}
+
+static int starfive_dwmac_probe(struct platform_device *pdev)
+{
+ struct plat_stmmacenet_data *plat_dat;
+ struct stmmac_resources stmmac_res;
+ struct starfive_dwmac *dwmac;
+ struct clk *clk_gtx;
+ 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;
+
+ 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");
+
+ clk_gtx = devm_clk_get_enabled(&pdev->dev, "gtx");
+ if (IS_ERR(clk_gtx))
+ return dev_err_probe(&pdev->dev, PTR_ERR(clk_gtx),
+ "error getting gtx clock\n");
+
+ /* Generally, the rgmii_tx clock is provided by the internal clock,
+ * which needs to match the corresponding clock frequency according
+ * to different speeds. If the rgmii_tx clock is provided by the
+ * external rgmii_rxin, there is no need to configure the clock
+ * internally, because rgmii_rxin will be adaptively adjusted.
+ */
+ if (!device_property_read_bool(&pdev->dev, "starfive,tx-use-rgmii-clk"))
+ plat_dat->fix_mac_speed = starfive_dwmac_fix_mac_speed;
+
+ dwmac->dev = &pdev->dev;
+ 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_dwmac_match[] = {
+ { .compatible = "starfive,jh7110-dwmac" },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, starfive_dwmac_match);
+
+static struct platform_driver starfive_dwmac_driver = {
+ .probe = starfive_dwmac_probe,
+ .remove = stmmac_pltfr_remove,
+ .driver = {
+ .name = "starfive-dwmac",
+ .pm = &stmmac_pltfr_pm_ops,
+ .of_match_table = starfive_dwmac_match,
+ },
+};
+module_platform_driver(starfive_dwmac_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("StarFive DWMAC platform driver");
+MODULE_AUTHOR("Emil Renner Berthing <kernel@esmil.dk>");
+MODULE_AUTHOR("Samin Guo <samin.guo@starfivetech.com>");
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings
2023-03-24 2:28 [PATCH v8 0/6] Add Ethernet driver for StarFive JH7110 SoC Samin Guo
` (4 preceding siblings ...)
2023-03-24 2:28 ` [PATCH v8 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC Samin Guo
@ 2023-03-24 2:28 ` Samin Guo
2023-03-24 13:59 ` Emil Renner Berthing
5 siblings, 1 reply; 14+ messages in thread
From: Samin Guo @ 2023-03-24 2:28 UTC (permalink / raw)
To: linux-kernel, linux-riscv, devicetree, netdev
Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Rob Herring, Krzysztof Kozlowski, Emil Renner Berthing,
Jose Abreu, Richard Cochran, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Andrew Lunn, Heiner Kallweit,
Peter Geis, Yanhong Wang, Samin Guo, Tommaso Merciai
dwmac supports multiple modess. When working under rmii and rgmii,
you need to set different phy interfaces.
According to the dwmac document, when working in rmii, it needs to be
set to 0x4, and rgmii needs to be set to 0x1.
The phy interface needs to be set in syscon, the format is as follows:
starfive,syscon: <&syscon, offset, shift>
Tested-by: Tommaso Merciai <tomm.merciai@gmail.com>
Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
---
.../ethernet/stmicro/stmmac/dwmac-starfive.c | 47 +++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
index ef5a769b1c75..84690c8f0250 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
@@ -13,6 +13,10 @@
#include "stmmac_platform.h"
+#define STARFIVE_DWMAC_PHY_INFT_RGMII 0x1
+#define STARFIVE_DWMAC_PHY_INFT_RMII 0x4
+#define STARFIVE_DWMAC_PHY_INFT_FIELD 0x7U
+
struct starfive_dwmac {
struct device *dev;
struct clk *clk_tx;
@@ -44,6 +48,43 @@ static void starfive_dwmac_fix_mac_speed(void *priv, unsigned int speed)
dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
}
+static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat)
+{
+ struct starfive_dwmac *dwmac = plat_dat->bsp_priv;
+ struct regmap *regmap;
+ unsigned int args[2];
+ unsigned int mode;
+
+ switch (plat_dat->interface) {
+ case PHY_INTERFACE_MODE_RMII:
+ mode = STARFIVE_DWMAC_PHY_INFT_RMII;
+ break;
+
+ case PHY_INTERFACE_MODE_RGMII:
+ case PHY_INTERFACE_MODE_RGMII_ID:
+ mode = STARFIVE_DWMAC_PHY_INFT_RGMII;
+ break;
+
+ default:
+ dev_err(dwmac->dev, "unsupported interface %d\n",
+ plat_dat->interface);
+ return -EINVAL;
+ }
+
+ regmap = syscon_regmap_lookup_by_phandle_args(dwmac->dev->of_node,
+ "starfive,syscon",
+ 2, args);
+ if (IS_ERR(regmap)) {
+ dev_err(dwmac->dev, "syscon regmap failed.\n");
+ return -ENXIO;
+ }
+
+ /* args[0]:offset args[1]: shift */
+ return regmap_update_bits(regmap, args[0],
+ STARFIVE_DWMAC_PHY_INFT_FIELD << args[1],
+ mode << args[1]);
+}
+
static int starfive_dwmac_probe(struct platform_device *pdev)
{
struct plat_stmmacenet_data *plat_dat;
@@ -89,6 +130,12 @@ static int starfive_dwmac_probe(struct platform_device *pdev)
plat_dat->bsp_priv = dwmac;
plat_dat->dma_cfg->dche = true;
+ err = starfive_dwmac_set_mode(plat_dat);
+ if (err) {
+ dev_err(&pdev->dev, "dwmac set mode failed.\n");
+ return err;
+ }
+
err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
if (err) {
stmmac_remove_config_dt(pdev, plat_dat);
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings
2023-03-24 2:28 ` [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings Samin Guo
@ 2023-03-24 13:59 ` Emil Renner Berthing
2023-03-27 1:29 ` Guo Samin
0 siblings, 1 reply; 14+ messages in thread
From: Emil Renner Berthing @ 2023-03-24 13:59 UTC (permalink / raw)
To: Samin Guo
Cc: linux-kernel, linux-riscv, devicetree, netdev, David S . Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring,
Krzysztof Kozlowski, Emil Renner Berthing, Jose Abreu,
Richard Cochran, Conor Dooley, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Andrew Lunn, Heiner Kallweit, Peter Geis, Yanhong Wang,
Tommaso Merciai
On Fri, 24 Mar 2023 at 03:30, Samin Guo <samin.guo@starfivetech.com> wrote:
>
> dwmac supports multiple modess. When working under rmii and rgmii,
> you need to set different phy interfaces.
>
> According to the dwmac document, when working in rmii, it needs to be
> set to 0x4, and rgmii needs to be set to 0x1.
>
> The phy interface needs to be set in syscon, the format is as follows:
> starfive,syscon: <&syscon, offset, shift>
>
> Tested-by: Tommaso Merciai <tomm.merciai@gmail.com>
> Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
> ---
> .../ethernet/stmicro/stmmac/dwmac-starfive.c | 47 +++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
> index ef5a769b1c75..84690c8f0250 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
> @@ -13,6 +13,10 @@
>
> #include "stmmac_platform.h"
>
> +#define STARFIVE_DWMAC_PHY_INFT_RGMII 0x1
> +#define STARFIVE_DWMAC_PHY_INFT_RMII 0x4
> +#define STARFIVE_DWMAC_PHY_INFT_FIELD 0x7U
> +
> struct starfive_dwmac {
> struct device *dev;
> struct clk *clk_tx;
> @@ -44,6 +48,43 @@ static void starfive_dwmac_fix_mac_speed(void *priv, unsigned int speed)
> dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
> }
>
> +static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat)
> +{
> + struct starfive_dwmac *dwmac = plat_dat->bsp_priv;
> + struct regmap *regmap;
> + unsigned int args[2];
> + unsigned int mode;
> +
> + switch (plat_dat->interface) {
> + case PHY_INTERFACE_MODE_RMII:
> + mode = STARFIVE_DWMAC_PHY_INFT_RMII;
> + break;
> +
> + case PHY_INTERFACE_MODE_RGMII:
> + case PHY_INTERFACE_MODE_RGMII_ID:
> + mode = STARFIVE_DWMAC_PHY_INFT_RGMII;
> + break;
> +
> + default:
> + dev_err(dwmac->dev, "unsupported interface %d\n",
> + plat_dat->interface);
> + return -EINVAL;
> + }
> +
> + regmap = syscon_regmap_lookup_by_phandle_args(dwmac->dev->of_node,
> + "starfive,syscon",
> + 2, args);
> + if (IS_ERR(regmap)) {
> + dev_err(dwmac->dev, "syscon regmap failed.\n");
> + return -ENXIO;
> + }
> +
> + /* args[0]:offset args[1]: shift */
> + return regmap_update_bits(regmap, args[0],
> + STARFIVE_DWMAC_PHY_INFT_FIELD << args[1],
> + mode << args[1]);
> +}
> +
> static int starfive_dwmac_probe(struct platform_device *pdev)
> {
> struct plat_stmmacenet_data *plat_dat;
> @@ -89,6 +130,12 @@ static int starfive_dwmac_probe(struct platform_device *pdev)
> plat_dat->bsp_priv = dwmac;
> plat_dat->dma_cfg->dche = true;
>
> + err = starfive_dwmac_set_mode(plat_dat);
> + if (err) {
> + dev_err(&pdev->dev, "dwmac set mode failed.\n");
> + return err;
> + }
Usually it's better to keep all error messages at the same "level".
Like this you'll get two error messages if
syscon_regmap_lookup_by_phandle_args fails. So I'd suggest moving this
message into the starfive_dwmac_set_mode function and while you're at
it you can do
err = regmap_update_bits(...);
if (err)
return dev_err_probe(dwmac->dev, err, "error setting phy mode\n");
Also the file is called dwmac-starfive.c, so I'd expect the patch
header to be "net: stmmac: dwmac-starfive: Add phy interface
settings".
/Emil
> err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
> if (err) {
> stmmac_remove_config_dt(pdev, plat_dat);
> --
> 2.17.1
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings
2023-03-24 13:59 ` Emil Renner Berthing
@ 2023-03-27 1:29 ` Guo Samin
0 siblings, 0 replies; 14+ messages in thread
From: Guo Samin @ 2023-03-27 1:29 UTC (permalink / raw)
To: Emil Renner Berthing
Cc: linux-kernel, linux-riscv, devicetree, netdev, David S . Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring,
Krzysztof Kozlowski, Emil Renner Berthing, Jose Abreu,
Richard Cochran, Conor Dooley, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Andrew Lunn, Heiner Kallweit, Peter Geis, Yanhong Wang,
Tommaso Merciai
Re: [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings
From: Emil Renner Berthing <emil.renner.berthing@canonical.com>
to: Samin Guo <samin.guo@starfivetech.com>
data: 2023/3/24
> On Fri, 24 Mar 2023 at 03:30, Samin Guo <samin.guo@starfivetech.com> wrote:
>>
>> dwmac supports multiple modess. When working under rmii and rgmii,
>> you need to set different phy interfaces.
>>
>> According to the dwmac document, when working in rmii, it needs to be
>> set to 0x4, and rgmii needs to be set to 0x1.
>>
>> The phy interface needs to be set in syscon, the format is as follows:
>> starfive,syscon: <&syscon, offset, shift>
>>
>> Tested-by: Tommaso Merciai <tomm.merciai@gmail.com>
>> Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
>> ---
>> .../ethernet/stmicro/stmmac/dwmac-starfive.c | 47 +++++++++++++++++++
>> 1 file changed, 47 insertions(+)
>>
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
>> index ef5a769b1c75..84690c8f0250 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
>> @@ -13,6 +13,10 @@
>>
>> #include "stmmac_platform.h"
>>
>> +#define STARFIVE_DWMAC_PHY_INFT_RGMII 0x1
>> +#define STARFIVE_DWMAC_PHY_INFT_RMII 0x4
>> +#define STARFIVE_DWMAC_PHY_INFT_FIELD 0x7U
>> +
>> struct starfive_dwmac {
>> struct device *dev;
>> struct clk *clk_tx;
>> @@ -44,6 +48,43 @@ static void starfive_dwmac_fix_mac_speed(void *priv, unsigned int speed)
>> dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
>> }
>>
>> +static int starfive_dwmac_set_mode(struct plat_stmmacenet_data *plat_dat)
>> +{
>> + struct starfive_dwmac *dwmac = plat_dat->bsp_priv;
>> + struct regmap *regmap;
>> + unsigned int args[2];
>> + unsigned int mode;
>> +
>> + switch (plat_dat->interface) {
>> + case PHY_INTERFACE_MODE_RMII:
>> + mode = STARFIVE_DWMAC_PHY_INFT_RMII;
>> + break;
>> +
>> + case PHY_INTERFACE_MODE_RGMII:
>> + case PHY_INTERFACE_MODE_RGMII_ID:
>> + mode = STARFIVE_DWMAC_PHY_INFT_RGMII;
>> + break;
>> +
>> + default:
>> + dev_err(dwmac->dev, "unsupported interface %d\n",
>> + plat_dat->interface);
>> + return -EINVAL;
>> + }
>> +
>> + regmap = syscon_regmap_lookup_by_phandle_args(dwmac->dev->of_node,
>> + "starfive,syscon",
>> + 2, args);
>> + if (IS_ERR(regmap)) {
>> + dev_err(dwmac->dev, "syscon regmap failed.\n");
>> + return -ENXIO;
>> + }
>> +
>> + /* args[0]:offset args[1]: shift */
>> + return regmap_update_bits(regmap, args[0],
>> + STARFIVE_DWMAC_PHY_INFT_FIELD << args[1],
>> + mode << args[1]);
>> +}
>> +
>> static int starfive_dwmac_probe(struct platform_device *pdev)
>> {
>> struct plat_stmmacenet_data *plat_dat;
>> @@ -89,6 +130,12 @@ static int starfive_dwmac_probe(struct platform_device *pdev)
>> plat_dat->bsp_priv = dwmac;
>> plat_dat->dma_cfg->dche = true;
>>
>> + err = starfive_dwmac_set_mode(plat_dat);
>> + if (err) {
>> + dev_err(&pdev->dev, "dwmac set mode failed.\n");
>> + return err;
>> + }
>
> Usually it's better to keep all error messages at the same "level".
> Like this you'll get two error messages if
> syscon_regmap_lookup_by_phandle_args fails. So I'd suggest moving this
> message into the starfive_dwmac_set_mode function and while you're at
> it you can do
>
> err = regmap_update_bits(...);
> if (err)
> return dev_err_probe(dwmac->dev, err, "error setting phy mode\n");
>
> Also the file is called dwmac-starfive.c, so I'd expect the patch
> header to be "net: stmmac: dwmac-starfive: Add phy interface
> settings".
>
> /Emil
>
Thanks, the next version will be optimized.
Best regards,
Samin
>> err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
>> if (err) {
>> stmmac_remove_config_dt(pdev, plat_dat);
>> --
>> 2.17.1
>>
>>
>> _______________________________________________
>> linux-riscv mailing list
>> linux-riscv@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 14+ messages in thread