Skip to contentSkip to conversation

net: stmmac: eic7700: fix EIC7700 eth1 RX sampling timing

PATCH In review [email protected] 4 participants 16 messages Apr 27 – May 14

Subsystems (8)
lore
Share & tools
lore
#0 lore raw

v7 cover net: stmmac: eic7700: fix EIC7700 eth1 RX sampling timing

From: Zhi Li <[email protected]>

v6 -> v7:
- Address checkpatch.pl --strict warnings for DTS changes:
- Split DT binding documentation and DTS board description into separate patches
- Fix DTS style issues reported by checkpatch:
- Reduce line length where applicable
- Add required description for rgmii-rxid

- DTS changes in this series are split into:
- Patch 3/4: syscon binding update (documentation / reference only)
- Patch 4/4: board DTS changes (architecture overview only)

These patches (3/4 and 4/4) are provided to facilitate review of the overall Ethernet integration across binding, driver, and device tree, and are not intended as final upstream submission in their current form.

A cleaned-up, upstream-ready DTS series will be submitted separately once all dependencies and final hardware integration are completed.

- Note:
- Clock-related bindings referenced in earlier revisions are now already merged into net-next, so dtbs_check warnings related to clock are no longer present and are not relevant to this revision.

- No functional changes in the stmmac driver or binding semantics in this revision.

- Link to v6:

    https://lore.kernel.org/lkml/[email protected]/

v5 -> v6:
- Update DTS/DTSI descriptions to fix invalid phandle references reported by DTC:
- Add missing GMAC provider nodes required for proper hardware description:
- HSP power domain: GMAC nodes moved under this domain to reflect hardware power hierarchy.
- Clock nodes: added to provide clk phandles referenced by GMAC.
- Reset nodes: added to provide reset phandles referenced by GMAC.
- Pinctrl nodes: defines pinctrl settings for GMAC signals (pinctrl_gpio106, pinctrl_gpio111).
- Move GMAC nodes under the correct HSP power domain.
- Ensure DTS builds without dtc errors and all phandle references (clk/reset/pinctrl/power-domain) are valid.
- This update does not change runtime behavior; it only improves DTS consistency and resolves issues reported by dtc.

- Note:
- The patch 3/3 for DTS changes in this series provide an overview of the GMAC integration and its dependencies, as discussed previously:
https://lore.kernel.org/lkml/[email protected]/

- It is **not intended for upstream inclusion** in its current form, and is provided solely for architecture overview and integration context.

- A fully cleaned and upstream-ready DTS series will be submitted separately once all related components (pinctrl, clock, power-domain, etc.) are finalized.

- dtbs_check has been run on top of net-next for reference purposes. Remaining warnings are expected due to missing EIC7700 clock bindings[1] in net-next and do not reflect issues in the DTS design itself.

- One remaining warning:
- eswin,eic7700-clock

- The clock binding has already been applied to upstream and is present in mainline, but not yet available in net-next.

- The syscon binding is extended in this series to include the eswin,eic7700-syscfg compatible.

- Any further refinement of the syscfg binding will be handled in separate patches if needed.

- Dependencies:
- [1]EIC7700 clock binding:
https://lore.kernel.org/lkml/[email protected]/
(already applied to upstream)

- Link to v5:

    https://lore.kernel.org/lkml/[email protected]/

v4 -> v5:
- eswin,eic7700-eth.yaml:
- Add Acked-by from Conor Dooley
- No functional changes

- Update dwmac-eic7700.c:
- Disable clocks on the error path to fix a clock leak in eic7700_dwmac_init() when regmap_set_bits() fails (reported by Simon Horman <[email protected]>)

- Link to v4:

    https://lore.kernel.org/lkml/[email protected]/

v3 -> v4:
- Update eswin,eic7700-eth.yaml:
- Improve commit message in dt-bindings patch to clarify the hardware difference of the eth1 MAC and why a new compatible string is required.
- Move the newly added eswin,hsp-sp-csr item to the end of the list to avoid inserting entries in the middle of the binding schema.
- Simplify the compatible schema by replacing the previous oneOf construct with an enum.

- Update dwmac-eic7700.c:
- Fix build issues.
- Adjust code to match the updated binding definition.

- Update DTS/DTSI descriptions:
- Move SoC-level descriptions to the .dtsi file.
- Keep board-specific configuration in the .dts file.

- Link to v3:

    https://lore.kernel.org/lkml/[email protected]/

v2 -> v3:
- Update eswin,eic7700-eth.yaml:
- Extend rx-internal-delay-ps and tx-internal-delay-ps range from 0-2400 to 0-2540 to match the full 7-bit hardware delay field (127 * 20 ps).
- Add "multipleOf: 20" constraint to reflect the 20 ps hardware step size.
- Make rx-internal-delay-ps and tx-internal-delay-ps optional. A well-designed board should not require internal delay tuning.
- Remove rx-internal-delay-ps and tx-internal-delay-ps from the example to avoid encouraging blind copy into board DTs.

- Update dwmac-eic7700.c:
- Treat rx-internal-delay-ps and tx-internal-delay-ps as optional DT properties.
- Apply delay configuration only when properties are present.
- Keep TX/RX delay registers cleared by default to ensure a deterministic state when no delay is specified.

- Describe Ethernet configuration for the HiFive Premier P550 board:
- Add GMAC controller nodes for the HiFive Premier P550 board to describe the on-board Ethernet configuration.

The Ethernet controller depends on clock, reset, pinctrl and HSP subsystem providers which are currently under upstream review. These dependent nodes will be submitted separately once the corresponding drivers are merged.

Due to these missing dependencies, dt-binding-check may report warnings or failures for this series.

- No functional changes to RX clock inversion logic.

- Link to v2:

    https://lore.kernel.org/lkml/[email protected]/

- This series is based on the EIC7700 clock support series:
https://lore.kernel.org/all/[email protected]/
The clock series is currently under review.

v1 -> v2:
- Update eswin,eic7700-eth.yaml:
- Drop the vendor-specific properties eswin,rx-clk-invert and eswin,tx-clk-invert.
- Introduce a distinct compatible string "eswin,eic7700-qos-eth-clk-inversion" to describe MAC instances that require internal RGMII clock inversion.
This models the SoC-specific hardware difference directly via the compatible string and avoids per-board configuration properties.
- Change rx-internal-delay-ps and tx-internal-delay-ps from enum to minimum/maximum to reflect the actual delay range (0-2400 ps)
- Add reference to High-Speed Subsystem documentation in eswin,hsp-sp-csr description. The HSP CSR block is described in Chapter 10 ("High-Speed Interface") of the EIC7700X SoC Technical Reference Manual, Part 4 (EIC7700X_SoC_Technical_Reference_Manual_Part4.pdf):
https://github.com/eswincomputing/EIC7700X-SoC-Technical-Reference-Manual/releases

- Update dwmac-eic7700.c:
- Remove handling of eswin,rx-clk-invert and eswin,tx-clk-invert properties.
- Select RX clock inversion based on the new "eswin,eic7700-qos-eth-clk-inversion" compatible string, using match data to apply the required configuration for affected MAC instances (eth1).

- Link to v1:

    https://lore.kernel.org/lkml/[email protected]/

Zhi Li (4):
dt-bindings: ethernet: eswin: add clock sampling control
net: stmmac: eic7700: enable clocks before syscon access and correct
RX sampling timing
dt-bindings: mfd: syscon: add ESWIN EIC7700 compatible
riscv: dts: eswin: eic7700-hifive-premier-p550: enable Ethernet
controller

 .../devicetree/bindings/mfd/syscon.yaml       |   2 +
 .../bindings/net/eswin,eic7700-eth.yaml       |  69 ++++-
 .../dts/eswin/eic7700-hifive-premier-p550.dts | 239 ++++++++++++++++++
 arch/riscv/boot/dts/eswin/eic7700.dtsi        | 105 ++++++++
 .../ethernet/stmicro/stmmac/dwmac-eic7700.c   | 183 ++++++++++----
 5 files changed, 541 insertions(+), 57 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v7 1/4 dt-bindings: ethernet: eswin: add clock sampling control

From: Zhi Li <[email protected]>

Due to chip backend reasons, there is already an approximately 4-5 ns skew between the RX clock and data of the eth1 MAC controller inside the silicon.

For 1000M, the RX clock must be inverted since it is not possible to meet the RGMII timing requirements using only rx-internal-delay-ps on the MAC together with the standard 2 ns delay on the PHY. Therefore, even on a properly designed board, eth1 still requires RX clock inversion.

This behaviour effectively breaks the RGMII timing assumptions at the SoC level.

For the TX path of eth1, there is also a skew between the TX clock and data on the MAC controller inside the silicon. This skew happens to be approximately 2 ns. Therefore, it can be considered that the 2 ns delay of TX is provided by the MAC, so the TX is compliant with the RGMII standard.

For 10/100 operation, the approximately 4-5 ns skew in the chip does not break the standard. The RGMII timing table (Section 3.3) specifies that for 10/100 operation the maximum value is unspecified:
https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/imx-processors/20655/1/RGMIIv2_0_final_hp.pdf

Due to the eth1 silicon behavior described above, a new compatible string "eswin,eic7700-qos-eth-clk-inversion" is added to the device tree. This allows the driver to handle the differences between eth1 and eth0 through dedicated logic.

The rx-internal-delay-ps and tx-internal-delay-ps properties now use minimum and maximum constraints to reflect the actual hardware delay range (0-2540 ps) applied in 20 ps steps. This relaxes the binding validation compared to the previous enum-based definition and avoids regressions for existing DTBs while keeping the same hardware limits.

Treat the RX/TX internal delay properties as optional, board-specific tuning knobs and remove them from the example to avoid encouraging their use.

In addition, the binding now includes additional background information about the HSP CSR registers accessed by the MAC. The TXD and RXD delay control registers are included so the driver can explicitly clear any residual configuration left by the bootloader.

Background reference for the High-Speed Subsystem and HSP CSR block is available in Chapter 10 ("High-Speed Interface") of the EIC7700X SoC Technical Reference Manual, Part 4 (EIC7700X_SoC_Technical_Reference_Manual_Part4.pdf):
https://github.com/eswincomputing/EIC7700X-SoC-Technical-Reference-Manual/releases

There are currently no in-tree users of the EIC7700 Ethernet driver, so these changes are safe.

Fixes 888bd0eca93c ("dt-bindings: ethernet: eswin: Document for EIC7700 SoC")
---
 .../bindings/net/eswin,eic7700-eth.yaml       | 69 +++++++++++++++----
 1 file changed, 55 insertions(+), 14 deletions(-)
Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml +55 -14
index 91e8cd1db67b..0b27719feb7d 100644
@@ -20,6 +20,7 @@ select:
       contains:
         enum:
           - eswin,eic7700-qos-eth
+          - eswin,eic7700-qos-eth-clk-inversion
   required:
     - compatible
 
@@ -29,7 +30,9 @@ allOf:
 properties:
   compatible:
     items:
-      - const: eswin,eic7700-qos-eth
+      - enum:
+          - eswin,eic7700-qos-eth
+          - eswin,eic7700-qos-eth-clk-inversion
       - const: snps,dwmac-5.20
 
   reg:
@@ -63,16 +66,29 @@ properties:
       - const: stmmaceth
 
   rx-internal-delay-ps:
-    enum: [0, 200, 600, 1200, 1600, 1800, 2000, 2200, 2400]
+    minimum: 0
+    maximum: 2540
+    multipleOf: 20
 
   tx-internal-delay-ps:
-    enum: [0, 200, 600, 1200, 1600, 1800, 2000, 2200, 2400]
+    minimum: 0
+    maximum: 2540
+    multipleOf: 20
 
   eswin,hsp-sp-csr:
     description:
       HSP CSR is to control and get status of different high-speed peripherals
       (such as Ethernet, USB, SATA, etc.) via register, which can tune
       board-level's parameters of PHY, etc.
+
+      Additional background information about the High-Speed Subsystem
+      and the HSP CSR block is available in Chapter 10 ("High-Speed Interface")
+      of the EIC7700X SoC Technical Reference Manual, Part 4
+      (EIC7700X_SoC_Technical_Reference_Manual_Part4.pdf). The manual is
+      publicly available at
+      https://github.com/eswincomputing/EIC7700X-SoC-Technical-Reference-Manual/releases
+
+      This reference is provided for background information only.
     $ref: /schemas/types.yaml#/definitions/phandle-array
     items:
       - items:
@@ -82,6 +98,8 @@ properties:
           - description: Offset of AXI clock controller Low-Power request
                          register
           - description: Offset of register controlling TX/RX clock delay
+          - description: Offset of register controlling TXD delay
+          - description: Offset of register controlling RXD delay
 
 required:
   - compatible
@@ -93,8 +111,6 @@ required:
   - phy-mode
   - resets
   - reset-names
-  - rx-internal-delay-ps
-  - tx-internal-delay-ps
   - eswin,hsp-sp-csr
 
 unevaluatedProperties: false
@@ -104,24 +120,49 @@ examples:
     ethernet@50400000 {
         compatible = "eswin,eic7700-qos-eth", "snps,dwmac-5.20";
         reg = <0x50400000 0x10000>;
+        interrupt-parent = <&plic>;
+        interrupts = <61>;
+        interrupt-names = "macirq";
         clocks = <&d0_clock 186>, <&d0_clock 171>, <&d0_clock 40>,
                 <&d0_clock 193>;
         clock-names = "axi", "cfg", "stmmaceth", "tx";
+        resets = <&reset 95>;
+        reset-names = "stmmaceth";
+        eswin,hsp-sp-csr = <&hsp_sp_csr 0x100 0x108 0x118 0x114 0x11c>;
+        phy-handle = <&gmac0_phy0>;
+        phy-mode = "rgmii-id";
+        snps,aal;
+        snps,fixed-burst;
+        snps,tso;
+        snps,axi-config = <&stmmac_axi_setup_gmac0>;
+
+        stmmac_axi_setup_gmac0: stmmac-axi-config {
+            snps,blen = <0 0 0 0 16 8 4>;
+            snps,rd_osr_lmt = <2>;
+            snps,wr_osr_lmt = <2>;
+        };
+    };
+
+    ethernet@50410000 {
+        compatible = "eswin,eic7700-qos-eth-clk-inversion", "snps,dwmac-5.20";
+        reg = <0x50410000 0x10000>;
         interrupt-parent = <&plic>;
-        interrupts = <61>;
+        interrupts = <70>;
         interrupt-names = "macirq";
-        phy-mode = "rgmii-id";
-        phy-handle = <&phy0>;
-        resets = <&reset 95>;
+        clocks = <&d0_clock 186>, <&d0_clock 171>, <&d0_clock 40>,
+                <&d0_clock 194>;
+        clock-names = "axi", "cfg", "stmmaceth", "tx";
+        resets = <&reset 94>;
         reset-names = "stmmaceth";
-        rx-internal-delay-ps = <200>;
-        tx-internal-delay-ps = <200>;
-        eswin,hsp-sp-csr = <&hsp_sp_csr 0x100 0x108 0x118>;
-        snps,axi-config = <&stmmac_axi_setup>;
+        eswin,hsp-sp-csr = <&hsp_sp_csr 0x200 0x208 0x218 0x214 0x21c>;
+        phy-handle = <&gmac1_phy0>;
+        phy-mode = "rgmii-id";
         snps,aal;
         snps,fixed-burst;
         snps,tso;
-        stmmac_axi_setup: stmmac-axi-config {
+        snps,axi-config = <&stmmac_axi_setup_gmac1>;
+
+        stmmac_axi_setup_gmac1: stmmac-axi-config {
             snps,blen = <0 0 0 0 16 8 4>;
             snps,rd_osr_lmt = <2>;
             snps,wr_osr_lmt = <2>;
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH net-next v7 1/4] dt-bindings: ethernet: eswin: add clock sampling control

Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml properties: · line 71

Quoted 11 lines

For the TX path of eth1, there is also a skew between the TX clock and data on the MAC controller inside the silicon. This skew happens to be approximately 2 ns. Therefore, it can be considered that the 2 ns delay of TX is provided by the MAC, so the TX is compliant with the RGMII standard.

tx-internal-delay-ps:

Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml +3 -1
-    enum: [0, 200, 600, 1200, 1600, 1800, 2000, 2200, 2400]
+    minimum: 0
+    maximum: 2540
+    multipleOf: 20

This does not seem correct for eth1. Isn't minimum 2000, maximum 4540? You have this fixed 2ns you cannot turn off.

Andrew

#3 lore raw

PATCH v7 2/4 net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

In reply to [email protected]

From: Zhi Li <[email protected]>

The second Ethernet controller (eth1) on the Eswin EIC7700 SoC may fail to sample RX data correctly at Gigabit speed due to EIC7700-specific receive clock to data skew at the MAC input in the silicon.

The existing internal delay configuration does not provide sufficient adjustment range to compensate for this condition at 1000Mbps. Update the EIC7700 DWMAC glue driver to apply EIC7700-specific clock sampling inversion only during Gigabit operation on MAC instances that require it.

TXD and RXD delay registers are explicitly cleared during initialization to override any residual configuration left by the bootloader. All HSP CSR register accesses are performed only after the required clocks are enabled.

Fixes ea77dbbdbc4e ("net: stmmac: add Eswin EIC7700 glue driver")
---
 .../ethernet/stmicro/stmmac/dwmac-eic7700.c   | 183 ++++++++++++++----
 1 file changed, 140 insertions(+), 43 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +140 -43
index bcb8e000e720..33144611da8d 100644
@@ -28,20 +28,40 @@
 
 /*
  * TX/RX Clock Delay Bit Masks:
- * - TX Delay: bits [14:8] — TX_CLK delay (unit: 0.1ns per bit)
- * - RX Delay: bits [30:24] — RX_CLK delay (unit: 0.1ns per bit)
+ * - TX Delay: bits [14:8] — TX_CLK delay (unit: 0.02ns per bit)
+ * - TX Invert : bit  [15]
+ * - RX Delay: bits [30:24] — RX_CLK delay (unit: 0.02ns per bit)
+ * - RX Invert : bit  [31]
  */
 #define EIC7700_ETH_TX_ADJ_DELAY	GENMASK(14, 8)
 #define EIC7700_ETH_RX_ADJ_DELAY	GENMASK(30, 24)
+#define EIC7700_ETH_TX_INV_DELAY	BIT(15)
+#define EIC7700_ETH_RX_INV_DELAY	BIT(31)
 
-#define EIC7700_MAX_DELAY_UNIT 0x7F
+#define EIC7700_MAX_DELAY_STEPS		0x7F
+#define EIC7700_DELAY_STEP_PS		20
+#define EIC7700_MAX_DELAY_PS	\
+	(EIC7700_MAX_DELAY_STEPS * EIC7700_DELAY_STEP_PS)
 
 static const char * const eic7700_clk_names[] = {
 	"tx", "axi", "cfg",
 };
 
+struct eic7700_dwmac_data {
+	bool rgmii_rx_clk_invert;
+};
+
 struct eic7700_qos_priv {
+	struct device *dev;
 	struct plat_stmmacenet_data *plat_dat;
+	struct regmap *eic7700_hsp_regmap;
+	u32 eth_axi_lp_ctrl_offset;
+	u32 eth_phy_ctrl_offset;
+	u32 eth_txd_offset;
+	u32 eth_clk_offset;
+	u32 eth_rxd_offset;
+	u32 eth_clk_dly_param;
+	bool eth_rx_clk_inv;
 };
 
 static int eic7700_clks_config(void *priv, bool enabled)
@@ -61,8 +81,28 @@ static int eic7700_clks_config(void *priv, bool enabled)
 static int eic7700_dwmac_init(struct device *dev, void *priv)
 {
 	struct eic7700_qos_priv *dwc = priv;
+	int ret;
+
+	ret = eic7700_clks_config(dwc, true);
+	if (ret)
+		return ret;
+
+	ret = regmap_set_bits(dwc->eic7700_hsp_regmap,
+			      dwc->eth_phy_ctrl_offset,
+			      EIC7700_ETH_TX_CLK_SEL |
+			      EIC7700_ETH_PHY_INTF_SELI);
+	if (ret) {
+		eic7700_clks_config(dwc, false);
+		return ret;
+	}
+
+	regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_axi_lp_ctrl_offset,
+		     EIC7700_ETH_CSYSREQ_VAL);
+
+	regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_txd_offset, 0);
+	regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_rxd_offset, 0);
 
-	return eic7700_clks_config(dwc, true);
+	return 0;
 }
 
 static void eic7700_dwmac_exit(struct device *dev, void *priv)
@@ -88,18 +128,35 @@ static int eic7700_dwmac_resume(struct device *dev, void *priv)
 	return ret;
 }
 
+static void eic7700_dwmac_fix_speed(void *priv, phy_interface_t interface,
+				    int speed, unsigned int mode)
+{
+	struct eic7700_qos_priv *dwc = (struct eic7700_qos_priv *)priv;
+	u32 dly_param = dwc->eth_clk_dly_param;
+
+	switch (speed) {
+	case SPEED_1000:
+		if (dwc->eth_rx_clk_inv)
+			dly_param |= EIC7700_ETH_RX_INV_DELAY;
+		break;
+	case SPEED_100:
+	case SPEED_10:
+		break;
+	default:
+		dev_err(dwc->dev, "invalid speed %u\n", speed);
+		break;
+	}
+
+	regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_clk_offset, dly_param);
+}
+
 static int eic7700_dwmac_probe(struct platform_device *pdev)
 {
+	const struct eic7700_dwmac_data *data;
 	struct plat_stmmacenet_data *plat_dat;
 	struct stmmac_resources stmmac_res;
 	struct eic7700_qos_priv *dwc_priv;
-	struct regmap *eic7700_hsp_regmap;
-	u32 eth_axi_lp_ctrl_offset;
-	u32 eth_phy_ctrl_offset;
-	u32 eth_phy_ctrl_regset;
-	u32 eth_rxd_dly_offset;
-	u32 eth_dly_param = 0;
-	u32 delay_ps;
+	u32 delay_ps, val;
 	int i, ret;
 
 	ret = stmmac_get_platform_resources(pdev, &stmmac_res);
@@ -116,70 +173,95 @@ static int eic7700_dwmac_probe(struct platform_device *pdev)
 	if (!dwc_priv)
 		return -ENOMEM;
 
+	dwc_priv->dev = &pdev->dev;
+
+	data = device_get_match_data(&pdev->dev);
+	if (!data)
+		return dev_err_probe(&pdev->dev,
+				     -EINVAL, "no match data found\n");
+
+	dwc_priv->eth_rx_clk_inv = data->rgmii_rx_clk_invert;
+
 	/* Read rx-internal-delay-ps and update rx_clk delay */
 	if (!of_property_read_u32(pdev->dev.of_node,
 				  "rx-internal-delay-ps", &delay_ps)) {
-		u32 val = min(delay_ps / 100, EIC7700_MAX_DELAY_UNIT);
+		if (delay_ps % EIC7700_DELAY_STEP_PS)
+			return dev_err_probe(&pdev->dev, -EINVAL,
+				"rx delay must be multiple of %dps\n",
+				EIC7700_DELAY_STEP_PS);
+
+		if (delay_ps > EIC7700_MAX_DELAY_PS)
+			return dev_err_probe(&pdev->dev, -EINVAL,
+				"rx delay out of range\n");
 
-		eth_dly_param &= ~EIC7700_ETH_RX_ADJ_DELAY;
-		eth_dly_param |= FIELD_PREP(EIC7700_ETH_RX_ADJ_DELAY, val);
-	} else {
-		return dev_err_probe(&pdev->dev, -EINVAL,
-			"missing required property rx-internal-delay-ps\n");
+		val = delay_ps / EIC7700_DELAY_STEP_PS;
+
+		dwc_priv->eth_clk_dly_param &= ~EIC7700_ETH_RX_ADJ_DELAY;
+		dwc_priv->eth_clk_dly_param |=
+				 FIELD_PREP(EIC7700_ETH_RX_ADJ_DELAY, val);
 	}
 
 	/* Read tx-internal-delay-ps and update tx_clk delay */
 	if (!of_property_read_u32(pdev->dev.of_node,
 				  "tx-internal-delay-ps", &delay_ps)) {
-		u32 val = min(delay_ps / 100, EIC7700_MAX_DELAY_UNIT);
+		if (delay_ps % EIC7700_DELAY_STEP_PS)
+			return dev_err_probe(&pdev->dev, -EINVAL,
+				"tx delay must be multiple of %dps\n",
+				EIC7700_DELAY_STEP_PS);
+
+		if (delay_ps > EIC7700_MAX_DELAY_PS)
+			return dev_err_probe(&pdev->dev, -EINVAL,
+				"tx delay out of range\n");
+
+		val = delay_ps / EIC7700_DELAY_STEP_PS;
 
-		eth_dly_param &= ~EIC7700_ETH_TX_ADJ_DELAY;
-		eth_dly_param |= FIELD_PREP(EIC7700_ETH_TX_ADJ_DELAY, val);
-	} else {
-		return dev_err_probe(&pdev->dev, -EINVAL,
-			"missing required property tx-internal-delay-ps\n");
+		dwc_priv->eth_clk_dly_param &= ~EIC7700_ETH_TX_ADJ_DELAY;
+		dwc_priv->eth_clk_dly_param |=
+				 FIELD_PREP(EIC7700_ETH_TX_ADJ_DELAY, val);
 	}
 
-	eic7700_hsp_regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
-							     "eswin,hsp-sp-csr");
-	if (IS_ERR(eic7700_hsp_regmap))
+	dwc_priv->eic7700_hsp_regmap =
+			syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
+							"eswin,hsp-sp-csr");
+	if (IS_ERR(dwc_priv->eic7700_hsp_regmap))
 		return dev_err_probe(&pdev->dev,
-				PTR_ERR(eic7700_hsp_regmap),
+				PTR_ERR(dwc_priv->eic7700_hsp_regmap),
 				"Failed to get hsp-sp-csr regmap\n");
 
 	ret = of_property_read_u32_index(pdev->dev.of_node,
 					 "eswin,hsp-sp-csr",
-					 1, &eth_phy_ctrl_offset);
+					 1, &dwc_priv->eth_phy_ctrl_offset);
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret,
 				     "can't get eth_phy_ctrl_offset\n");
 
-	regmap_read(eic7700_hsp_regmap, eth_phy_ctrl_offset,
-		    &eth_phy_ctrl_regset);
-	eth_phy_ctrl_regset |=
-		(EIC7700_ETH_TX_CLK_SEL | EIC7700_ETH_PHY_INTF_SELI);
-	regmap_write(eic7700_hsp_regmap, eth_phy_ctrl_offset,
-		     eth_phy_ctrl_regset);
-
 	ret = of_property_read_u32_index(pdev->dev.of_node,
 					 "eswin,hsp-sp-csr",
-					 2, &eth_axi_lp_ctrl_offset);
+					 2, &dwc_priv->eth_axi_lp_ctrl_offset);
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret,
 				     "can't get eth_axi_lp_ctrl_offset\n");
 
-	regmap_write(eic7700_hsp_regmap, eth_axi_lp_ctrl_offset,
-		     EIC7700_ETH_CSYSREQ_VAL);
+	ret = of_property_read_u32_index(pdev->dev.of_node,
+					 "eswin,hsp-sp-csr",
+					 3, &dwc_priv->eth_clk_offset);
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret,
+				     "can't get eth_clk_offset\n");
 
 	ret = of_property_read_u32_index(pdev->dev.of_node,
 					 "eswin,hsp-sp-csr",
-					 3, &eth_rxd_dly_offset);
+					 4, &dwc_priv->eth_txd_offset);
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret,
-				     "can't get eth_rxd_dly_offset\n");
+				     "can't get eth_txd_offset\n");
 
-	regmap_write(eic7700_hsp_regmap, eth_rxd_dly_offset,
-		     eth_dly_param);
+	ret = of_property_read_u32_index(pdev->dev.of_node,
+					 "eswin,hsp-sp-csr",
+					 5, &dwc_priv->eth_rxd_offset);
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret,
+				     "can't get eth_rxd_offset\n");
 
 	plat_dat->num_clks = ARRAY_SIZE(eic7700_clk_names);
 	plat_dat->clks = devm_kcalloc(&pdev->dev,
@@ -208,12 +290,27 @@ static int eic7700_dwmac_probe(struct platform_device *pdev)
 	plat_dat->exit = eic7700_dwmac_exit;
 	plat_dat->suspend = eic7700_dwmac_suspend;
 	plat_dat->resume = eic7700_dwmac_resume;
+	plat_dat->fix_mac_speed = eic7700_dwmac_fix_speed;
 
 	return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);
 }
 
+static const struct eic7700_dwmac_data eic7700_dwmac_data = {
+	.rgmii_rx_clk_invert = false,
+};
+
+static const struct eic7700_dwmac_data eic7700_dwmac_data_clk_inversion = {
+	.rgmii_rx_clk_invert = true,
+};
+
 static const struct of_device_id eic7700_dwmac_match[] = {
-	{ .compatible = "eswin,eic7700-qos-eth" },
+	{	.compatible = "eswin,eic7700-qos-eth",
+		.data = &eic7700_dwmac_data,
+	},
+	{
+		.compatible = "eswin,eic7700-qos-eth-clk-inversion",
+		.data = &eic7700_dwmac_data_clk_inversion,
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, eic7700_dwmac_match);
Signature · 1 line
2.25.1
maintainer
#4 lore raw

Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 12 lines · On Mon, 27 Apr 2026 15:25:05 +0800 [email protected] wrote:

From: Zhi Li <[email protected]>

The second Ethernet controller (eth1) on the Eswin EIC7700 SoC may fail to sample RX data correctly at Gigabit speed due to EIC7700-specific receive clock to data skew at the MAC input in the silicon.

The existing internal delay configuration does not provide sufficient adjustment range to compensate for this condition at 1000Mbps. Update the EIC7700 DWMAC glue driver to apply EIC7700-specific clock sampling inversion only during Gigabit operation on MAC instances that require it.

Quoted 6 lines

TXD and RXD delay registers are explicitly cleared during initialization to override any residual configuration left by the bootloader. All HSP CSR register accesses are performed only after the required clocks are enabled.

Fixes ea77dbbdbc4e ("net: stmmac: add Eswin EIC7700 glue driver")

Why Fixes? If eth1 never worked this is not a fix but new functionality If you want to make this a fix to prevent incompatibility - cut it down just to the eth0 changes.

Quoted 20 lines
---
 .../ethernet/stmicro/stmmac/dwmac-eic7700.c   | 183 ++++++++++++++----
 1 file changed, 140 insertions(+), 43 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +4 -2
index bcb8e000e720..33144611da8d 100644
@@ -28,20 +28,40 @@
 
 /*
  * TX/RX Clock Delay Bit Masks:
- * - TX Delay: bits [14:8] — TX_CLK delay (unit: 0.1ns per bit)
- * - RX Delay: bits [30:24] — RX_CLK delay (unit: 0.1ns per bit)
+ * - TX Delay: bits [14:8] — TX_CLK delay (unit: 0.02ns per bit)
+ * - TX Invert : bit  [15]
+ * - RX Delay: bits [30:24] — RX_CLK delay (unit: 0.02ns per bit)
+ * - RX Invert : bit  [31]
  */

drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c line 44

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +6 -1
 #define EIC7700_ETH_TX_ADJ_DELAY	GENMASK(14, 8)
 #define EIC7700_ETH_RX_ADJ_DELAY	GENMASK(30, 24)
+#define EIC7700_ETH_TX_INV_DELAY	BIT(15)
+#define EIC7700_ETH_RX_INV_DELAY	BIT(31)
 
-#define EIC7700_MAX_DELAY_UNIT 0x7F
+#define EIC7700_MAX_DELAY_STEPS		0x7F
+#define EIC7700_DELAY_STEP_PS		20
+#define EIC7700_MAX_DELAY_PS	\
+	(EIC7700_MAX_DELAY_STEPS * EIC7700_DELAY_STEP_PS)

AI says:

The step unit is being silently changed from 0.1 ns (delay_ps / 100) to 0.02 ns (delay_ps / 20). The same DT value now programs 5x the number of delay steps into the hardware.

Quoted 66 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +44 -1
 static const char * const eic7700_clk_names[] = {
 	"tx", "axi", "cfg",
 };
 
+struct eic7700_dwmac_data {
+	bool rgmii_rx_clk_invert;
+};
+
 struct eic7700_qos_priv {
+	struct device *dev;
 	struct plat_stmmacenet_data *plat_dat;
+	struct regmap *eic7700_hsp_regmap;
+	u32 eth_axi_lp_ctrl_offset;
+	u32 eth_phy_ctrl_offset;
+	u32 eth_txd_offset;
+	u32 eth_clk_offset;
+	u32 eth_rxd_offset;
+	u32 eth_clk_dly_param;
+	bool eth_rx_clk_inv;
 };
 
 static int eic7700_clks_config(void *priv, bool enabled)
@@ -61,8 +81,28 @@ static int eic7700_clks_config(void *priv, bool enabled)
 static int eic7700_dwmac_init(struct device *dev, void *priv)
 {
 	struct eic7700_qos_priv *dwc = priv;
+	int ret;
+
+	ret = eic7700_clks_config(dwc, true);
+	if (ret)
+		return ret;
+
+	ret = regmap_set_bits(dwc->eic7700_hsp_regmap,
+			      dwc->eth_phy_ctrl_offset,
+			      EIC7700_ETH_TX_CLK_SEL |
+			      EIC7700_ETH_PHY_INTF_SELI);
+	if (ret) {
+		eic7700_clks_config(dwc, false);
+		return ret;
+	}
+
+	regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_axi_lp_ctrl_offset,
+		     EIC7700_ETH_CSYSREQ_VAL);
+
+	regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_txd_offset, 0);
+	regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_rxd_offset, 0);
 
-	return eic7700_clks_config(dwc, true);
+	return 0;
 }
 
 static void eic7700_dwmac_exit(struct device *dev, void *priv)
@@ -88,18 +128,35 @@ static int eic7700_dwmac_resume(struct device *dev, void *priv)
 	return ret;
 }
 
+static void eic7700_dwmac_fix_speed(void *priv, phy_interface_t interface,
+				    int speed, unsigned int mode)
+{
+	struct eic7700_qos_priv *dwc = (struct eic7700_qos_priv *)priv;
+	u32 dly_param = dwc->eth_clk_dly_param;
+
+	switch (speed) {
+	case SPEED_1000:
+		if (dwc->eth_rx_clk_inv)
+			dly_param |= EIC7700_ETH_RX_INV_DELAY;

drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c static int eic7700_dwmac_resume(struct device *dev, void *priv) · line 150

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +10 -0
+		break;
+	case SPEED_100:
+	case SPEED_10:
+		break;
+	default:
+		dev_err(dwc->dev, "invalid speed %u\n", speed);
+		break;
+	}
+
+	regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_clk_offset, dly_param);

AI says

In the default case this logs "invalid speed %u" but then falls through and still executes the regmap_write() with the base dly_param. An unsupported speed reports an error and reprograms the hardware anyway.

Should the default path return without writing, or should the write be moved into the valid cases only?

Quoted 71 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +36 -14
+}
+
 static int eic7700_dwmac_probe(struct platform_device *pdev)
 {
+	const struct eic7700_dwmac_data *data;
 	struct plat_stmmacenet_data *plat_dat;
 	struct stmmac_resources stmmac_res;
 	struct eic7700_qos_priv *dwc_priv;
-	struct regmap *eic7700_hsp_regmap;
-	u32 eth_axi_lp_ctrl_offset;
-	u32 eth_phy_ctrl_offset;
-	u32 eth_phy_ctrl_regset;
-	u32 eth_rxd_dly_offset;
-	u32 eth_dly_param = 0;
-	u32 delay_ps;
+	u32 delay_ps, val;
 	int i, ret;
 
 	ret = stmmac_get_platform_resources(pdev, &stmmac_res);
@@ -116,70 +173,95 @@ static int eic7700_dwmac_probe(struct platform_device *pdev)
 	if (!dwc_priv)
 		return -ENOMEM;
 
+	dwc_priv->dev = &pdev->dev;
+
+	data = device_get_match_data(&pdev->dev);
+	if (!data)
+		return dev_err_probe(&pdev->dev,
+				     -EINVAL, "no match data found\n");
+
+	dwc_priv->eth_rx_clk_inv = data->rgmii_rx_clk_invert;
+
 	/* Read rx-internal-delay-ps and update rx_clk delay */
 	if (!of_property_read_u32(pdev->dev.of_node,
 				  "rx-internal-delay-ps", &delay_ps)) {
-		u32 val = min(delay_ps / 100, EIC7700_MAX_DELAY_UNIT);
+		if (delay_ps % EIC7700_DELAY_STEP_PS)
+			return dev_err_probe(&pdev->dev, -EINVAL,
+				"rx delay must be multiple of %dps\n",
+				EIC7700_DELAY_STEP_PS);
+
+		if (delay_ps > EIC7700_MAX_DELAY_PS)
+			return dev_err_probe(&pdev->dev, -EINVAL,
+				"rx delay out of range\n");
 
-		eth_dly_param &= ~EIC7700_ETH_RX_ADJ_DELAY;
-		eth_dly_param |= FIELD_PREP(EIC7700_ETH_RX_ADJ_DELAY, val);
-	} else {
-		return dev_err_probe(&pdev->dev, -EINVAL,
-			"missing required property rx-internal-delay-ps\n");
+		val = delay_ps / EIC7700_DELAY_STEP_PS;
+
+		dwc_priv->eth_clk_dly_param &= ~EIC7700_ETH_RX_ADJ_DELAY;
+		dwc_priv->eth_clk_dly_param |=
+				 FIELD_PREP(EIC7700_ETH_RX_ADJ_DELAY, val);
 	}
 
 	/* Read tx-internal-delay-ps and update tx_clk delay */
 	if (!of_property_read_u32(pdev->dev.of_node,
 				  "tx-internal-delay-ps", &delay_ps)) {
-		u32 val = min(delay_ps / 100, EIC7700_MAX_DELAY_UNIT);
+		if (delay_ps % EIC7700_DELAY_STEP_PS)
+			return dev_err_probe(&pdev->dev, -EINVAL,
+				"tx delay must be multiple of %dps\n",
+				EIC7700_DELAY_STEP_PS);
+
+		if (delay_ps > EIC7700_MAX_DELAY_PS)
+			return dev_err_probe(&pdev->dev, -EINVAL,
+				"tx delay out of range\n");
+
+		val = delay_ps / EIC7700_DELAY_STEP_PS;

drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c static int eic7700_dwmac_probe(struct platform_device *pdev) · line 221

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +3 -5
 
-		eth_dly_param &= ~EIC7700_ETH_TX_ADJ_DELAY;
-		eth_dly_param |= FIELD_PREP(EIC7700_ETH_TX_ADJ_DELAY, val);
-	} else {
-		return dev_err_probe(&pdev->dev, -EINVAL,
-			"missing required property tx-internal-delay-ps\n");
+		dwc_priv->eth_clk_dly_param &= ~EIC7700_ETH_TX_ADJ_DELAY;
+		dwc_priv->eth_clk_dly_param |=
+				 FIELD_PREP(EIC7700_ETH_TX_ADJ_DELAY, val);
 	}

AI says:

First, rx-internal-delay-ps and tx-internal-delay-ps are silently demoted from required to optional. The previous driver returned -EINVAL with "missing required property ..." when either was absent; the else branches have been removed, so missing properties now leave eth_clk_dly_param at zero and fix_mac_speed() programs zero delay without diagnostic. Is this intentional, and if so should the commit message and the DT binding reflect it?

Second, the previous code silently clamped out-of-range values via min() and only required non-zero step units by integer truncation. The new code rejects non-multiples of 20 and values greater than 2540 ps with -EINVAL at probe time. DTBs that previously probed with clamped delays will now fail probe. Should this stricter validation also be called out in the commit message?

Quoted 51 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +14 -17
-	eic7700_hsp_regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
-							     "eswin,hsp-sp-csr");
-	if (IS_ERR(eic7700_hsp_regmap))
+	dwc_priv->eic7700_hsp_regmap =
+			syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
+							"eswin,hsp-sp-csr");
+	if (IS_ERR(dwc_priv->eic7700_hsp_regmap))
 		return dev_err_probe(&pdev->dev,
-				PTR_ERR(eic7700_hsp_regmap),
+				PTR_ERR(dwc_priv->eic7700_hsp_regmap),
 				"Failed to get hsp-sp-csr regmap\n");
 
 	ret = of_property_read_u32_index(pdev->dev.of_node,
 					 "eswin,hsp-sp-csr",
-					 1, &eth_phy_ctrl_offset);
+					 1, &dwc_priv->eth_phy_ctrl_offset);
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret,
 				     "can't get eth_phy_ctrl_offset\n");
 
-	regmap_read(eic7700_hsp_regmap, eth_phy_ctrl_offset,
-		    &eth_phy_ctrl_regset);
-	eth_phy_ctrl_regset |=
-		(EIC7700_ETH_TX_CLK_SEL | EIC7700_ETH_PHY_INTF_SELI);
-	regmap_write(eic7700_hsp_regmap, eth_phy_ctrl_offset,
-		     eth_phy_ctrl_regset);
-
 	ret = of_property_read_u32_index(pdev->dev.of_node,
 					 "eswin,hsp-sp-csr",
-					 2, &eth_axi_lp_ctrl_offset);
+					 2, &dwc_priv->eth_axi_lp_ctrl_offset);
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret,
 				     "can't get eth_axi_lp_ctrl_offset\n");
 
-	regmap_write(eic7700_hsp_regmap, eth_axi_lp_ctrl_offset,
-		     EIC7700_ETH_CSYSREQ_VAL);
+	ret = of_property_read_u32_index(pdev->dev.of_node,
+					 "eswin,hsp-sp-csr",
+					 3, &dwc_priv->eth_clk_offset);
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret,
+				     "can't get eth_clk_offset\n");
 
 	ret = of_property_read_u32_index(pdev->dev.of_node,
 					 "eswin,hsp-sp-csr",
-					 3, &eth_rxd_dly_offset);
+					 4, &dwc_priv->eth_txd_offset);
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret,
-				     "can't get eth_rxd_dly_offset\n");

drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c static int eic7700_dwmac_probe(struct platform_device *pdev) · line 264

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +7 -2
+				     "can't get eth_txd_offset\n");
 
-	regmap_write(eic7700_hsp_regmap, eth_rxd_dly_offset,
-		     eth_dly_param);
+	ret = of_property_read_u32_index(pdev->dev.of_node,
+					 "eswin,hsp-sp-csr",
+					 5, &dwc_priv->eth_rxd_offset);
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret,
+				     "can't get eth_rxd_offset\n");

AI says:

The eswin,hsp-sp-csr phandle-args layout is expanded from 4 cells (phandle + 3 offsets) to 6 cells (phandle + 5 offsets), with new indices 3/4/5 now required. Any DTB produced against the original ea77dbbdbc4e binding will fail probe here with -EINVAL.

Signature · 1 line
pw-bot: cr
author
#5 lore raw

Re: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 11 lines

-----原始邮件-----
发件人: "Jakub Kicinski" <[email protected]>
发送时间:2026-04-29 09:06:25 (星期三)
收件人: [email protected]
抄送: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected] 主题: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 4 lines

Why Fixes? If eth1 never worked this is not a fix but new functionality If you want to make this a fix to prevent incompatibility - cut it down just to the eth0 changes.

Thank you for the suggestion.

You're right that eth1 never worked at Gigabit speed, so this should not be treated as a fix.

In v8, I will split the changes into two patches within the same series:
- Patch 1 will contain only the fixes affecting the existing eth0 functionality, and will keep the Fixes tag.
- Patch 2 will add the eth1 support (RX clock inversion workaround) as new functionality, without a Fixes tag.

Please let me know if you would prefer a different split or ordering.

Quoted 7 lines

AI says:

The step unit is being silently changed from 0.1 ns (delay_ps / 100) to 0.02 ns (delay_ps / 20). The same DT value now programs 5x the number of delay steps into the hardware.

This change is intentional. The previous driver used an incorrect conversion (100ps per step), while the actual hardware step is 20ps.

This patch corrects the delay calculation to match the hardware.

The DT binding is updated accordingly to reflect the correct 20ps granularity and enforce valid values.

This binding has not yet been used in any upstream DTS, so there are no in-tree users relying on the previous behavior.

I will clarify this explicitly in the v8 commit message.

Quoted 10 lines

AI says

In the default case this logs "invalid speed %u" but then falls through and still executes the regmap_write() with the base dly_param. An unsupported speed reports an error and reprograms the hardware anyway.

Should the default path return without writing, or should the write be moved into the valid cases only?

The default case should not reprogram any hardware registers.

I will change the implementation so that register writes are only performed for valid speeds (SPEED_10/100/1000). For unsupported speeds, the function will only log the error and return without any side effects.

Quoted 11 lines

AI says:

First, rx-internal-delay-ps and tx-internal-delay-ps are silently demoted from required to optional. The previous driver returned -EINVAL with "missing required property ..." when either was absent; the else branches have been removed, so missing properties now leave eth_clk_dly_param at zero and fix_mac_speed() programs zero delay without diagnostic. Is this intentional, and if so should the commit message and the DT binding reflect it?

Quoted 7 lines

Second, the previous code silently clamped out-of-range values via min() and only required non-zero step units by integer truncation. The new code rejects non-multiples of 20 and values greater than 2540 ps with -EINVAL at probe time. DTBs that previously probed with clamped delays will now fail probe. Should this stricter validation also be called out in the commit message?

Yes, this change is intentional.

The previous implementation used incorrect delay semantics (100ps step and implicit clamping), which does not match the actual hardware behavior.

The new implementation corrects the hardware programming to use the real 20ps step granularity and enforces valid ranges.

Regarding the DT binding change (required → optional) and the stricter validation, this is also intentional. Zero delay is a valid hardware configuration, and the stricter checks are added to avoid silently masking invalid values.

Importantly, this binding has not been used by any upstream DTS yet, so there are no in-tree users affected by this change.

I will explicitly document both the semantic change and the compatibility notes in the v8 commit message and update the binding description accordingly.

Quoted 7 lines

AI says:

The eswin,hsp-sp-csr phandle-args layout is expanded from 4 cells (phandle + 3 offsets) to 6 cells (phandle + 5 offsets), with new indices 3/4/5 now required. Any DTB produced against the original ea77dbbdbc4e binding will fail probe here with -EINVAL.

The previous phandle-args layout (4 cells) was based on an incomplete initial design and did not fully describe all required hardware register offsets.

The updated 6-cell format reflects the complete hardware CSR layout and allows explicit configuration of additional control registers.

Importantly, this binding has not been used by any upstream DTS, so there are no in-tree users affected by this change.

I agree that this is a DT ABI change, and I will explicitly document the compatibility impact and updated binding description in the v8 series to make this clear.

maintainer
#6 lore raw

Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 9 lines · On Thu, 30 Apr 2026 14:43:50 +0800 (GMT+08:00) 李志 wrote:
Quoted 4 lines

Why Fixes? If eth1 never worked this is not a fix but new functionality If you want to make this a fix to prevent incompatibility - cut it down just to the eth0 changes.

Thank you for the suggestion.

You're right that eth1 never worked at Gigabit speed, so this should not be treated as a fix.

Quoted 7 lines

In v8, I will split the changes into two patches within the same series:
- Patch 1 will contain only the fixes affecting the existing eth0 functionality, and will keep the Fixes tag.
- Patch 2 will add the eth1 support (RX clock inversion workaround) as new functionality, without a Fixes tag.

Please let me know if you would prefer a different split or ordering.

If you want to consider some part of this commit a fix it has to be posted separately to the net tree (rather than net-next). Once it's merged and makes it way over to the net-next tree (each Thursday) you can post the net-next chnages for eth1

author
#7 lore raw

Re: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 26 lines

-----原始邮件-----
发件人: "Jakub Kicinski" <[email protected]>
发送时间:2026-05-01 07:35:51 (星期五)
收件人: 李志 <[email protected]>
抄送: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected] 主题: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 15 lines · On Thu, 30 Apr 2026 14:43:50 +0800 (GMT+08:00) 李志 wrote:
Quoted 4 lines

Why Fixes? If eth1 never worked this is not a fix but new functionality If you want to make this a fix to prevent incompatibility - cut it down just to the eth0 changes.

Thank you for the suggestion.

You're right that eth1 never worked at Gigabit speed, so this should not be treated as a fix.

In v8, I will split the changes into two patches within the same series:
- Patch 1 will contain only the fixes affecting the existing eth0 functionality, and will keep the Fixes tag.
- Patch 2 will add the eth1 support (RX clock inversion workaround) as new functionality, without a Fixes tag.

Quoted 6 lines
Quoted 1 line

Please let me know if you would prefer a different split or ordering.

If you want to consider some part of this commit a fix it has to be posted separately to the net tree (rather than net-next). Once it's merged and makes it way over to the net-next tree (each Thursday) you can post the net-next chnages for eth1

Thanks, understood.

I will split the changes accordingly:
- Send the eth0 fixes as a new v1 series targeting net.
- Send the eth1 enablement as a new v1 series targeting net-next.

Thanks for the guidance.

author
#8 lore raw

Re: Re: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 43 lines

-----Original Messages-----
From: 李志 <[email protected]>
Send time:Wednesday, 06/05/2026 10:10:57
To: "Jakub Kicinski" <[email protected]>
Cc: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
Subject: Re: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 23 lines

-----原始邮件-----
发件人: "Jakub Kicinski" <[email protected]>
发送时间:2026-05-01 07:35:51 (星期五)
收件人: 李志 <[email protected]>
抄送: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected] 主题: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 15 lines · On Thu, 30 Apr 2026 14:43:50 +0800 (GMT+08:00) 李志 wrote:
Quoted 4 lines

Why Fixes? If eth1 never worked this is not a fix but new functionality If you want to make this a fix to prevent incompatibility - cut it down just to the eth0 changes.

Thank you for the suggestion.

You're right that eth1 never worked at Gigabit speed, so this should not be treated as a fix.

In v8, I will split the changes into two patches within the same series:
- Patch 1 will contain only the fixes affecting the existing eth0 functionality, and will keep the Fixes tag.
- Patch 2 will add the eth1 support (RX clock inversion workaround) as new functionality, without a Fixes tag.

Quoted 6 lines
Quoted 1 line

Please let me know if you would prefer a different split or ordering.

If you want to consider some part of this commit a fix it has to be posted separately to the net tree (rather than net-next). Once it's merged and makes it way over to the net-next tree (each Thursday) you can post the net-next chnages for eth1

Quoted 7 lines

Thanks, understood.

I will split the changes accordingly:
- Send the eth0 fixes as a new v1 series targeting net.
- Send the eth1 enablement as a new v1 series targeting net-next.

Thanks for the guidance.

Hi Jakub,

Just to confirm the versioning for the eth1 part after splitting the original v7/v8 series:

For the net fix part, I have already posted it as a new v1 series targeting net.

For the eth1 enablement part, my current understanding is that it should be treated as a new independent v1 series for net-next, since the scope and target tree have changed after the split.

Would you prefer this eth1 series to start as v1, or should it continue as v8 for continuity with the original series?

I will follow your preferred approach before posting it.

Thanks,
Zhi

maintainer
#9 lore raw

Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 6 lines · On Tue, 12 May 2026 13:39:12 +0800 (GMT+08:00) 李志 wrote:

For the eth1 enablement part, my current understanding is that it should be treated as a new independent v1 series for net-next, since the scope and target tree have changed after the split.

Would you prefer this eth1 series to start as v1, or should it continue as v8 for continuity with the original series?

v8 is better, but is the fix in net-next already?

If this is the posting you're referring to:
https://lore.kernel.org/all/[email protected]/
it has been dropped based on feedback from Maxime and I don't see a v2.

author
#10 lore raw

Re: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 15 lines

-----Original Messages-----
From: "Jakub Kicinski" <[email protected]>
Send time:Wednesday, 13/05/2026 07:13:15
To: 李志 <[email protected]>
Cc: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
Subject: Re: [PATCH net-next v7 2/4] net: stmmac: eic7700: enable clocks before syscon access and correct RX sampling timing

Quoted 4 lines · On Tue, 12 May 2026 13:39:12 +0800 (GMT+08:00) 李志 wrote:

For the eth1 enablement part, my current understanding is that it should be treated as a new independent v1 series for net-next, since the scope and target tree have changed after the split.

Quoted 8 lines
Quoted 2 lines

Would you prefer this eth1 series to start as v1, or should it continue as v8 for continuity with the original series?

v8 is better, but is the fix in net-next already?

If this is the posting you're referring to:
https://lore.kernel.org/all/[email protected]/
it has been dropped based on feedback from Maxime and I don't see a v2.

Yes, the eth0 fixes have now been reposted as a dedicated series targeting net:
https://lore.kernel.org/lkml/[email protected]/

The previous net-next eth1-related posting was dropped following your guidance to first complete the eth0 fixes in net before continuing with eth1. I will keep eth1 as v8 as previously suggested.

For the eth0 net series, I will split the remaining changes in v2 as suggested by Maxime to improve reviewability and bisectability, and resend shortly.

Once that is completed, I will proceed with the eth1 enablement series (v8) based on the updated context.

Thanks,
Zhi

#11 lore raw

PATCH v7 3/4 dt-bindings: mfd: syscon: add ESWIN EIC7700 compatible

In reply to [email protected]

From: Zhi Li <[email protected]>

Document ESWIN EIC7700 SoC compatible for syscon registers.

---
 Documentation/devicetree/bindings/mfd/syscon.yaml | 2 ++
 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/mfd/syscon.yaml +2 -0
index e22867088063..7d3365601249 100644
@@ -62,6 +62,7 @@ select:
           - cirrus,ep7209-syscon3
           - cnxt,cx92755-uc
           - econet,en751221-chip-scu
+          - eswin,eic7700-syscfg
           - freecom,fsg-cs2-system-controller
           - fsl,imx93-aonmix-ns-syscfg
           - fsl,imx93-wakeupmix-syscfg
@@ -175,6 +176,7 @@ properties:
               - cirrus,ep7209-syscon3
               - cnxt,cx92755-uc
               - econet,en751221-chip-scu
+              - eswin,eic7700-syscfg
               - freecom,fsg-cs2-system-controller
               - fsl,imx93-aonmix-ns-syscfg
               - fsl,imx93-wakeupmix-syscfg
Signature · 1 line
2.25.1
#13 lore raw

PATCH v7 4/4 riscv: dts: eswin: eic7700-hifive-premier-p550: enable Ethernet controller

In reply to [email protected]

From: Zhi Li <[email protected]>

Enable the on-board Gigabit Ethernet controller on the HiFive Premier P550 development board.

---
 .../dts/eswin/eic7700-hifive-premier-p550.dts | 239 ++++++++++++++++++
 arch/riscv/boot/dts/eswin/eic7700.dtsi        | 105 ++++++++
 2 files changed, 344 insertions(+)
arch/riscv/boot/dts/eswin/eic7700-hifive-premier-p550.dts +239 -0
index 131ed1fc6b2e..4e09ad738d3d 100644
@@ -13,11 +13,250 @@ / {
 
 	aliases {
 		serial0 = &uart0;
+		ethernet0 = &gmac0;
+		ethernet1 = &gmac1;
 	};
 
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
+
+	vcc_1v8: vcc1v8 {
+		 compatible = "regulator-fixed";
+		 regulator-name = "vcc1v8";
+		 regulator-always-on;
+		 regulator-boot-on;
+		 regulator-min-microvolt = <1800000>;
+		 regulator-max-microvolt = <1800000>;
+	 };
+};
+
+&xtal24m {
+	clock-frequency = <24000000>;
+	clock-output-names = "xtal24m";
+};
+
+&pinctrl {
+	status = "okay";
+	vrgmii-supply = <&vcc_1v8>;
+
+	pinctrl_gpio0: gpio0-grp {
+		gpio0-pins {
+			pins = "gpio0";
+			function = "gpio";
+			input-enable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio5: gpio5-grp {
+		gpio5-pins {
+			pins = "gpio5";
+			function = "gpio";
+			input-enable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio11: gpio11-grp {
+		gpio11-pins {
+			pins = "gpio11";
+			function = "gpio";
+			input-enable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio14: gpio14-grp {
+		gpio14-pins {
+			pins = "mode_set1";
+			function = "gpio";
+			input-disable;
+			bias-pull-up;
+		};
+	};
+
+	pinctrl_gpio15: gpio15-grp {
+		gpio15-pins {
+			pins = "mode_set2";
+			function = "gpio";
+			input-enable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio28: gpio28-grp {
+		gpio28-pins {
+			pins = "gpio28";
+			function = "gpio";
+			input-enable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio43: gpio43-grp {
+		gpio43-pins {
+			pins = "usb1_pwren";
+			function = "gpio";
+			input-disable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio71: gpio71-grp {
+		gpio71-pins {
+			pins = "mipi_csi0_xhs";
+			function = "gpio";
+			input-disable;
+			bias-pull-up;
+		};
+	};
+
+	pinctrl_gpio74: gpio74-grp {
+		gpio74-pins {
+			pins = "mipi_csi1_xhs";
+			function = "gpio";
+			input-disable;
+			bias-pull-up;
+		};
+	};
+
+	pinctrl_gpio76: gpio76-grp {
+		gpio76-pins {
+			pins = "mipi_csi2_xvs";
+			function = "gpio";
+			input-disable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio77: gpio77-grp {
+		gpio77-pins {
+			pins = "mipi_csi2_xhs";
+			function = "gpio";
+			input-disable;
+			bias-pull-up;
+		};
+	};
+
+	pinctrl_gpio79: gpio79-grp {
+		gpio79-pins {
+			pins = "mipi_csi3_xvs";
+			function = "gpio";
+			input-disable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio80: gpio80-grp {
+		gpio80-pins {
+			pins = "mipi_csi3_xhs";
+			function = "gpio";
+			input-disable;
+			bias-pull-up;
+		};
+	};
+
+	pinctrl_gpio82: gpio82-grp {
+		gpio82-pins {
+			pins = "mipi_csi4_xvs";
+			function = "gpio";
+			input-disable;
+			bias-pull-up;
+		};
+	};
+
+	pinctrl_gpio84: gpio84-grp {
+		gpio84-pins {
+			pins = "mipi_csi4_mclk";
+			function = "gpio";
+			input-disable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio85: gpio85-grp {
+		gpio85-pins {
+			pins = "mipi_csi5_xvs";
+			function = "gpio";
+			input-disable;
+			bias-pull-up;
+		};
+	};
+
+	pinctrl_gpio94: gpio94-grp {
+		gpio94-pins {
+			pins = "s_mode";
+			function = "gpio";
+			input-disable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio106: gpio106-grp {
+		gpio106-pins {
+			pins = "gpio106";
+			function = "gpio";
+			input-disable;
+			bias-disable;
+		};
+	};
+
+	pinctrl_gpio111: gpio111-grp {
+		gpio111-pins {
+			pins = "gpio111";
+			function = "gpio";
+			input-disable;
+			bias-disable;
+		};
+	};
+};
+
+&gmac0 {
+	phy-handle = <&gmac0_phy0>;
+	phy-mode = "rgmii-id";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_gpio106>;
+	rx-internal-delay-ps = <20>;
+	tx-internal-delay-ps = <100>;
+	status = "okay";
+};
+
+&gmac0_mdio {
+	gmac0_phy0: ethernet-phy@0 {
+		compatible = "ethernet-phy-id001c.c916";
+		reg = <0>;
+		reset-gpios = <&gpioD 10 GPIO_ACTIVE_LOW>;
+		reset-assert-us = <10000>;
+		reset-deassert-us = <80000>;
+	};
+};
+
+&gmac1 {
+	phy-handle = <&gmac1_phy0>;
+	/*
+	 * For the TX path of gmac1, there is a skew between the TX clock
+	 * and data on the MAC controller inside the silicon. This skew happens
+	 * to be approximately 2 ns. Therefore, it can be considered that the
+	 * 2 ns delay of TX is provided by the MAC.
+	 * No delay configuration for tx is needed in software via PHY driver.
+	 */
+	phy-mode = "rgmii-rxid";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_gpio111>;
+	rx-internal-delay-ps = <200>;
+	tx-internal-delay-ps = <200>;
+	status = "okay";
+};
+
+&gmac1_mdio {
+	gmac1_phy0: ethernet-phy@0 {
+		compatible = "ethernet-phy-id001c.c916";
+		reg = <0>;
+		reset-gpios = <&gpioD 15 GPIO_ACTIVE_LOW>;
+		reset-assert-us = <10000>;
+		reset-deassert-us = <80000>;
+	};
 };
 
 &uart0 {
arch/riscv/boot/dts/eswin/eic7700.dtsi +105 -0

128 lines not on this page · raw message

Signature · 1 line
2.25.1
#14 lore raw

Re: [PATCH net-next v7 4/4] riscv: dts: eswin: eic7700-hifive-premier-p550: enable Ethernet controller

arch/riscv/boot/dts/eswin/eic7700-hifive-premier-p550.dts / { · line 244

Quoted 10 lines

+&gmac1 {

arch/riscv/boot/dts/eswin/eic7700-hifive-premier-p550.dts +9 -0
+	phy-handle = <&gmac1_phy0>;
+	/*
+	 * For the TX path of gmac1, there is a skew between the TX clock
+	 * and data on the MAC controller inside the silicon. This skew happens
+	 * to be approximately 2 ns. Therefore, it can be considered that the
+	 * 2 ns delay of TX is provided by the MAC.
+	 * No delay configuration for tx is needed in software via PHY driver.
+	 */
+	phy-mode = "rgmii-rxid";

This is wrong. Take a read of

https://elixir.bootlin.com/linux/v6.15/source/Documentation/devicetree/bindings/net/ethernet-controller.yaml#L287

phy-mode describes the board. If the board provides the 2ns delay, you use rgmii. If the MAC/PHY pair needs to provide the delay, you using rgmii-id.

If rgmii-id is used, it is up to the MAC/PHY to decide which will add the delay. If the MAC adds the delay, it needs to mask the value of phy-mode it passes to the PHY so it does not also add the delay.

Your broken hardware means you cannot support 'rgmii' or 'rgmii-rx', since you cannot turn off this 2ns delay, so you end up with double delays if anybody designs a board with 2ns TX delay on the board itself. So please validate the PHY modes and return -EINVAL if these modes are used.

Andrew

---
pw-bot: cr

author
#15 lore raw

Re: Re: [PATCH net-next v7 4/4] riscv: dts: eswin: eic7700-hifive-premier-p550: enable Ethernet controller

Quoted 33 lines

-----原始邮件-----
发件人: "Andrew Lunn" <[email protected]>
发送时间:2026-04-29 09:41:53 (星期三)
收件人: [email protected]
抄送: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected] 主题: Re: [PATCH net-next v7 4/4] riscv: dts: eswin: eic7700-hifive-premier-p550: enable Ethernet controller

arch/riscv/boot/dts/eswin/eic7700-hifive-premier-p550.dts / { · line 244

Quoted 10 lines

+&gmac1 {

arch/riscv/boot/dts/eswin/eic7700-hifive-premier-p550.dts +9 -0
+	phy-handle = <&gmac1_phy0>;
+	/*
+	 * For the TX path of gmac1, there is a skew between the TX clock
+	 * and data on the MAC controller inside the silicon. This skew happens
+	 * to be approximately 2 ns. Therefore, it can be considered that the
+	 * 2 ns delay of TX is provided by the MAC.
+	 * No delay configuration for tx is needed in software via PHY driver.
+	 */
+	phy-mode = "rgmii-rxid";

This is wrong. Take a read of

https://elixir.bootlin.com/linux/v6.15/source/Documentation/devicetree/bindings/net/ethernet-controller.yaml#L287

phy-mode describes the board. If the board provides the 2ns delay, you use rgmii. If the MAC/PHY pair needs to provide the delay, you using rgmii-id.

If rgmii-id is used, it is up to the MAC/PHY to decide which will add the delay. If the MAC adds the delay, it needs to mask the value of phy-mode it passes to the PHY so it does not also add the delay.

Quoted 6 lines

Your broken hardware means you cannot support 'rgmii' or 'rgmii-rx', since you cannot turn off this 2ns delay, so you end up with double delays if anybody designs a board with 2ns TX delay on the board itself. So please validate the PHY modes and return -EINVAL if these modes are used.

Thanks for the detailed explanation.

You are right that phy-mode should describe the board-level configuration and should not be modified in the DT to reflect MAC-internal behavior.

For this hardware, the MAC unconditionally introduces an ~2 ns TX delay which cannot be disabled. This means the configuration effectively matches rgmii-id at the board level, where TX delay is provided by the MAC and RX delay by the PHY.

I will therefore:
- Keep the DT using phy-mode = "rgmii-id" to correctly describe the board-level timing.
- In the driver, mask the phy_interface passed to the PHY so that it does not add TX delay, avoiding double delay.
- Explicitly reject unsupported modes such as "rgmii" and "rgmii-rxid", since the MAC TX delay cannot be disabled and these configurations would lead to incorrect timing.

Regarding the tx-internal-delay-ps property, it represents the total effective TX delay on the line, including the inherent ~2 ns skew introduced by the MAC silicon. The driver subtracts this inherent skew and programs only the remaining delay.

As a result, for the clk-inversion variant, the valid range is [2000, 4540], which matches the updated binding constraints.

I will clarify in the binding description that this property represents the total TX delay (MAC + programmable), to avoid ambiguity.

Thanks for pointing this out.