Skip to contentSkip to conversation

Add Ethernet driver for StarFive JH7110 SoC

PATCH Superseded Samin Guo 3 participants 15 messages Apr 7, 2023 – Apr 11, 2023

Subsystems (7)

v11 of 12 Superseded Latest is v12 →

lore
Share & tools
lore

Samin Guo

author
#0 lore raw

v11 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.3rc4-gmac-net-next
[3]: https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]
[4]: https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]

Changes since v10:
Patch 4:
- Required goes after properties (by Krzysztof Kozlowski) Patch 5:
- Fixed the wrong binding filename (by Conor Dooley)

Changes history:

Changes since v9:
- Rebased on tag v6.3-rc4.
Patch 5:
- Cleaned up all the error handling code by dev_err_probe (by Emil).
- Fixed the warning that clang uses W=1 because 'rate' may not be initialized (by Jakub Kicinski)

Changes since v8:
Patch 4:
- Dropped irrelevant MAINTAINERS context (by Jakub Kicinski)
Patch 6:
- Moved error messages to starfive_dwmac_set_mode function to avoid getting error messages twice when syscon_regmap_lookup_by_phandle_args fails. (by Emil)
- Renamed patch header to "net: stmmac: dwmac-starfive:xxx" (by Emil)

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

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]/
v8 - https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]/
v9 - https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]/
v10 - https://patchwork.kernel.org/project/linux-riscv/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  | 171 ++++++++++++++++++
 .../ethernet/stmicro/stmmac/stmmac_platform.c |   3 +-
 7 files changed, 350 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: 522c3534e9e1123cd03999016b08ce811058dfe0
prerequisite-patch-id: 55390537360f25c8b9cbfdc30b73ade004f436f7
prerequisite-patch-id: bb939c0c7c26b08addfccd890f9d3974b6eaec53
prerequisite-patch-id: 8a6f135bcabdad4a4bfb21f0c6a0ffd2bb57efe7
prerequisite-patch-id: c2366f993a9d85e28c06d8d09f064dd5e8b29a61
prerequisite-patch-id: 50d53a21f91f4087fc80b6f1f72864adfb0002b9
prerequisite-patch-id: 0df3703af91c30f1ca2c47f5609012f2d7200028
prerequisite-patch-id: 89f049f951e5acf75aab92541992f816fd0acc0d
prerequisite-patch-id: 551fae54377090044c3612fca9740a9b359abdd2
prerequisite-patch-id: c7fdf904f398d478f0ed6d57eb878982bc73329d
prerequisite-patch-id: 1b2d0982b18da060c82134f05bf3ce16425bac8d
prerequisite-patch-id: 090ba4b78d47bc19204916e76fdbc70021785388
prerequisite-patch-id: a5d9e0f7d4f8163f566678894cf693015119f2d9
prerequisite-patch-id: 4637a8fa2334a45fa6b64351f4e9e28d3e2d60d3
prerequisite-patch-id: 32647ec60a3b614e1c59ec8e54cb511ae832c22f
prerequisite-patch-id: aa06658ecf89c92d0dfdd6a4ba6d9e6e67532971
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: 41eddeabff082d08a76d8da523f90da4b5218d28
prerequisite-patch-id: 999c243dca89d56d452aa52ea3e181358b5c1d80
prerequisite-patch-id: 1be0fb49e0fbe293ca8fa94601e191b13c8c67d9 --
2.17.1

author
#1 lore raw

PATCH v11 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 v11 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 v11 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 v11 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 1dc8bd26b6cf..6b6b67468b8f 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 JH7100 CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
 S:	Maintained
Signature · 1 line
2.17.1
author
#5 lore raw

PATCH v11 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  | 123 ++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
MAINTAINERS +1 -0
index 6b6b67468b8f..46b366456cee 100644
@@ -19910,6 +19910,7 @@ M:	Emil Renner Berthing <[email protected]>
 M:	Samin Guo <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+F:	drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 
 STARFIVE JH7100 CLOCK DRIVERS
 M:	Emil Renner Berthing <[email protected]>
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 +123 -0

123 lines not on this page · raw message

Signature · 1 line
2.17.1
#6 lore raw

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC

Quoted 85 lines · 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  | 123 ++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
MAINTAINERS +1 -0
index 6b6b67468b8f..46b366456cee 100644
@@ -19910,6 +19910,7 @@ M:      Emil Renner Berthing <[email protected]>
 M:     Samin Guo <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 
 STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
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 +17 -0
new file mode 100644
index 000000000000..4963d4008485
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * StarFive DWMAC platform driver
+ *
+ * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
+ * 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;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 27

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+       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;
+
+       rate = clk_get_rate(dwmac->clk_tx);

Hi Samin,

I'm not sure why you added this line in this revision. If it's just to not call clk_set_rate on the uninitialized rate, I'd much rather you just returned early and don't call clk_set_rate at all in case of errors.

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +4 -0
+
+       switch (speed) {
+       case SPEED_1000:
+               rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 41

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+               break;
+       case SPEED_100:
+               rate = 25000000;
+               break;
+       case SPEED_10:
+               rate = 2500000;
+               break;
+       default:
+               dev_err(dwmac->dev, "invalid speed %u\n", speed);
+               break;

That is skip the clk_get_rate above and just change this break to a return.

Quoted 90 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +82 -1
+       }
+
+       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 dev_err_probe(&pdev->dev, err,
+                                    "failed to get resources\n");
+
+       plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
+       if (IS_ERR(plat_dat))
+               return dev_err_probe(&pdev->dev, PTR_ERR(plat_dat),
+                                    "dt configuration failed\n");
+
+       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 <[email protected]>");
+MODULE_AUTHOR("Samin Guo <[email protected]>");
--

2.17.1

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

author
#7 lore raw

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Emil Renner Berthing <[email protected]>
to: Samin Guo <[email protected]>
data: 2023/4/8

Quoted 119 lines · Samin Guo
Quoted 85 lines

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  | 123 ++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
MAINTAINERS +1 -0
index 6b6b67468b8f..46b366456cee 100644
@@ -19910,6 +19910,7 @@ M:      Emil Renner Berthing <[email protected]>
 M:     Samin Guo <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 
 STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
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 +17 -0
new file mode 100644
index 000000000000..4963d4008485
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * StarFive DWMAC platform driver
+ *
+ * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
+ * 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;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 27

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+       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;
+
+       rate = clk_get_rate(dwmac->clk_tx);

Hi Samin,

I'm not sure why you added this line in this revision. If it's just to not call clk_set_rate on the uninitialized rate, I'd much rather you just returned early and don't call clk_set_rate at all in case of errors.

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +4 -0
+
+       switch (speed) {
+       case SPEED_1000:
+               rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 41

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+               break;
+       case SPEED_100:
+               rate = 25000000;
+               break;
+       case SPEED_10:
+               rate = 2500000;
+               break;
+       default:
+               dev_err(dwmac->dev, "invalid speed %u\n", speed);
+               break;
Quoted 2 lines

That is skip the clk_get_rate above and just change this break to a return.

Hi Emil,

We used the solution you mentioned before V3, but Arun Ramadoss doesn't think that's great.
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Quoted 10 lines

+static void starfive_eth_plat_fix_mac_speed(void *priv, unsigned int speed)

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +8 -0
+{
+	struct starfive_dwmac *dwmac = priv;
+	unsigned long rate;
+	int err;
+
+	switch (speed) {
+	case SPEED_1000:
+		rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+		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.(Arun Ramadoss)

So in v9, after discussing with Jakub Kicinski, the clk_set_rate was used to initialize the rate.
(It is a reference to Intel's scheme: dwmac-intel-plat.c: kmb_eth_fix_mac_speed)
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Best regards,
Samin

Quoted 90 lines
Quoted 90 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +82 -1
+       }
+
+       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 dev_err_probe(&pdev->dev, err,
+                                    "failed to get resources\n");
+
+       plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
+       if (IS_ERR(plat_dat))
+               return dev_err_probe(&pdev->dev, PTR_ERR(plat_dat),
+                                    "dt configuration failed\n");
+
+       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 <[email protected]>");
+MODULE_AUTHOR("Samin Guo <[email protected]>");
--

2.17.1

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

Signature · 2 lines
Best regards,
Samin
#8 lore raw

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC

Quoted 159 lines · Guo Samin

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Emil Renner Berthing <[email protected]>
to: Samin Guo <[email protected]>
data: 2023/4/8

Quoted 119 lines · Samin Guo
Quoted 85 lines

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  | 123 ++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
MAINTAINERS +1 -0
index 6b6b67468b8f..46b366456cee 100644
@@ -19910,6 +19910,7 @@ M:      Emil Renner Berthing <[email protected]>
 M:     Samin Guo <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 
 STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
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 +17 -0
new file mode 100644
index 000000000000..4963d4008485
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * StarFive DWMAC platform driver
+ *
+ * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
+ * 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;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 27

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+       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;
+
+       rate = clk_get_rate(dwmac->clk_tx);

Hi Samin,

I'm not sure why you added this line in this revision. If it's just to not call clk_set_rate on the uninitialized rate, I'd much rather you just returned early and don't call clk_set_rate at all in case of errors.

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +4 -0
+
+       switch (speed) {
+       case SPEED_1000:
+               rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 41

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+               break;
+       case SPEED_100:
+               rate = 25000000;
+               break;
+       case SPEED_10:
+               rate = 2500000;
+               break;
+       default:
+               dev_err(dwmac->dev, "invalid speed %u\n", speed);
+               break;
Quoted 2 lines

That is skip the clk_get_rate above and just change this break to a return.

Hi Emil,

We used the solution you mentioned before V3, but Arun Ramadoss doesn't think that's great.
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Quoted 10 lines

+static void starfive_eth_plat_fix_mac_speed(void *priv, unsigned int speed)

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +8 -0
+{
+     struct starfive_dwmac *dwmac = priv;
+     unsigned long rate;
+     int err;
+
+     switch (speed) {
+     case SPEED_1000:
+             rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+             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.(Arun Ramadoss)

Quoted 4 lines

So in v9, after discussing with Jakub Kicinski, the clk_set_rate was used to initialize the rate.
(It is a reference to Intel's scheme: dwmac-intel-plat.c: kmb_eth_fix_mac_speed)
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Yeah, I think this is a misunderstanding and Arun is considering if we ought to return the error which we can't without changing generic dwmac code, and Jakub is rightly concerned about using a local variable uninitialized. I don't think anyone is suggesting that getting the rate just to set it to the exact same value is better than just leaving the clock alone.

Quoted 96 lines

Best regards,
Samin

Quoted 10 lines

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 51

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+       }
+
+       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;

cons>> + struct stmmac_resources stmmac_res;

Quoted 75 lines
Quoted 75 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +71 -1
+       struct starfive_dwmac *dwmac;
+       struct clk *clk_gtx;
+       int err;
+
+       err = stmmac_get_platform_resources(pdev, &stmmac_res);
+       if (err)
+               return dev_err_probe(&pdev->dev, err,
+                                    "failed to get resources\n");
+
+       plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
+       if (IS_ERR(plat_dat))
+               return dev_err_probe(&pdev->dev, PTR_ERR(plat_dat),
+                                    "dt configuration failed\n");
+
+       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 <[email protected]>");
+MODULE_AUTHOR("Samin Guo <[email protected]>");
--

2.17.1

Quoted 4 lines
Quoted 4 lines

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

--
Best regards,
Samin

author
#9 lore raw

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Emil Renner Berthing <[email protected]>
to: Guo Samin <[email protected]>
data: 2023/4/9

Quoted 165 lines · Guo Samin
Quoted 159 lines

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Emil Renner Berthing <[email protected]>
to: Samin Guo <[email protected]>
data: 2023/4/8

Quoted 119 lines · Samin Guo
Quoted 85 lines

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  | 123 ++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
MAINTAINERS +1 -0
index 6b6b67468b8f..46b366456cee 100644
@@ -19910,6 +19910,7 @@ M:      Emil Renner Berthing <[email protected]>
 M:     Samin Guo <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 
 STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
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 +17 -0
new file mode 100644
index 000000000000..4963d4008485
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * StarFive DWMAC platform driver
+ *
+ * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
+ * 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;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 27

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+       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;
+
+       rate = clk_get_rate(dwmac->clk_tx);

Hi Samin,

I'm not sure why you added this line in this revision. If it's just to not call clk_set_rate on the uninitialized rate, I'd much rather you just returned early and don't call clk_set_rate at all in case of errors.

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +4 -0
+
+       switch (speed) {
+       case SPEED_1000:
+               rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 41

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+               break;
+       case SPEED_100:
+               rate = 25000000;
+               break;
+       case SPEED_10:
+               rate = 2500000;
+               break;
+       default:
+               dev_err(dwmac->dev, "invalid speed %u\n", speed);
+               break;
Quoted 2 lines

That is skip the clk_get_rate above and just change this break to a return.

Hi Emil,

We used the solution you mentioned before V3, but Arun Ramadoss doesn't think that's great.
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Quoted 10 lines

+static void starfive_eth_plat_fix_mac_speed(void *priv, unsigned int speed)

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +8 -0
+{
+     struct starfive_dwmac *dwmac = priv;
+     unsigned long rate;
+     int err;
+
+     switch (speed) {
+     case SPEED_1000:
+             rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+             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.(Arun Ramadoss)

Quoted 4 lines

So in v9, after discussing with Jakub Kicinski, the clk_set_rate was used to initialize the rate.
(It is a reference to Intel's scheme: dwmac-intel-plat.c: kmb_eth_fix_mac_speed)
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Quoted 7 lines

Yeah, I think this is a misunderstanding and Arun is considering if we ought to return the error which we can't without changing generic dwmac code, and Jakub is rightly concerned about using a local variable uninitialized. I don't think anyone is suggesting that getting the rate just to set it to the exact same value is better than just leaving the clock alone.

HI Emil,

Yeah, return early saves time and code complexity, and seems like a good solution so Yanhong did the same before v3. (Jakub has suggested it before), I wonder if Arun or other maintainers accept this solution or if there are other solutions?

Best regards,
Samin

Quoted 96 lines
Quoted 96 lines

Best regards,
Samin

Quoted 10 lines

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 51

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+       }
+
+       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;

cons>> + struct stmmac_resources stmmac_res;

Quoted 75 lines
Quoted 75 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +71 -1
+       struct starfive_dwmac *dwmac;
+       struct clk *clk_gtx;
+       int err;
+
+       err = stmmac_get_platform_resources(pdev, &stmmac_res);
+       if (err)
+               return dev_err_probe(&pdev->dev, err,
+                                    "failed to get resources\n");
+
+       plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
+       if (IS_ERR(plat_dat))
+               return dev_err_probe(&pdev->dev, PTR_ERR(plat_dat),
+                                    "dt configuration failed\n");
+
+       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 <[email protected]>");
+MODULE_AUTHOR("Samin Guo <[email protected]>");
--

2.17.1

Quoted 4 lines
Quoted 4 lines

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

--
Best regards,
Samin

Signature · 2 lines
Best regards,
Samin
maintainer
#10 lore raw

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC

Quoted 177 lines · Guo Samin

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Emil Renner Berthing <[email protected]>
to: Guo Samin <[email protected]>
data: 2023/4/9

Quoted 165 lines · Guo Samin
Quoted 159 lines

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Emil Renner Berthing <[email protected]>
to: Samin Guo <[email protected]>
data: 2023/4/8

Quoted 119 lines · Samin Guo
Quoted 85 lines

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  | 123 ++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
MAINTAINERS +1 -0
index 6b6b67468b8f..46b366456cee 100644
@@ -19910,6 +19910,7 @@ M:      Emil Renner Berthing <[email protected]>
 M:     Samin Guo <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 
 STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
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 +17 -0
new file mode 100644
index 000000000000..4963d4008485
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * StarFive DWMAC platform driver
+ *
+ * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
+ * 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;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 27

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+       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;
+
+       rate = clk_get_rate(dwmac->clk_tx);

Hi Samin,

I'm not sure why you added this line in this revision. If it's just to not call clk_set_rate on the uninitialized rate, I'd much rather you just returned early and don't call clk_set_rate at all in case of errors.

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +4 -0
+
+       switch (speed) {
+       case SPEED_1000:
+               rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 41

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+               break;
+       case SPEED_100:
+               rate = 25000000;
+               break;
+       case SPEED_10:
+               rate = 2500000;
+               break;
+       default:
+               dev_err(dwmac->dev, "invalid speed %u\n", speed);
+               break;
Quoted 2 lines

That is skip the clk_get_rate above and just change this break to a return.

Hi Emil,

We used the solution you mentioned before V3, but Arun Ramadoss doesn't think that's great.
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Quoted 10 lines

+static void starfive_eth_plat_fix_mac_speed(void *priv, unsigned int speed)

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +8 -0
+{
+     struct starfive_dwmac *dwmac = priv;
+     unsigned long rate;
+     int err;
+
+     switch (speed) {
+     case SPEED_1000:
+             rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+             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.(Arun Ramadoss)

Quoted 4 lines

So in v9, after discussing with Jakub Kicinski, the clk_set_rate was used to initialize the rate.
(It is a reference to Intel's scheme: dwmac-intel-plat.c: kmb_eth_fix_mac_speed)
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Quoted 7 lines

Yeah, I think this is a misunderstanding and Arun is considering if we ought to return the error which we can't without changing generic dwmac code, and Jakub is rightly concerned about using a local variable uninitialized. I don't think anyone is suggesting that getting the rate just to set it to the exact same value is better than just leaving the clock alone.

Quoted 4 lines

HI Emil,

Yeah, return early saves time and code complexity, and seems like a good solution so Yanhong did the same before v3. (Jakub has suggested it before), I wonder if Arun or other maintainers accept this solution or if there are other solutions?

I think is not a big deal either way.

To avoid too much back and forth I'll stick to the current code.

Please address Emil comment on patch 6/6

Thanks!

Paolo

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

author
#11 lore raw

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Paolo Abeni <[email protected]>
to: Guo Samin <[email protected]>, Emil Renner Berthing <[email protected]>, [email protected]
data: 2023/4/11

Quoted 185 lines · Guo Samin
Quoted 177 lines

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Emil Renner Berthing <[email protected]>
to: Guo Samin <[email protected]>
data: 2023/4/9

Quoted 165 lines · Guo Samin
Quoted 159 lines

Re: [-net-next v11 5/6] net: stmmac: Add glue layer for StarFive JH7110 SoC
From: Emil Renner Berthing <[email protected]>
to: Samin Guo <[email protected]>
data: 2023/4/8

Quoted 119 lines · Samin Guo
Quoted 85 lines

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  | 123 ++++++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
MAINTAINERS +1 -0
index 6b6b67468b8f..46b366456cee 100644
@@ -19910,6 +19910,7 @@ M:      Emil Renner Berthing <[email protected]>
 M:     Samin Guo <[email protected]>
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 
 STARFIVE JH7100 CLOCK DRIVERS
 M:     Emil Renner Berthing <[email protected]>
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 +17 -0
new file mode 100644
index 000000000000..4963d4008485
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * StarFive DWMAC platform driver
+ *
+ * Copyright (C) 2021 Emil Renner Berthing <[email protected]>
+ * 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;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 27

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+       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;
+
+       rate = clk_get_rate(dwmac->clk_tx);

Hi Samin,

I'm not sure why you added this line in this revision. If it's just to not call clk_set_rate on the uninitialized rate, I'd much rather you just returned early and don't call clk_set_rate at all in case of errors.

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +4 -0
+
+       switch (speed) {
+       case SPEED_1000:
+               rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c line 41

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+               break;
+       case SPEED_100:
+               rate = 25000000;
+               break;
+       case SPEED_10:
+               rate = 2500000;
+               break;
+       default:
+               dev_err(dwmac->dev, "invalid speed %u\n", speed);
+               break;
Quoted 2 lines

That is skip the clk_get_rate above and just change this break to a return.

Hi Emil,

We used the solution you mentioned before V3, but Arun Ramadoss doesn't think that's great.
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Quoted 10 lines

+static void starfive_eth_plat_fix_mac_speed(void *priv, unsigned int speed)

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +8 -0
+{
+     struct starfive_dwmac *dwmac = priv;
+     unsigned long rate;
+     int err;
+
+     switch (speed) {
+     case SPEED_1000:
+             rate = 125000000;

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c new file +10 -0
+             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.(Arun Ramadoss)

Quoted 4 lines

So in v9, after discussing with Jakub Kicinski, the clk_set_rate was used to initialize the rate.
(It is a reference to Intel's scheme: dwmac-intel-plat.c: kmb_eth_fix_mac_speed)
(https://patchwork.kernel.org/project/linux-riscv/patch/[email protected])

Quoted 7 lines

Yeah, I think this is a misunderstanding and Arun is considering if we ought to return the error which we can't without changing generic dwmac code, and Jakub is rightly concerned about using a local variable uninitialized. I don't think anyone is suggesting that getting the rate just to set it to the exact same value is better than just leaving the clock alone.

Quoted 4 lines

HI Emil,

Yeah, return early saves time and code complexity, and seems like a good solution so Yanhong did the same before v3. (Jakub has suggested it before), I wonder if Arun or other maintainers accept this solution or if there are other solutions?

I think is not a big deal either way.

Quoted 8 lines

To avoid too much back and forth I'll stick to the current code.

Please address Emil comment on patch 6/6

Thanks!

Paolo

Hi Paolo,

Thanks! I'll fix it on patch 6/6 as suggested by Emil.

Best regards,
Samin

author
#12 lore raw

PATCH v11 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  | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +48 -0
index 4963d4008485..d6a1eddb51e8 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;
@@ -46,6 +50,46 @@ 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;
+	int err;
+
+	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))
+		return dev_err_probe(dwmac->dev, PTR_ERR(regmap), "syscon regmap failed\n");
+
+	/* args[0]:offset  args[1]: shift */
+	err = regmap_update_bits(regmap, args[0],
+				 STARFIVE_DWMAC_PHY_INFT_FIELD << args[1],
+				 mode << args[1]);
+	if (err)
+		return dev_err_probe(dwmac->dev, err, "error setting phy mode\n");
+
+	return 0;
+}
+
 static int starfive_dwmac_probe(struct platform_device *pdev)
 {
 	struct plat_stmmacenet_data *plat_dat;
@@ -91,6 +135,10 @@ 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)
+		return err;
+
 	err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
 	if (err) {
 		stmmac_remove_config_dt(pdev, plat_dat);
Signature · 7 lines
2.17.1


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

Re: [-net-next v11 6/6] net: stmmac: starfive-dmac: Add phy interface settings

Hi Samin,

If you're respinning this series anyway, please use "net: stmmac:
dwmac-starfive:" to match the filename.

Quoted 54 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  | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +23 -0
index 4963d4008485..d6a1eddb51e8 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;
@@ -46,6 +50,46 @@ 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;
+       int err;
+
+       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:

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c static void starfive_dwmac_fix_mac_speed(void *priv, unsigned int speed) · line 81

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +10 -0
+               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))
+               return dev_err_probe(dwmac->dev, PTR_ERR(regmap), "syscon regmap failed\n");

This message is a bit misleading. It's not actually that the regmap failed, but getting/looking up the regmap failed.

Quoted 32 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +14 -1
+       /* args[0]:offset  args[1]: shift */
+       err = regmap_update_bits(regmap, args[0],
+                                STARFIVE_DWMAC_PHY_INFT_FIELD << args[1],
+                                mode << args[1]);
+       if (err)
+               return dev_err_probe(dwmac->dev, err, "error setting phy mode\n");
+
+       return 0;
+}
+
 static int starfive_dwmac_probe(struct platform_device *pdev)
 {
        struct plat_stmmacenet_data *plat_dat;
@@ -91,6 +135,10 @@ 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)
+               return err;
+
        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

author
#14 lore raw

Re: [-net-next v11 6/6] net: stmmac: starfive-dmac: Add phy interface settings

Re: [-net-next v11 6/6] net: stmmac: starfive-dmac: Add phy interface settings
From: Emil Renner Berthing <[email protected]>
to: Samin Guo <[email protected]>
data: 2023/4/8

Quoted 5 lines

Hi Samin,

If you're respinning this series anyway, please use "net: stmmac:
dwmac-starfive:" to match the filename.

Thanks, will fix.

Quoted 60 lines · Samin Guo
Quoted 59 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  | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +28 -0
index 4963d4008485..d6a1eddb51e8 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;
@@ -46,6 +50,46 @@ 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;
+       int err;
+
+       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;
+       }
+
Quoted 8 lines

drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c static void starfive_dwmac_fix_mac_speed(void *priv, unsigned int speed) · line 81

Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +5 -0
+       regmap = syscon_regmap_lookup_by_phandle_args(dwmac->dev->of_node,
+                                                     "starfive,syscon",
+                                                     2, args);
+       if (IS_ERR(regmap))
+               return dev_err_probe(dwmac->dev, PTR_ERR(regmap), "syscon regmap failed\n");

This message is a bit misleading. It's not actually that the regmap failed, but getting/looking up the regmap failed.

Will fix.

Best regards,
Samin

Quoted 33 lines
Quoted 33 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c +14 -1
+       /* args[0]:offset  args[1]: shift */
+       err = regmap_update_bits(regmap, args[0],
+                                STARFIVE_DWMAC_PHY_INFT_FIELD << args[1],
+                                mode << args[1]);
+       if (err)
+               return dev_err_probe(dwmac->dev, err, "error setting phy mode\n");
+
+       return 0;
+}
+
 static int starfive_dwmac_probe(struct platform_device *pdev)
 {
        struct plat_stmmacenet_data *plat_dat;
@@ -91,6 +135,10 @@ 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)
+               return err;
+
        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