Commit b3e8c3df authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'fix-broken-link-with-th1520-gmac-when-linkspeed-changes' 

Yao Zi says:

====================
Fix broken link with TH1520 GMAC when linkspeed changes

It's noted that on TH1520 SoC, the GMAC's link becomes broken after
the link speed is changed (for example, running ethtool -s eth0 speed
100 on the peer when negotiated to 1Gbps), but the GMAC could function
normally if the speed is brought back to the initial.

Just like many other SoCs utilizing STMMAC IP, we need to adjust the TX
clock supplying TH1520's GMAC through some SoC-specific glue registers
when linkspeed changes. But it's found that after the full kernel
startup, reading from them results in garbage and writing to them makes
no effect, which is the cause of broken link.

Further testing shows perisys-apb4-hclk must be ungated for normal
access to Th1520 GMAC APB glue registers, which is neither described in
dt-binding nor acquired by the driver.

This series expands the dt-binding of TH1520's GMAC to allow an extra
"APB glue registers interface clock", instructs the driver to acquire
and enable the clock, and finally supplies CLK_PERISYS_APB4_HCLK for
TH1520's GMACs in SoC devicetree.

v2: https://lore.kernel.org/netdev/20250801091240.46114-1-ziyao@disroot.org/
v1: https://lore.kernel.org/all/20250729093734.40132-1-ziyao@disroot.org/
====================

Link: https://patch.msgid.link/20250808093655.48074-2-ziyao@disroot.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 8ea25274 a7f75e28

Documentation/devicetree/bindings/net/thead,th1520-gmac.yaml

+4 −2
Original line number Diff line number Diff line
@@ -62,11 +62,13 @@ properties: 
    items:

      - description: GMAC main clock

      - description: Peripheral registers interface clock

      - description: APB glue registers interface clock



  clock-names:

    items:

      - const: stmmaceth

      - const: pclk

      - const: apb



  interrupts:

    items:
@@ -88,8 +90,8 @@ examples: 
        compatible = "thead,th1520-gmac", "snps,dwmac-3.70a";

        reg = <0xe7070000 0x2000>, <0xec003000 0x1000>;

        reg-names = "dwmac", "apb";

        clocks = <&clk 1>, <&clk 2>;

        clock-names = "stmmaceth", "pclk";

        clocks = <&clk 1>, <&clk 2>, <&clk 3>;

        clock-names = "stmmaceth", "pclk", "apb";

        interrupts = <66>;

        interrupt-names = "macirq";

        phy-mode = "rgmii-id";

arch/riscv/boot/dts/thead/th1520.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -297,8 +297,9 @@ gmac1: ethernet@ffe7060000 { 
			reg-names = "dwmac", "apb";

			interrupts = <67 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			clocks = <&clk CLK_GMAC_AXI>, <&clk CLK_GMAC1>;

			clock-names = "stmmaceth", "pclk";

			clocks = <&clk CLK_GMAC_AXI>, <&clk CLK_GMAC1>,

				 <&clk CLK_PERISYS_APB4_HCLK>;

			clock-names = "stmmaceth", "pclk", "apb";

			snps,pbl = <32>;

			snps,fixed-burst;

			snps,multicast-filter-bins = <64>;
@@ -319,8 +320,9 @@ gmac0: ethernet@ffe7070000 { 
			reg-names = "dwmac", "apb";

			interrupts = <66 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			clocks = <&clk CLK_GMAC_AXI>, <&clk CLK_GMAC0>;

			clock-names = "stmmaceth", "pclk";

			clocks = <&clk CLK_GMAC_AXI>, <&clk CLK_GMAC0>,

				 <&clk CLK_PERISYS_APB4_HCLK>;

			clock-names = "stmmaceth", "pclk", "apb";

			snps,pbl = <32>;

			snps,fixed-burst;

			snps,multicast-filter-bins = <64>;

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

+14 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ static int thead_dwmac_probe(struct platform_device *pdev) 
	struct stmmac_resources stmmac_res;

	struct plat_stmmacenet_data *plat;

	struct thead_dwmac *dwmac;

	struct clk *apb_clk;

	void __iomem *apb;

	int ret;
@@ -224,6 +225,19 @@ static int thead_dwmac_probe(struct platform_device *pdev) 
		return dev_err_probe(&pdev->dev, PTR_ERR(plat),

				     "dt configuration failed\n");



	/*

	 * The APB clock is essential for accessing glue registers. However,

	 * old devicetrees don't describe it correctly. We continue to probe

	 * and emit a warning if it isn't present.

	 */

	apb_clk = devm_clk_get_enabled(&pdev->dev, "apb");

	if (PTR_ERR(apb_clk) == -ENOENT)

		dev_warn(&pdev->dev,

			 "cannot get apb clock, link may break after speed changes\n");

	else if (IS_ERR(apb_clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(apb_clk),

				     "failed to get apb clock\n");



	dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);

	if (!dwmac)

		return -ENOMEM;