Skip to contentSkip to conversation

Add Ethernet driver for StarFive JH7110 SoC

PATCH Superseded Samin Guo 4 participants 14 messages Mar 24, 2023 – Mar 28, 2023

Subsystems (7)

v8 of 12 Superseded Latest is v12 →

lore
Share & tools
lore

Samin Guo

author
#0 lore raw

v8 cover Add Ethernet driver for StarFive JH7110 SoC

This series adds ethernet support for the StarFive JH7110 RISC-V SoC, which includes a dwmac-5.20 MAC driver (from Synopsys DesignWare). This series has been tested and works fine on VisionFive-2 v1.2A and v1.3B SBC boards.

For more information and support, you can visit RVspace wiki[1]. You can simply review or test the patches at the link [2]. This patchset should be applied after the patchset [3] [4].

[1]: https://wiki.rvspace.org/
[2]: https://github.com/SaminGuo/linux/tree/vf2-6.3rc3-gmac
[3]: https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]
[4]: https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]

Changes since v7:
Patch 4:
- Constrained the reg/interrupts/interrupt-names properties (by Krzysztof Kozlowski)

Changes history:

Changes since v6:
- Sended network patches[patch 1,2,3,4,5,6] and riscv trees patches[patch 7,8] separately (by Jakub Kicinski)

Changes since v5:
- Dropped "depends on STMMAC_ETH" and compiled DWMAC_STARFIVE to m by default (by Emil)
- Removed clk_gtx in struct starfive_dwmac due to this pointer is only set, but never read. (by Emil)
- Only setting the plat_dat->fix_mac_speed callback when it is needed (by Emil)
- Moved mdio/phy nodes from SOC .dtsi into board .dtsi (by Andrew)
- Modified the parameters passed by starfive,syscon (by Andrew && Emil)

    <syscon, offset, mask>  ==>  <syscon, offset, shift>

- Optimized the patchs(Fewer patches from 12 to 8)
1)merged patch-7 into patch-4 (by Rob)
2)merged patch-9 into patch-5
2)merged patch-11,12 into patch-10
3)Adjusted the patchs order
- Fixed the unevaluatedProperties property from true to false (by Rob)
- Replaced contains:enum with items:const for reset-names in snps,dwmac.yaml (by Rob)
- Tested-by: Tommaso Merciai <[email protected]>

Changes since v4:
- Supported both visionfive 2 v1.2A and visionfive 2 v1.3B.
- Reworded the maxitems number of resets property in 'snps,dwmac.yaml'.
- Suggested by Emil, dropped the _PLAT/_plat from the config/function/struct/file names.
- Suggested by Emil, added MODULE_DEVICE_TABLE().
- Suggested by Emil, dropped clk_gtxclk and use clk_tx_inv to set the clock frequency.
- Added phy interface mode configuration function.
- Rebased on tag v6.2.

Changes since v3:
- Reworded the maxitems number of resets property in 'snps,dwmac.yaml'
- Removed the unused code in 'dwmac-starfive-plat.c'.
- Reworded the return statement in 'starfive_eth_plat_fix_mac_speed' function.

Changes since v2:
- Renamed the dt-bindings 'starfive,jh71x0-dwmac.yaml' to 'starfive,jh7110-dwmac.yaml'.
- Reworded the commit messages.
- Reworded the example context in the dt-binding 'starfive,jh7110-dwmac.yaml'.
- Removed "starfive,jh7100-dwmac" compatible string and special initialization of jh7100.
- Removed the parts of YT8531,so dropped patch 5 and 6.
- Reworded the maxitems number of resets property in 'snps,dwmac.yaml'.

Changes since v1:
- Recovered the author of the 1st and 3rd patches back to Emil Renner Berthing.
- Added a new patch to update maxitems number of resets property in 'snps,dwmac.yaml'.
- Fixed the check errors reported by "make dt_binding_check".
- Renamed the dt-binding 'starfive,dwmac-plat.yaml' to 'starfive,jh71x0-dwmac.yaml'.
- Updated the example context in the dt-binding 'starfive,jh71x0-dwmac.yaml'.
- Added new dt-binding 'motorcomm,yt8531.yaml' to describe details of phy clock delay configuration parameters.
- Added more comments for PHY driver setting. For more details, see 'motorcomm,yt8531.yaml'.
- Moved mdio device tree node from 'jh7110-starfive-visionfive-v2.dts' to 'jh7110.dtsi'.
- Re-worded the commit message of several patches.
- Renamed all the functions with starfive_eth_plat prefix in 'dwmac-starfive-plat.c'.
- Added "starfive,jh7100-dwmac" compatible string and special init to support JH7100.

Previous versions:
v1 - https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]/
v2 - https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]/
v3 - https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]/
v4 - https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]/
v5 - https://patchwork.kernel.org/project/netdevbpf/cover/[email protected]/
v6 - https://patchwork.kernel.org/project/netdevbpf/cover/[email protected]/
v7 - https://patchwork.kernel.org/project/netdevbpf/cover/[email protected]/

Emil Renner Berthing (2):
dt-bindings: net: snps,dwmac: Add dwmac-5.20 version
net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string

Samin Guo (3):
dt-bindings: net: snps,dwmac: Add 'ahb' reset/reset-name
net: stmmac: Add glue layer for StarFive JH7110 SoC
net: stmmac: starfive_dmac: Add phy interface settings

Yanhong Wang (1):
dt-bindings: net: Add support StarFive dwmac

 .../devicetree/bindings/net/snps,dwmac.yaml   |  17 +-
 .../bindings/net/starfive,jh7110-dwmac.yaml   | 144 +++++++++++++++
 MAINTAINERS                                   |   7 +
 drivers/net/ethernet/stmicro/stmmac/Kconfig   |  12 ++
 drivers/net/ethernet/stmicro/stmmac/Makefile  |   1 +
 .../ethernet/stmicro/stmmac/dwmac-starfive.c  | 168 ++++++++++++++++++
 .../ethernet/stmicro/stmmac/stmmac_platform.c |   3 +-
 7 files changed, 347 insertions(+), 5 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c

base-commit: e8d018dd0257f744ca50a729e3d042cf2ec9da65
prerequisite-patch-id: 8a6f135bcabdad4a4bfb21f0c6a0ffd2bb57efe7
prerequisite-patch-id: 1da7255d6aeb5576ca810116a9323452be2202fa
prerequisite-patch-id: 50d53a21f91f4087fc80b6f1f72864adfb0002b9
prerequisite-patch-id: 0df3703af91c30f1ca2c47f5609012f2d7200028
prerequisite-patch-id: 89f049f951e5acf75aab92541992f816fd0acc0d
prerequisite-patch-id: 85c5bb437c383b2e68c79e59a439f01b7bcd963e
prerequisite-patch-id: 8600b156a235be2b3db53be3f834e7a370e2cfb9
prerequisite-patch-id: 1b2d0982b18da060c82134f05bf3ce16425bac8d
prerequisite-patch-id: 090ba4b78d47bc19204916e76fdbc70021785388
prerequisite-patch-id: a5d9e0f7d4f8163f566678894cf693015119f2d9
prerequisite-patch-id: 42d352fe14713b74951c4513128a0a494b2dce76
prerequisite-patch-id: bb939c0c7c26b08addfccd890f9d3974b6eaec53
prerequisite-patch-id: 4f10a3d827679eafbd3d49d2e21f31032dc9c418
prerequisite-patch-id: fd93763b95469912bde9bdfa4cd827c8d5dba9c6
prerequisite-patch-id: 6987950c2eb4b3773b2df8f7934eff434244aeab
prerequisite-patch-id: 258ea5f9b8bf41b6981345dcc81795f25865d38f
prerequisite-patch-id: 8b6f2c9660c0ac0ee4e73e4c21aca8e6b75e81b9
prerequisite-patch-id: dbb0c0151b8bdf093e6ce79fd2fe3f60791a6e0b
prerequisite-patch-id: e7773c977a7b37692e9792b21cc4f17fa58f9215
prerequisite-patch-id: d57e95d31686772abc4c4d5aa1cadc344dc293cd
prerequisite-patch-id: 9f911969d0a550648493952c99096d26e05d4d83
prerequisite-patch-id: 999c243dca89d56d452aa52ea3e181358b5c1d80
prerequisite-patch-id: 1be0fb49e0fbe293ca8fa94601e191b13c8c67d9

Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v8 1/6 dt-bindings: net: snps,dwmac: Add dwmac-5.20 version

From: Emil Renner Berthing <[email protected]>

Add dwmac-5.20 IP version to snps.dwmac.yaml

---
 Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/net/snps,dwmac.yaml +4 -0
index 16b7d2904696..01b056ab71f7 100644
@@ -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
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v8 2/6 net: stmmac: platform: Add snps,dwmac-5.20 IP compatible string

In reply to Samin Guo

From: Emil Renner Berthing <[email protected]>

Add "snps,dwmac-5.20" compatible string for 5.20 version that can avoid to define some platform data in the glue layer.

---
 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +2 -1
index 067a40fe0a23..eb0b2898daa3 100644
@@ -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;
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH v8 3/6 dt-bindings: net: snps,dwmac: Add 'ahb' reset/reset-name

In reply to Samin Guo

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.

---
 .../devicetree/bindings/net/snps,dwmac.yaml          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/net/snps,dwmac.yaml +8 -4
index 01b056ab71f7..e4519cf722ab 100644
@@ -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
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH v8 4/6 dt-bindings: net: Add support StarFive dwmac

In reply to Samin Guo

From: Yanhong Wang <[email protected]>

Add documentation to describe StarFive dwmac driver(GMAC).

---
 .../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
Documentation/devicetree/bindings/net/snps,dwmac.yaml +1 -0
index e4519cf722ab..245f7d713261 100644
@@ -91,6 +91,7 @@ properties:
         - snps,dwmac-5.20
         - snps,dwxgmac
         - snps,dwxgmac-2.10
+        - starfive,jh7110-dwmac
 
   reg:
     minItems: 1
Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml new file +144 -0

144 lines not on this page · raw message

MAINTAINERS +6 -0
index ebc97c6c922f..5c6d53a9f62a 100644
@@ -19905,6 +19905,12 @@ M:	Emil Renner Berthing <[email protected]>
 S:	Maintained
 F:	arch/riscv/boot/dts/starfive/
 
+STARFIVE DWMAC GLUE LAYER
+M:	Emil Renner Berthing <[email protected]>
+M:	Samin Guo <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+
 STARFIVE JH7110 MMC/SD/SDIO DRIVER
 M:	William Qiu <[email protected]>
 S:	Supported
Signature · 1 line
2.17.1
maintainer
#5 lore raw

Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac

Quoted 7 lines · On Fri, 24 Mar 2023 10:28:17 +0800 Samin Guo wrote:
MAINTAINERS +0 -0
index ebc97c6c922f..5c6d53a9f62a 100644
@@ -19905,6 +19905,12 @@ M:	Emil Renner Berthing <[email protected]>
 S:	Maintained
 F:	arch/riscv/boot/dts/starfive/

MAINTAINERS M: Emil Renner Berthing <[email protected]> · line 19916

Quoted 10 lines
MAINTAINERS +6 -0
 
+STARFIVE DWMAC GLUE LAYER
+M:	Emil Renner Berthing <[email protected]>
+M:	Samin Guo <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+
 STARFIVE JH7110 MMC/SD/SDIO DRIVER
 M:	William Qiu <[email protected]>
 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)?

author
#6 lore raw

Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac

Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
From: Jakub Kicinski <[email protected]>
to: Samin Guo <[email protected]>
data: 2023/3/25

Quoted 9 lines · On Fri, 24 Mar 2023 10:28:17 +0800 Samin Guo wrote:
Quoted 8 lines
MAINTAINERS +0 -0
index ebc97c6c922f..5c6d53a9f62a 100644
@@ -19905,6 +19905,12 @@ M:	Emil Renner Berthing <[email protected]>
 S:	Maintained
 F:	arch/riscv/boot/dts/starfive/
 
Quoted 13 lines

MAINTAINERS M: Emil Renner Berthing <[email protected]> · line 19916

Quoted 9 lines
MAINTAINERS +6 -0
+STARFIVE DWMAC GLUE LAYER
+M:	Emil Renner Berthing <[email protected]>
+M:	Samin Guo <[email protected]>
+S:	Maintained
+F:	Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+
 STARFIVE JH7110 MMC/SD/SDIO DRIVER
 M:	William Qiu <[email protected]>
 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/[email protected]
[2]: https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]

Do I need to remove their context?

Best regards,
Samin

maintainer
#7 lore raw

Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac

Quoted 7 lines · 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/[email protected]
[2]: https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]

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.

author
#8 lore raw

Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac

Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac
From: Jakub Kicinski <[email protected]>
to: Guo Samin <[email protected]>
data: 2023/3/28

Quoted 12 lines · On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote:
Quoted 7 lines

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/[email protected]
[2]: https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]

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

Reviewed-by on v8 4/6
#9 lore raw

Re: [PATCH v8 4/6] dt-bindings: net: Add support StarFive dwmac

In reply to Samin Guo
Quoted 24 lines · Samin Guo

From: Yanhong Wang <[email protected]>

Add documentation to describe StarFive dwmac driver(GMAC).

Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml new file +16 -0
+  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

Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml line 97

Quoted 10 lines
Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml new file +10 -0
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - interrupts
+  - interrupt-names
+  - resets
+  - reset-names

required: goes after properties:

Just like in example-schema.

*With* fix above:

Best regards,
Krzysztof

author
#10 lore raw

PATCH v8 5/6 net: stmmac: Add glue layer for StarFive JH7110 SoC

In reply to Samin Guo

This adds StarFive dwmac driver support on the StarFive JH7110 SoC.

---
 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
MAINTAINERS +1 -0
index 5c6d53a9f62a..c27182492a6c 100644
@@ -19909,6 +19909,7 @@ STARFIVE DWMAC GLUE LAYER
 M:	Emil Renner Berthing <[email protected]>
 M:	Samin Guo <[email protected]>
 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
drivers/net/ethernet/stmicro/stmmac/Kconfig +12 -0
index f77511fe4e87..5f5a997f21f3 100644
@@ -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
drivers/net/ethernet/stmicro/stmmac/Makefile +1 -0
index 057e4bab5c08..8738fdbb4b2d 100644
@@ -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
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +121 -0

121 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#11 lore raw

PATCH v8 6/6 net: stmmac: starfive_dmac: Add phy interface settings

In reply to Samin Guo

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>

---
 .../ethernet/stmicro/stmmac/dwmac-starfive.c  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +47 -0
index ef5a769b1c75..84690c8f0250 100644
@@ -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);
Signature · 1 line
2.17.1
#12 lore raw

Re: [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings

Quoted 76 lines · Samin Guo

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>

---
 .../ethernet/stmicro/stmmac/dwmac-starfive.c  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +41 -0
index ef5a769b1c75..84690c8f0250 100644
@@ -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;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c static int starfive_dwmac_probe(struct platform_device *pdev) · line 137

Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +5 -0
@@ -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

Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +0 -1
        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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author
#13 lore raw

Re: [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings

Re: [PATCH v8 6/6] net: stmmac: starfive_dmac: Add phy interface settings
From: Emil Renner Berthing <[email protected]>
to: Samin Guo <[email protected]>
data: 2023/3/24

Quoted 96 lines · Samin Guo
Quoted 76 lines

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>

---
 .../ethernet/stmicro/stmmac/dwmac-starfive.c  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +41 -0
index ef5a769b1c75..84690c8f0250 100644
@@ -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;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c static int starfive_dwmac_probe(struct platform_device *pdev) · line 137

Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +5 -0
@@ -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");

Quoted 6 lines

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

Quoted 11 lines
Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +0 -1
        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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv