* [PATCH v2 0/2] Add GMAC support for rk3576 @ 2024-08-08 17:00 ` Detlev Casanova 0 siblings, 0 replies; 14+ messages in thread From: Detlev Casanova @ 2024-08-08 17:00 UTC (permalink / raw) To: linux-kernel Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel, Detlev Casanova Add the necessary constants and functions to support the GMAC devices on the rk3576. Changes since v1: - Add binding in net/snps,dwmac.yaml too David Wu (1): ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 Detlev Casanova (1): dt-bindings: net: Add support for rk3576 dwmac .../bindings/net/rockchip-dwmac.yaml | 2 + .../devicetree/bindings/net/snps,dwmac.yaml | 1 + .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ 3 files changed, 159 insertions(+) -- 2.46.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 0/2] Add GMAC support for rk3576 @ 2024-08-08 17:00 ` Detlev Casanova 0 siblings, 0 replies; 14+ messages in thread From: Detlev Casanova @ 2024-08-08 17:00 UTC (permalink / raw) To: linux-kernel Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel, Detlev Casanova Add the necessary constants and functions to support the GMAC devices on the rk3576. Changes since v1: - Add binding in net/snps,dwmac.yaml too David Wu (1): ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 Detlev Casanova (1): dt-bindings: net: Add support for rk3576 dwmac .../bindings/net/rockchip-dwmac.yaml | 2 + .../devicetree/bindings/net/snps,dwmac.yaml | 1 + .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ 3 files changed, 159 insertions(+) -- 2.46.0 ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 1/2] dt-bindings: net: Add support for rk3576 dwmac 2024-08-08 17:00 ` Detlev Casanova @ 2024-08-08 17:00 ` Detlev Casanova -1 siblings, 0 replies; 14+ messages in thread From: Detlev Casanova @ 2024-08-08 17:00 UTC (permalink / raw) To: linux-kernel Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel, Detlev Casanova Add a rockchip,rk3576-gmac compatible for supporting the 2 gmac devices on the rk3576. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> Acked-by: Rob Herring (Arm) <robh@kernel.org> --- Documentation/devicetree/bindings/net/rockchip-dwmac.yaml | 2 ++ Documentation/devicetree/bindings/net/snps,dwmac.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml b/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml index 6bbe96e352509..f8a576611d6c1 100644 --- a/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml @@ -25,6 +25,7 @@ select: - rockchip,rk3368-gmac - rockchip,rk3399-gmac - rockchip,rk3568-gmac + - rockchip,rk3576-gmac - rockchip,rk3588-gmac - rockchip,rv1108-gmac - rockchip,rv1126-gmac @@ -52,6 +53,7 @@ properties: - items: - enum: - rockchip,rk3568-gmac + - rockchip,rk3576-gmac - rockchip,rk3588-gmac - rockchip,rv1126-gmac - const: snps,dwmac-4.20a diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 3eb65e63fdaec..4e2ba1bf788c9 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -80,6 +80,7 @@ properties: - rockchip,rk3328-gmac - rockchip,rk3366-gmac - rockchip,rk3368-gmac + - rockchip,rk3576-gmac - rockchip,rk3588-gmac - rockchip,rk3399-gmac - rockchip,rv1108-gmac -- 2.46.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 1/2] dt-bindings: net: Add support for rk3576 dwmac @ 2024-08-08 17:00 ` Detlev Casanova 0 siblings, 0 replies; 14+ messages in thread From: Detlev Casanova @ 2024-08-08 17:00 UTC (permalink / raw) To: linux-kernel Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel, Detlev Casanova Add a rockchip,rk3576-gmac compatible for supporting the 2 gmac devices on the rk3576. Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> Acked-by: Rob Herring (Arm) <robh@kernel.org> --- Documentation/devicetree/bindings/net/rockchip-dwmac.yaml | 2 ++ Documentation/devicetree/bindings/net/snps,dwmac.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml b/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml index 6bbe96e352509..f8a576611d6c1 100644 --- a/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/rockchip-dwmac.yaml @@ -25,6 +25,7 @@ select: - rockchip,rk3368-gmac - rockchip,rk3399-gmac - rockchip,rk3568-gmac + - rockchip,rk3576-gmac - rockchip,rk3588-gmac - rockchip,rv1108-gmac - rockchip,rv1126-gmac @@ -52,6 +53,7 @@ properties: - items: - enum: - rockchip,rk3568-gmac + - rockchip,rk3576-gmac - rockchip,rk3588-gmac - rockchip,rv1126-gmac - const: snps,dwmac-4.20a diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 3eb65e63fdaec..4e2ba1bf788c9 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -80,6 +80,7 @@ properties: - rockchip,rk3328-gmac - rockchip,rk3366-gmac - rockchip,rk3368-gmac + - rockchip,rk3576-gmac - rockchip,rk3588-gmac - rockchip,rk3399-gmac - rockchip,rv1108-gmac -- 2.46.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 2024-08-08 17:00 ` Detlev Casanova @ 2024-08-08 17:00 ` Detlev Casanova -1 siblings, 0 replies; 14+ messages in thread From: Detlev Casanova @ 2024-08-08 17:00 UTC (permalink / raw) To: linux-kernel Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel, Detlev Casanova From: David Wu <david.wu@rock-chips.com> Add constants and callback functions for the dwmac on RK3576 soc. Signed-off-by: David Wu <david.wu@rock-chips.com> [rebase, extracted bindings] Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 7ae04d8d291c8..e1fa8fc9f4012 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1116,6 +1116,161 @@ static const struct rk_gmac_ops rk3568_ops = { }, }; +/* VCCIO0_1_3_IOC */ +#define RK3576_VCCIO0_1_3_IOC_CON2 0X6408 +#define RK3576_VCCIO0_1_3_IOC_CON3 0X640c +#define RK3576_VCCIO0_1_3_IOC_CON4 0X6410 +#define RK3576_VCCIO0_1_3_IOC_CON5 0X6414 + +#define RK3576_GMAC_RXCLK_DLY_ENABLE GRF_BIT(15) +#define RK3576_GMAC_RXCLK_DLY_DISABLE GRF_CLR_BIT(15) +#define RK3576_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7) +#define RK3576_GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(7) + +#define RK3576_GMAC_CLK_RX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 8) +#define RK3576_GMAC_CLK_TX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 0) + +/* SDGMAC_GRF */ +#define RK3576_GRF_GMAC_CON0 0X0020 +#define RK3576_GRF_GMAC_CON1 0X0024 + +#define RK3576_GMAC_RMII_MODE GRF_BIT(3) +#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) + +#define RK3576_GMAC_CLK_SELET_IO GRF_BIT(7) +#define RK3576_GMAC_CLK_SELET_CRU GRF_CLR_BIT(7) + +#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) +#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) + +#define RK3576_GMAC_CLK_RGMII_DIV1 \ + (GRF_CLR_BIT(6) | GRF_CLR_BIT(5)) +#define RK3576_GMAC_CLK_RGMII_DIV5 \ + (GRF_BIT(6) | GRF_BIT(5)) +#define RK3576_GMAC_CLK_RGMII_DIV50 \ + (GRF_BIT(6) | GRF_CLR_BIT(5)) + +#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) +#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) + +static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, + int tx_delay, int rx_delay) +{ + struct device *dev = &bsp_priv->pdev->dev; + unsigned int offset_con; + + if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) { + dev_err(dev, "Missing rockchip,grf or rockchip,php_grf property\n"); + return; + } + + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : + RK3576_GRF_GMAC_CON0; + + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RGMII_MODE); + + offset_con = bsp_priv->id == 1 ? RK3576_VCCIO0_1_3_IOC_CON4 : + RK3576_VCCIO0_1_3_IOC_CON2; + + /* m0 && m1 delay enabled */ + regmap_write(bsp_priv->php_grf, offset_con, + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); + regmap_write(bsp_priv->php_grf, offset_con + 0x4, + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); + + /* m0 && m1 delay value */ + regmap_write(bsp_priv->php_grf, offset_con, + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); + regmap_write(bsp_priv->php_grf, offset_con + 0x4, + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); +} + +static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) +{ + struct device *dev = &bsp_priv->pdev->dev; + unsigned int offset_con; + + if (IS_ERR(bsp_priv->php_grf)) { + dev_err(dev, "%s: Missing rockchip,php_grf property\n", __func__); + return; + } + + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : + RK3576_GRF_GMAC_CON0; + + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RMII_MODE); +} + +static void rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv, int speed) +{ + struct device *dev = &bsp_priv->pdev->dev; + unsigned int val = 0, offset_con; + + switch (speed) { + case 10: + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) + val = RK3576_GMAC_CLK_RMII_DIV20; + else + val = RK3576_GMAC_CLK_RGMII_DIV50; + break; + case 100: + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) + val = RK3576_GMAC_CLK_RMII_DIV2; + else + val = RK3576_GMAC_CLK_RGMII_DIV5; + break; + case 1000: + if (bsp_priv->phy_iface != PHY_INTERFACE_MODE_RMII) + val = RK3576_GMAC_CLK_RGMII_DIV1; + else + goto err; + break; + default: + goto err; + } + + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : + RK3576_GRF_GMAC_CON0; + + regmap_write(bsp_priv->grf, offset_con, val); + + return; +err: + dev_err(dev, "unknown speed value for GMAC speed=%d", speed); +} + +static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, bool input, + bool enable) +{ + unsigned int val = input ? RK3576_GMAC_CLK_SELET_IO : + RK3576_GMAC_CLK_SELET_CRU; + unsigned int offset_con; + + val |= enable ? RK3576_GMAC_CLK_RMII_NOGATE : + RK3576_GMAC_CLK_RMII_GATE; + + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : + RK3576_GRF_GMAC_CON0; + + regmap_write(bsp_priv->grf, offset_con, val); +} + +static const struct rk_gmac_ops rk3576_ops = { + .set_to_rgmii = rk3576_set_to_rgmii, + .set_to_rmii = rk3576_set_to_rmii, + .set_rgmii_speed = rk3576_set_gmac_speed, + .set_rmii_speed = rk3576_set_gmac_speed, + .set_clock_selection = rk3576_set_clock_selection, + .regs_valid = true, + .regs = { + 0x2a220000, /* gmac0 */ + 0x2a230000, /* gmac1 */ + 0x0, /* sentinel */ + }, +}; + /* sys_grf */ #define RK3588_GRF_GMAC_CON7 0X031c #define RK3588_GRF_GMAC_CON8 0X0320 @@ -1908,6 +2063,7 @@ static const struct of_device_id rk_gmac_dwmac_match[] = { { .compatible = "rockchip,rk3368-gmac", .data = &rk3368_ops }, { .compatible = "rockchip,rk3399-gmac", .data = &rk3399_ops }, { .compatible = "rockchip,rk3568-gmac", .data = &rk3568_ops }, + { .compatible = "rockchip,rk3576-gmac", .data = &rk3576_ops }, { .compatible = "rockchip,rk3588-gmac", .data = &rk3588_ops }, { .compatible = "rockchip,rv1108-gmac", .data = &rv1108_ops }, { .compatible = "rockchip,rv1126-gmac", .data = &rv1126_ops }, -- 2.46.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 @ 2024-08-08 17:00 ` Detlev Casanova 0 siblings, 0 replies; 14+ messages in thread From: Detlev Casanova @ 2024-08-08 17:00 UTC (permalink / raw) To: linux-kernel Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel, Detlev Casanova From: David Wu <david.wu@rock-chips.com> Add constants and callback functions for the dwmac on RK3576 soc. Signed-off-by: David Wu <david.wu@rock-chips.com> [rebase, extracted bindings] Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> --- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 7ae04d8d291c8..e1fa8fc9f4012 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1116,6 +1116,161 @@ static const struct rk_gmac_ops rk3568_ops = { }, }; +/* VCCIO0_1_3_IOC */ +#define RK3576_VCCIO0_1_3_IOC_CON2 0X6408 +#define RK3576_VCCIO0_1_3_IOC_CON3 0X640c +#define RK3576_VCCIO0_1_3_IOC_CON4 0X6410 +#define RK3576_VCCIO0_1_3_IOC_CON5 0X6414 + +#define RK3576_GMAC_RXCLK_DLY_ENABLE GRF_BIT(15) +#define RK3576_GMAC_RXCLK_DLY_DISABLE GRF_CLR_BIT(15) +#define RK3576_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7) +#define RK3576_GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(7) + +#define RK3576_GMAC_CLK_RX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 8) +#define RK3576_GMAC_CLK_TX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 0) + +/* SDGMAC_GRF */ +#define RK3576_GRF_GMAC_CON0 0X0020 +#define RK3576_GRF_GMAC_CON1 0X0024 + +#define RK3576_GMAC_RMII_MODE GRF_BIT(3) +#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) + +#define RK3576_GMAC_CLK_SELET_IO GRF_BIT(7) +#define RK3576_GMAC_CLK_SELET_CRU GRF_CLR_BIT(7) + +#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) +#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) + +#define RK3576_GMAC_CLK_RGMII_DIV1 \ + (GRF_CLR_BIT(6) | GRF_CLR_BIT(5)) +#define RK3576_GMAC_CLK_RGMII_DIV5 \ + (GRF_BIT(6) | GRF_BIT(5)) +#define RK3576_GMAC_CLK_RGMII_DIV50 \ + (GRF_BIT(6) | GRF_CLR_BIT(5)) + +#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) +#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) + +static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, + int tx_delay, int rx_delay) +{ + struct device *dev = &bsp_priv->pdev->dev; + unsigned int offset_con; + + if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) { + dev_err(dev, "Missing rockchip,grf or rockchip,php_grf property\n"); + return; + } + + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : + RK3576_GRF_GMAC_CON0; + + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RGMII_MODE); + + offset_con = bsp_priv->id == 1 ? RK3576_VCCIO0_1_3_IOC_CON4 : + RK3576_VCCIO0_1_3_IOC_CON2; + + /* m0 && m1 delay enabled */ + regmap_write(bsp_priv->php_grf, offset_con, + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); + regmap_write(bsp_priv->php_grf, offset_con + 0x4, + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); + + /* m0 && m1 delay value */ + regmap_write(bsp_priv->php_grf, offset_con, + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); + regmap_write(bsp_priv->php_grf, offset_con + 0x4, + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); +} + +static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) +{ + struct device *dev = &bsp_priv->pdev->dev; + unsigned int offset_con; + + if (IS_ERR(bsp_priv->php_grf)) { + dev_err(dev, "%s: Missing rockchip,php_grf property\n", __func__); + return; + } + + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : + RK3576_GRF_GMAC_CON0; + + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RMII_MODE); +} + +static void rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv, int speed) +{ + struct device *dev = &bsp_priv->pdev->dev; + unsigned int val = 0, offset_con; + + switch (speed) { + case 10: + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) + val = RK3576_GMAC_CLK_RMII_DIV20; + else + val = RK3576_GMAC_CLK_RGMII_DIV50; + break; + case 100: + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) + val = RK3576_GMAC_CLK_RMII_DIV2; + else + val = RK3576_GMAC_CLK_RGMII_DIV5; + break; + case 1000: + if (bsp_priv->phy_iface != PHY_INTERFACE_MODE_RMII) + val = RK3576_GMAC_CLK_RGMII_DIV1; + else + goto err; + break; + default: + goto err; + } + + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : + RK3576_GRF_GMAC_CON0; + + regmap_write(bsp_priv->grf, offset_con, val); + + return; +err: + dev_err(dev, "unknown speed value for GMAC speed=%d", speed); +} + +static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, bool input, + bool enable) +{ + unsigned int val = input ? RK3576_GMAC_CLK_SELET_IO : + RK3576_GMAC_CLK_SELET_CRU; + unsigned int offset_con; + + val |= enable ? RK3576_GMAC_CLK_RMII_NOGATE : + RK3576_GMAC_CLK_RMII_GATE; + + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : + RK3576_GRF_GMAC_CON0; + + regmap_write(bsp_priv->grf, offset_con, val); +} + +static const struct rk_gmac_ops rk3576_ops = { + .set_to_rgmii = rk3576_set_to_rgmii, + .set_to_rmii = rk3576_set_to_rmii, + .set_rgmii_speed = rk3576_set_gmac_speed, + .set_rmii_speed = rk3576_set_gmac_speed, + .set_clock_selection = rk3576_set_clock_selection, + .regs_valid = true, + .regs = { + 0x2a220000, /* gmac0 */ + 0x2a230000, /* gmac1 */ + 0x0, /* sentinel */ + }, +}; + /* sys_grf */ #define RK3588_GRF_GMAC_CON7 0X031c #define RK3588_GRF_GMAC_CON8 0X0320 @@ -1908,6 +2063,7 @@ static const struct of_device_id rk_gmac_dwmac_match[] = { { .compatible = "rockchip,rk3368-gmac", .data = &rk3368_ops }, { .compatible = "rockchip,rk3399-gmac", .data = &rk3399_ops }, { .compatible = "rockchip,rk3568-gmac", .data = &rk3568_ops }, + { .compatible = "rockchip,rk3576-gmac", .data = &rk3576_ops }, { .compatible = "rockchip,rk3588-gmac", .data = &rk3588_ops }, { .compatible = "rockchip,rv1108-gmac", .data = &rv1108_ops }, { .compatible = "rockchip,rv1126-gmac", .data = &rv1126_ops }, -- 2.46.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 2024-08-08 17:00 ` Detlev Casanova @ 2024-08-09 13:16 ` Heiko Stübner -1 siblings, 0 replies; 14+ messages in thread From: Heiko Stübner @ 2024-08-09 13:16 UTC (permalink / raw) To: linux-kernel, Detlev Casanova Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel, Detlev Casanova Hi Detlev, Am Donnerstag, 8. August 2024, 19:00:18 CEST schrieb Detlev Casanova: > From: David Wu <david.wu@rock-chips.com> > > Add constants and callback functions for the dwmac on RK3576 soc. > > Signed-off-by: David Wu <david.wu@rock-chips.com> > [rebase, extracted bindings] > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > --- > .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ > 1 file changed, 156 insertions(+) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > index 7ae04d8d291c8..e1fa8fc9f4012 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > @@ -1116,6 +1116,161 @@ static const struct rk_gmac_ops rk3568_ops = { > }, > }; > > +/* VCCIO0_1_3_IOC */ > +#define RK3576_VCCIO0_1_3_IOC_CON2 0X6408 > +#define RK3576_VCCIO0_1_3_IOC_CON3 0X640c > +#define RK3576_VCCIO0_1_3_IOC_CON4 0X6410 > +#define RK3576_VCCIO0_1_3_IOC_CON5 0X6414 > + > +#define RK3576_GMAC_RXCLK_DLY_ENABLE GRF_BIT(15) > +#define RK3576_GMAC_RXCLK_DLY_DISABLE GRF_CLR_BIT(15) > +#define RK3576_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7) > +#define RK3576_GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(7) > + > +#define RK3576_GMAC_CLK_RX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 8) > +#define RK3576_GMAC_CLK_TX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 0) > + > +/* SDGMAC_GRF */ > +#define RK3576_GRF_GMAC_CON0 0X0020 > +#define RK3576_GRF_GMAC_CON1 0X0024 > + > +#define RK3576_GMAC_RMII_MODE GRF_BIT(3) > +#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) > + > +#define RK3576_GMAC_CLK_SELET_IO GRF_BIT(7) > +#define RK3576_GMAC_CLK_SELET_CRU GRF_CLR_BIT(7) nit: typos _CLK_SELECT_ ... missing the C in select > + > +#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) > +#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) I think those are backwards The TRM says bit[5]=0: 25MHz (DIV2) and bit[5]=1: 2.5MHz (DIV20) I guess nobody also on Rockchip's side tested a RMII phy on those controllrs > + > +#define RK3576_GMAC_CLK_RGMII_DIV1 \ > + (GRF_CLR_BIT(6) | GRF_CLR_BIT(5)) > +#define RK3576_GMAC_CLK_RGMII_DIV5 \ > + (GRF_BIT(6) | GRF_BIT(5)) > +#define RK3576_GMAC_CLK_RGMII_DIV50 \ > + (GRF_BIT(6) | GRF_CLR_BIT(5)) > + in contrast, these are correct and match the TRM > +#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) > +#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) > + > +static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, > + int tx_delay, int rx_delay) > +{ > + struct device *dev = &bsp_priv->pdev->dev; > + unsigned int offset_con; > + > + if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) { > + dev_err(dev, "Missing rockchip,grf or rockchip,php_grf property\n"); > + return; > + } > + > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > + RK3576_GRF_GMAC_CON0; > + > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RGMII_MODE); > + > + offset_con = bsp_priv->id == 1 ? RK3576_VCCIO0_1_3_IOC_CON4 : > + RK3576_VCCIO0_1_3_IOC_CON2; > + > + /* m0 && m1 delay enabled */ > + regmap_write(bsp_priv->php_grf, offset_con, > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > + > + /* m0 && m1 delay value */ > + regmap_write(bsp_priv->php_grf, offset_con, > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > +} > + > +static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) > +{ > + struct device *dev = &bsp_priv->pdev->dev; > + unsigned int offset_con; > + > + if (IS_ERR(bsp_priv->php_grf)) { > + dev_err(dev, "%s: Missing rockchip,php_grf property\n", __func__); > + return; > + } > + > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > + RK3576_GRF_GMAC_CON0; > + > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RMII_MODE); > +} > + > +static void rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv, int speed) > +{ > + struct device *dev = &bsp_priv->pdev->dev; > + unsigned int val = 0, offset_con; > + > + switch (speed) { > + case 10: > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > + val = RK3576_GMAC_CLK_RMII_DIV20; > + else > + val = RK3576_GMAC_CLK_RGMII_DIV50; val = bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII ? RK3576_GMAC_CLK_RMII_DIV20 : RK3576_GMAC_CLK_RGMII_DIV50; perhaps? > + break; > + case 100: > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > + val = RK3576_GMAC_CLK_RMII_DIV2; > + else > + val = RK3576_GMAC_CLK_RGMII_DIV5; same as above? > + break; > + case 1000: > + if (bsp_priv->phy_iface != PHY_INTERFACE_MODE_RMII) > + val = RK3576_GMAC_CLK_RGMII_DIV1; > + else > + goto err; if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) goto err; val = RK3576_GMAC_CLK_RGMII_DIV1; > + break; > + default: > + goto err; > + } > + > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > + RK3576_GRF_GMAC_CON0; > + > + regmap_write(bsp_priv->grf, offset_con, val); > + > + return; > +err: > + dev_err(dev, "unknown speed value for GMAC speed=%d", speed); > +} > + > +static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, bool input, > + bool enable) > +{ > + unsigned int val = input ? RK3576_GMAC_CLK_SELET_IO : > + RK3576_GMAC_CLK_SELET_CRU; > + unsigned int offset_con; > + > + val |= enable ? RK3576_GMAC_CLK_RMII_NOGATE : > + RK3576_GMAC_CLK_RMII_GATE; > + > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > + RK3576_GRF_GMAC_CON0; nit: alignment of both looks like it could be nicer Heiko _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 @ 2024-08-09 13:16 ` Heiko Stübner 0 siblings, 0 replies; 14+ messages in thread From: Heiko Stübner @ 2024-08-09 13:16 UTC (permalink / raw) To: linux-kernel, Detlev Casanova Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel, Detlev Casanova Hi Detlev, Am Donnerstag, 8. August 2024, 19:00:18 CEST schrieb Detlev Casanova: > From: David Wu <david.wu@rock-chips.com> > > Add constants and callback functions for the dwmac on RK3576 soc. > > Signed-off-by: David Wu <david.wu@rock-chips.com> > [rebase, extracted bindings] > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > --- > .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ > 1 file changed, 156 insertions(+) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > index 7ae04d8d291c8..e1fa8fc9f4012 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > @@ -1116,6 +1116,161 @@ static const struct rk_gmac_ops rk3568_ops = { > }, > }; > > +/* VCCIO0_1_3_IOC */ > +#define RK3576_VCCIO0_1_3_IOC_CON2 0X6408 > +#define RK3576_VCCIO0_1_3_IOC_CON3 0X640c > +#define RK3576_VCCIO0_1_3_IOC_CON4 0X6410 > +#define RK3576_VCCIO0_1_3_IOC_CON5 0X6414 > + > +#define RK3576_GMAC_RXCLK_DLY_ENABLE GRF_BIT(15) > +#define RK3576_GMAC_RXCLK_DLY_DISABLE GRF_CLR_BIT(15) > +#define RK3576_GMAC_TXCLK_DLY_ENABLE GRF_BIT(7) > +#define RK3576_GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(7) > + > +#define RK3576_GMAC_CLK_RX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 8) > +#define RK3576_GMAC_CLK_TX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 0) > + > +/* SDGMAC_GRF */ > +#define RK3576_GRF_GMAC_CON0 0X0020 > +#define RK3576_GRF_GMAC_CON1 0X0024 > + > +#define RK3576_GMAC_RMII_MODE GRF_BIT(3) > +#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) > + > +#define RK3576_GMAC_CLK_SELET_IO GRF_BIT(7) > +#define RK3576_GMAC_CLK_SELET_CRU GRF_CLR_BIT(7) nit: typos _CLK_SELECT_ ... missing the C in select > + > +#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) > +#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) I think those are backwards The TRM says bit[5]=0: 25MHz (DIV2) and bit[5]=1: 2.5MHz (DIV20) I guess nobody also on Rockchip's side tested a RMII phy on those controllrs > + > +#define RK3576_GMAC_CLK_RGMII_DIV1 \ > + (GRF_CLR_BIT(6) | GRF_CLR_BIT(5)) > +#define RK3576_GMAC_CLK_RGMII_DIV5 \ > + (GRF_BIT(6) | GRF_BIT(5)) > +#define RK3576_GMAC_CLK_RGMII_DIV50 \ > + (GRF_BIT(6) | GRF_CLR_BIT(5)) > + in contrast, these are correct and match the TRM > +#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) > +#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) > + > +static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, > + int tx_delay, int rx_delay) > +{ > + struct device *dev = &bsp_priv->pdev->dev; > + unsigned int offset_con; > + > + if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) { > + dev_err(dev, "Missing rockchip,grf or rockchip,php_grf property\n"); > + return; > + } > + > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > + RK3576_GRF_GMAC_CON0; > + > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RGMII_MODE); > + > + offset_con = bsp_priv->id == 1 ? RK3576_VCCIO0_1_3_IOC_CON4 : > + RK3576_VCCIO0_1_3_IOC_CON2; > + > + /* m0 && m1 delay enabled */ > + regmap_write(bsp_priv->php_grf, offset_con, > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > + > + /* m0 && m1 delay value */ > + regmap_write(bsp_priv->php_grf, offset_con, > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > +} > + > +static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) > +{ > + struct device *dev = &bsp_priv->pdev->dev; > + unsigned int offset_con; > + > + if (IS_ERR(bsp_priv->php_grf)) { > + dev_err(dev, "%s: Missing rockchip,php_grf property\n", __func__); > + return; > + } > + > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > + RK3576_GRF_GMAC_CON0; > + > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RMII_MODE); > +} > + > +static void rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv, int speed) > +{ > + struct device *dev = &bsp_priv->pdev->dev; > + unsigned int val = 0, offset_con; > + > + switch (speed) { > + case 10: > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > + val = RK3576_GMAC_CLK_RMII_DIV20; > + else > + val = RK3576_GMAC_CLK_RGMII_DIV50; val = bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII ? RK3576_GMAC_CLK_RMII_DIV20 : RK3576_GMAC_CLK_RGMII_DIV50; perhaps? > + break; > + case 100: > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > + val = RK3576_GMAC_CLK_RMII_DIV2; > + else > + val = RK3576_GMAC_CLK_RGMII_DIV5; same as above? > + break; > + case 1000: > + if (bsp_priv->phy_iface != PHY_INTERFACE_MODE_RMII) > + val = RK3576_GMAC_CLK_RGMII_DIV1; > + else > + goto err; if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) goto err; val = RK3576_GMAC_CLK_RGMII_DIV1; > + break; > + default: > + goto err; > + } > + > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > + RK3576_GRF_GMAC_CON0; > + > + regmap_write(bsp_priv->grf, offset_con, val); > + > + return; > +err: > + dev_err(dev, "unknown speed value for GMAC speed=%d", speed); > +} > + > +static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, bool input, > + bool enable) > +{ > + unsigned int val = input ? RK3576_GMAC_CLK_SELET_IO : > + RK3576_GMAC_CLK_SELET_CRU; > + unsigned int offset_con; > + > + val |= enable ? RK3576_GMAC_CLK_RMII_NOGATE : > + RK3576_GMAC_CLK_RMII_GATE; > + > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > + RK3576_GRF_GMAC_CON0; nit: alignment of both looks like it could be nicer Heiko ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 2024-08-09 13:16 ` Heiko Stübner @ 2024-08-09 14:38 ` Detlev Casanova -1 siblings, 0 replies; 14+ messages in thread From: Detlev Casanova @ 2024-08-09 14:38 UTC (permalink / raw) To: linux-kernel, Heiko Stübner Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel On Friday, 9 August 2024 09:16:44 EDT Heiko Stübner wrote: > Hi Detlev, > > Am Donnerstag, 8. August 2024, 19:00:18 CEST schrieb Detlev Casanova: > > From: David Wu <david.wu@rock-chips.com> > > > > Add constants and callback functions for the dwmac on RK3576 soc. > > > > Signed-off-by: David Wu <david.wu@rock-chips.com> > > [rebase, extracted bindings] > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > > --- > > > > .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ > > 1 file changed, 156 insertions(+) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index > > 7ae04d8d291c8..e1fa8fc9f4012 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > @@ -1116,6 +1116,161 @@ static const struct rk_gmac_ops rk3568_ops = { > > > > }, > > > > }; > > [...] > > +/* SDGMAC_GRF */ > > +#define RK3576_GRF_GMAC_CON0 0X0020 > > +#define RK3576_GRF_GMAC_CON1 0X0024 > > + > > +#define RK3576_GMAC_RMII_MODE GRF_BIT(3) > > +#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) > > + > > +#define RK3576_GMAC_CLK_SELET_IO GRF_BIT(7) > > +#define RK3576_GMAC_CLK_SELET_CRU GRF_CLR_BIT(7) > > nit: typos _CLK_SELECT_ ... missing the C in select Ack > > + > > +#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) > > +#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) > > I think those are backwards > The TRM says bit[5]=0: 25MHz (DIV2) and bit[5]=1: 2.5MHz (DIV20) > > I guess nobody also on Rockchip's side tested a RMII phy on those controllrs Can't be sure about that. An error in the TRM is not impossible either, as for rk3588, it is also bit[5]=0: DIV20 and bit[5]=1: DIV2. I can switch them to match the TRM though, we may never now. > > + > > +#define RK3576_GMAC_CLK_RGMII_DIV1 \ > > + (GRF_CLR_BIT(6) | GRF_CLR_BIT(5)) > > +#define RK3576_GMAC_CLK_RGMII_DIV5 \ > > + (GRF_BIT(6) | GRF_BIT(5)) > > +#define RK3576_GMAC_CLK_RGMII_DIV50 \ > > + (GRF_BIT(6) | GRF_CLR_BIT(5)) > > + > > in contrast, these are correct and match the TRM > > > +#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) > > +#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) > > + > > +static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, > > + int tx_delay, int rx_delay) > > +{ > > + struct device *dev = &bsp_priv->pdev->dev; > > + unsigned int offset_con; > > + > > + if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) { > > + dev_err(dev, "Missing rockchip,grf or rockchip,php_grf property\n"); > > + return; > > + } > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > + RK3576_GRF_GMAC_CON0; > > + > > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RGMII_MODE); > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_VCCIO0_1_3_IOC_CON4 : > > + RK3576_VCCIO0_1_3_IOC_CON2; > > + > > + /* m0 && m1 delay enabled */ > > + regmap_write(bsp_priv->php_grf, offset_con, > > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > > + > > + /* m0 && m1 delay value */ > > + regmap_write(bsp_priv->php_grf, offset_con, > > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > > +} > > + > > +static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) > > +{ > > + struct device *dev = &bsp_priv->pdev->dev; > > + unsigned int offset_con; > > + > > + if (IS_ERR(bsp_priv->php_grf)) { > > + dev_err(dev, "%s: Missing rockchip,php_grf property\n", __func__); > > + return; > > + } > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > + RK3576_GRF_GMAC_CON0; > > + > > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RMII_MODE); > > +} > > + > > +static void rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv, int > > speed) +{ > > + struct device *dev = &bsp_priv->pdev->dev; > > + unsigned int val = 0, offset_con; > > + > > + switch (speed) { > > + case 10: > > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > + val = RK3576_GMAC_CLK_RMII_DIV20; > > + else > > + val = RK3576_GMAC_CLK_RGMII_DIV50; > > val = bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII ? > RK3576_GMAC_CLK_RMII_DIV20 : > RK3576_GMAC_CLK_RGMII_DIV50; > perhaps? This way matches how it is written in rk3588_set_gmac_speed(). I find that having similar code for similar functions helps reading and understanding it better (although I agree that your suggestion looks better). I'd rather keep it like it is for now if that's ok. > > + break; > > + case 100: > > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > + val = RK3576_GMAC_CLK_RMII_DIV2; > > + else > > + val = RK3576_GMAC_CLK_RGMII_DIV5; > > same as above? > > > + break; > > + case 1000: > > + if (bsp_priv->phy_iface != PHY_INTERFACE_MODE_RMII) > > + val = RK3576_GMAC_CLK_RGMII_DIV1; > > + else > > + goto err; > > if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > goto err; > > val = RK3576_GMAC_CLK_RGMII_DIV1; > > > + break; > > + default: > > + goto err; > > + } > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > + RK3576_GRF_GMAC_CON0; > > + > > + regmap_write(bsp_priv->grf, offset_con, val); > > + > > + return; > > +err: > > + dev_err(dev, "unknown speed value for GMAC speed=%d", speed); > > +} > > + > > +static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, > > bool input, + bool enable) > > +{ > > + unsigned int val = input ? RK3576_GMAC_CLK_SELET_IO : > > + RK3576_GMAC_CLK_SELET_CRU; > > + unsigned int offset_con; > > + > > + val |= enable ? RK3576_GMAC_CLK_RMII_NOGATE : > > + RK3576_GMAC_CLK_RMII_GATE; > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > + RK3576_GRF_GMAC_CON0; > > nit: alignment of both looks like it could be nicer That's strange, the alignments looks good in vim and git diff. It also looks nice on the archive: https://lore.kernel.org/linux-rockchip/ 20240808170113.82775-3-detlev.casanova@collabora.com/ Regards, Detlev _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 @ 2024-08-09 14:38 ` Detlev Casanova 0 siblings, 0 replies; 14+ messages in thread From: Detlev Casanova @ 2024-08-09 14:38 UTC (permalink / raw) To: linux-kernel, Heiko Stübner Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel On Friday, 9 August 2024 09:16:44 EDT Heiko Stübner wrote: > Hi Detlev, > > Am Donnerstag, 8. August 2024, 19:00:18 CEST schrieb Detlev Casanova: > > From: David Wu <david.wu@rock-chips.com> > > > > Add constants and callback functions for the dwmac on RK3576 soc. > > > > Signed-off-by: David Wu <david.wu@rock-chips.com> > > [rebase, extracted bindings] > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > > --- > > > > .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ > > 1 file changed, 156 insertions(+) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index > > 7ae04d8d291c8..e1fa8fc9f4012 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > @@ -1116,6 +1116,161 @@ static const struct rk_gmac_ops rk3568_ops = { > > > > }, > > > > }; > > [...] > > +/* SDGMAC_GRF */ > > +#define RK3576_GRF_GMAC_CON0 0X0020 > > +#define RK3576_GRF_GMAC_CON1 0X0024 > > + > > +#define RK3576_GMAC_RMII_MODE GRF_BIT(3) > > +#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) > > + > > +#define RK3576_GMAC_CLK_SELET_IO GRF_BIT(7) > > +#define RK3576_GMAC_CLK_SELET_CRU GRF_CLR_BIT(7) > > nit: typos _CLK_SELECT_ ... missing the C in select Ack > > + > > +#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) > > +#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) > > I think those are backwards > The TRM says bit[5]=0: 25MHz (DIV2) and bit[5]=1: 2.5MHz (DIV20) > > I guess nobody also on Rockchip's side tested a RMII phy on those controllrs Can't be sure about that. An error in the TRM is not impossible either, as for rk3588, it is also bit[5]=0: DIV20 and bit[5]=1: DIV2. I can switch them to match the TRM though, we may never now. > > + > > +#define RK3576_GMAC_CLK_RGMII_DIV1 \ > > + (GRF_CLR_BIT(6) | GRF_CLR_BIT(5)) > > +#define RK3576_GMAC_CLK_RGMII_DIV5 \ > > + (GRF_BIT(6) | GRF_BIT(5)) > > +#define RK3576_GMAC_CLK_RGMII_DIV50 \ > > + (GRF_BIT(6) | GRF_CLR_BIT(5)) > > + > > in contrast, these are correct and match the TRM > > > +#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) > > +#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) > > + > > +static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, > > + int tx_delay, int rx_delay) > > +{ > > + struct device *dev = &bsp_priv->pdev->dev; > > + unsigned int offset_con; > > + > > + if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) { > > + dev_err(dev, "Missing rockchip,grf or rockchip,php_grf property\n"); > > + return; > > + } > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > + RK3576_GRF_GMAC_CON0; > > + > > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RGMII_MODE); > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_VCCIO0_1_3_IOC_CON4 : > > + RK3576_VCCIO0_1_3_IOC_CON2; > > + > > + /* m0 && m1 delay enabled */ > > + regmap_write(bsp_priv->php_grf, offset_con, > > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > > + > > + /* m0 && m1 delay value */ > > + regmap_write(bsp_priv->php_grf, offset_con, > > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > > +} > > + > > +static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) > > +{ > > + struct device *dev = &bsp_priv->pdev->dev; > > + unsigned int offset_con; > > + > > + if (IS_ERR(bsp_priv->php_grf)) { > > + dev_err(dev, "%s: Missing rockchip,php_grf property\n", __func__); > > + return; > > + } > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > + RK3576_GRF_GMAC_CON0; > > + > > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RMII_MODE); > > +} > > + > > +static void rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv, int > > speed) +{ > > + struct device *dev = &bsp_priv->pdev->dev; > > + unsigned int val = 0, offset_con; > > + > > + switch (speed) { > > + case 10: > > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > + val = RK3576_GMAC_CLK_RMII_DIV20; > > + else > > + val = RK3576_GMAC_CLK_RGMII_DIV50; > > val = bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII ? > RK3576_GMAC_CLK_RMII_DIV20 : > RK3576_GMAC_CLK_RGMII_DIV50; > perhaps? This way matches how it is written in rk3588_set_gmac_speed(). I find that having similar code for similar functions helps reading and understanding it better (although I agree that your suggestion looks better). I'd rather keep it like it is for now if that's ok. > > + break; > > + case 100: > > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > + val = RK3576_GMAC_CLK_RMII_DIV2; > > + else > > + val = RK3576_GMAC_CLK_RGMII_DIV5; > > same as above? > > > + break; > > + case 1000: > > + if (bsp_priv->phy_iface != PHY_INTERFACE_MODE_RMII) > > + val = RK3576_GMAC_CLK_RGMII_DIV1; > > + else > > + goto err; > > if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > goto err; > > val = RK3576_GMAC_CLK_RGMII_DIV1; > > > + break; > > + default: > > + goto err; > > + } > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > + RK3576_GRF_GMAC_CON0; > > + > > + regmap_write(bsp_priv->grf, offset_con, val); > > + > > + return; > > +err: > > + dev_err(dev, "unknown speed value for GMAC speed=%d", speed); > > +} > > + > > +static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, > > bool input, + bool enable) > > +{ > > + unsigned int val = input ? RK3576_GMAC_CLK_SELET_IO : > > + RK3576_GMAC_CLK_SELET_CRU; > > + unsigned int offset_con; > > + > > + val |= enable ? RK3576_GMAC_CLK_RMII_NOGATE : > > + RK3576_GMAC_CLK_RMII_GATE; > > + > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > + RK3576_GRF_GMAC_CON0; > > nit: alignment of both looks like it could be nicer That's strange, the alignments looks good in vim and git diff. It also looks nice on the archive: https://lore.kernel.org/linux-rockchip/ 20240808170113.82775-3-detlev.casanova@collabora.com/ Regards, Detlev ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <a73ff2ab-7e68-4d6b-b38d-37e7303af40d@rock-chips.com>]
* Re: [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 [not found] ` <a73ff2ab-7e68-4d6b-b38d-37e7303af40d@rock-chips.com> @ 2024-08-15 16:35 ` Heiko Stübner 0 siblings, 0 replies; 14+ messages in thread From: Heiko Stübner @ 2024-08-15 16:35 UTC (permalink / raw) To: Detlev Casanova, linux-kernel, David Wu Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Alexandre Torgue, Jose Abreu, Maxime Coquelin, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel Hi David, Am Montag, 12. August 2024, 04:21:27 CEST schrieb David Wu: > Hi Detlev, Heiko: > > It's really a TRM error here, RMII PHY has been verified for this patch. thanks for double checking. Heiko > 在 2024/8/9 22:38, Detlev Casanova 写道: > > Can't be sure about that. An error in the TRM is not impossible either, as for > > rk3588, it is also bit[5]=0: DIV20 and bit[5]=1: DIV2. I can switch them to > > match the TRM though, we may never now. _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 @ 2024-08-15 16:35 ` Heiko Stübner 0 siblings, 0 replies; 14+ messages in thread From: Heiko Stübner @ 2024-08-15 16:35 UTC (permalink / raw) To: Detlev Casanova, linux-kernel, David Wu Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Alexandre Torgue, Jose Abreu, Maxime Coquelin, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel Hi David, Am Montag, 12. August 2024, 04:21:27 CEST schrieb David Wu: > Hi Detlev, Heiko: > > It's really a TRM error here, RMII PHY has been verified for this patch. thanks for double checking. Heiko > 在 2024/8/9 22:38, Detlev Casanova 写道: > > Can't be sure about that. An error in the TRM is not impossible either, as for > > rk3588, it is also bit[5]=0: DIV20 and bit[5]=1: DIV2. I can switch them to > > match the TRM though, we may never now. ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 2024-08-09 14:38 ` Detlev Casanova @ 2024-08-15 16:37 ` Heiko Stübner -1 siblings, 0 replies; 14+ messages in thread From: Heiko Stübner @ 2024-08-15 16:37 UTC (permalink / raw) To: linux-kernel, Detlev Casanova Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel Am Freitag, 9. August 2024, 16:38:23 CEST schrieb Detlev Casanova: > On Friday, 9 August 2024 09:16:44 EDT Heiko Stübner wrote: > > Hi Detlev, > > > > Am Donnerstag, 8. August 2024, 19:00:18 CEST schrieb Detlev Casanova: > > > From: David Wu <david.wu@rock-chips.com> > > > > > > Add constants and callback functions for the dwmac on RK3576 soc. > > > > > > Signed-off-by: David Wu <david.wu@rock-chips.com> > > > [rebase, extracted bindings] > > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > > > --- > > > > > > .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ > > > 1 file changed, 156 insertions(+) > > > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > > b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index > > > 7ae04d8d291c8..e1fa8fc9f4012 100644 > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > > @@ -1116,6 +1116,161 @@ static const struct rk_gmac_ops rk3568_ops = { > > > > > > }, > > > > > > }; > > > > > [...] > > > > +/* SDGMAC_GRF */ > > > +#define RK3576_GRF_GMAC_CON0 0X0020 > > > +#define RK3576_GRF_GMAC_CON1 0X0024 > > > + > > > +#define RK3576_GMAC_RMII_MODE GRF_BIT(3) > > > +#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) > > > + > > > +#define RK3576_GMAC_CLK_SELET_IO GRF_BIT(7) > > > +#define RK3576_GMAC_CLK_SELET_CRU GRF_CLR_BIT(7) > > > > nit: typos _CLK_SELECT_ ... missing the C in select > > Ack So all points below are resolved, and with the C added Reviewed-by: Heiko Stuebner <heiko@sntech.de> > > > > + > > > +#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) > > > +#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) > > > > I think those are backwards > > The TRM says bit[5]=0: 25MHz (DIV2) and bit[5]=1: 2.5MHz (DIV20) > > > > I guess nobody also on Rockchip's side tested a RMII phy on those controllrs > > Can't be sure about that. An error in the TRM is not impossible either, as for > rk3588, it is also bit[5]=0: DIV20 and bit[5]=1: DIV2. I can switch them to > match the TRM though, we may never now. As David said, the TRM is wrong and the code is correct, so all good > > > > + > > > +#define RK3576_GMAC_CLK_RGMII_DIV1 \ > > > + (GRF_CLR_BIT(6) | GRF_CLR_BIT(5)) > > > +#define RK3576_GMAC_CLK_RGMII_DIV5 \ > > > + (GRF_BIT(6) | GRF_BIT(5)) > > > +#define RK3576_GMAC_CLK_RGMII_DIV50 \ > > > + (GRF_BIT(6) | GRF_CLR_BIT(5)) > > > + > > > > in contrast, these are correct and match the TRM > > > > > +#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) > > > +#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) > > > + > > > +static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, > > > + int tx_delay, int rx_delay) > > > +{ > > > + struct device *dev = &bsp_priv->pdev->dev; > > > + unsigned int offset_con; > > > + > > > + if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) { > > > + dev_err(dev, "Missing rockchip,grf or rockchip,php_grf > property\n"); > > > + return; > > > + } > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > > + RK3576_GRF_GMAC_CON0; > > > + > > > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RGMII_MODE); > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_VCCIO0_1_3_IOC_CON4 : > > > + > RK3576_VCCIO0_1_3_IOC_CON2; > > > + > > > + /* m0 && m1 delay enabled */ > > > + regmap_write(bsp_priv->php_grf, offset_con, > > > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > > > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > > > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > > > + > > > + /* m0 && m1 delay value */ > > > + regmap_write(bsp_priv->php_grf, offset_con, > > > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > > > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > > > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > > > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > > > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > > > +} > > > + > > > +static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) > > > +{ > > > + struct device *dev = &bsp_priv->pdev->dev; > > > + unsigned int offset_con; > > > + > > > + if (IS_ERR(bsp_priv->php_grf)) { > > > + dev_err(dev, "%s: Missing rockchip,php_grf property\n", > __func__); > > > + return; > > > + } > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > > + RK3576_GRF_GMAC_CON0; > > > + > > > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RMII_MODE); > > > +} > > > + > > > +static void rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv, int > > > speed) +{ > > > + struct device *dev = &bsp_priv->pdev->dev; > > > + unsigned int val = 0, offset_con; > > > + > > > + switch (speed) { > > > + case 10: > > > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > > + val = RK3576_GMAC_CLK_RMII_DIV20; > > > + else > > > + val = RK3576_GMAC_CLK_RGMII_DIV50; > > > > val = bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII ? > > RK3576_GMAC_CLK_RMII_DIV20 : > > RK3576_GMAC_CLK_RGMII_DIV50; > > perhaps? > > This way matches how it is written in rk3588_set_gmac_speed(). I find that > having similar code for similar functions helps reading and understanding it > better (although I agree that your suggestion looks better). > > I'd rather keep it like it is for now if that's ok. ok, there is not much difference between the two variants anyway. > > > + break; > > > + case 100: > > > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > > + val = RK3576_GMAC_CLK_RMII_DIV2; > > > + else > > > + val = RK3576_GMAC_CLK_RGMII_DIV5; > > > > same as above? > > > > > + break; > > > + case 1000: > > > + if (bsp_priv->phy_iface != PHY_INTERFACE_MODE_RMII) > > > + val = RK3576_GMAC_CLK_RGMII_DIV1; > > > + else > > > + goto err; > > > > if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > goto err; > > > > val = RK3576_GMAC_CLK_RGMII_DIV1; > > > > > + break; > > > + default: > > > + goto err; > > > + } > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > > + RK3576_GRF_GMAC_CON0; > > > + > > > + regmap_write(bsp_priv->grf, offset_con, val); > > > + > > > + return; > > > +err: > > > + dev_err(dev, "unknown speed value for GMAC speed=%d", speed); > > > +} > > > + > > > +static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, > > > bool input, + bool enable) > > > +{ > > > + unsigned int val = input ? RK3576_GMAC_CLK_SELET_IO : > > > + RK3576_GMAC_CLK_SELET_CRU; > > > + unsigned int offset_con; > > > + > > > + val |= enable ? RK3576_GMAC_CLK_RMII_NOGATE : > > > + RK3576_GMAC_CLK_RMII_GATE; > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > > + RK3576_GRF_GMAC_CON0; > > > > nit: alignment of both looks like it could be nicer > > That's strange, the alignments looks good in vim and git diff. It also looks > nice on the archive: https://lore.kernel.org/linux-rockchip/ > 20240808170113.82775-3-detlev.casanova@collabora.com/ ok, probably just some display artifact here :-) _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 @ 2024-08-15 16:37 ` Heiko Stübner 0 siblings, 0 replies; 14+ messages in thread From: Heiko Stübner @ 2024-08-15 16:37 UTC (permalink / raw) To: linux-kernel, Detlev Casanova Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Alexandre Torgue, Jose Abreu, Maxime Coquelin, David Wu, Giuseppe Cavallaro, netdev, devicetree, linux-arm-kernel, linux-rockchip, linux-stm32, kernel Am Freitag, 9. August 2024, 16:38:23 CEST schrieb Detlev Casanova: > On Friday, 9 August 2024 09:16:44 EDT Heiko Stübner wrote: > > Hi Detlev, > > > > Am Donnerstag, 8. August 2024, 19:00:18 CEST schrieb Detlev Casanova: > > > From: David Wu <david.wu@rock-chips.com> > > > > > > Add constants and callback functions for the dwmac on RK3576 soc. > > > > > > Signed-off-by: David Wu <david.wu@rock-chips.com> > > > [rebase, extracted bindings] > > > Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com> > > > --- > > > > > > .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 156 ++++++++++++++++++ > > > 1 file changed, 156 insertions(+) > > > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > > b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index > > > 7ae04d8d291c8..e1fa8fc9f4012 100644 > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c > > > @@ -1116,6 +1116,161 @@ static const struct rk_gmac_ops rk3568_ops = { > > > > > > }, > > > > > > }; > > > > > [...] > > > > +/* SDGMAC_GRF */ > > > +#define RK3576_GRF_GMAC_CON0 0X0020 > > > +#define RK3576_GRF_GMAC_CON1 0X0024 > > > + > > > +#define RK3576_GMAC_RMII_MODE GRF_BIT(3) > > > +#define RK3576_GMAC_RGMII_MODE GRF_CLR_BIT(3) > > > + > > > +#define RK3576_GMAC_CLK_SELET_IO GRF_BIT(7) > > > +#define RK3576_GMAC_CLK_SELET_CRU GRF_CLR_BIT(7) > > > > nit: typos _CLK_SELECT_ ... missing the C in select > > Ack So all points below are resolved, and with the C added Reviewed-by: Heiko Stuebner <heiko@sntech.de> > > > > + > > > +#define RK3576_GMAC_CLK_RMII_DIV2 GRF_BIT(5) > > > +#define RK3576_GMAC_CLK_RMII_DIV20 GRF_CLR_BIT(5) > > > > I think those are backwards > > The TRM says bit[5]=0: 25MHz (DIV2) and bit[5]=1: 2.5MHz (DIV20) > > > > I guess nobody also on Rockchip's side tested a RMII phy on those controllrs > > Can't be sure about that. An error in the TRM is not impossible either, as for > rk3588, it is also bit[5]=0: DIV20 and bit[5]=1: DIV2. I can switch them to > match the TRM though, we may never now. As David said, the TRM is wrong and the code is correct, so all good > > > > + > > > +#define RK3576_GMAC_CLK_RGMII_DIV1 \ > > > + (GRF_CLR_BIT(6) | GRF_CLR_BIT(5)) > > > +#define RK3576_GMAC_CLK_RGMII_DIV5 \ > > > + (GRF_BIT(6) | GRF_BIT(5)) > > > +#define RK3576_GMAC_CLK_RGMII_DIV50 \ > > > + (GRF_BIT(6) | GRF_CLR_BIT(5)) > > > + > > > > in contrast, these are correct and match the TRM > > > > > +#define RK3576_GMAC_CLK_RMII_GATE GRF_BIT(4) > > > +#define RK3576_GMAC_CLK_RMII_NOGATE GRF_CLR_BIT(4) > > > + > > > +static void rk3576_set_to_rgmii(struct rk_priv_data *bsp_priv, > > > + int tx_delay, int rx_delay) > > > +{ > > > + struct device *dev = &bsp_priv->pdev->dev; > > > + unsigned int offset_con; > > > + > > > + if (IS_ERR(bsp_priv->grf) || IS_ERR(bsp_priv->php_grf)) { > > > + dev_err(dev, "Missing rockchip,grf or rockchip,php_grf > property\n"); > > > + return; > > > + } > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > > + RK3576_GRF_GMAC_CON0; > > > + > > > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RGMII_MODE); > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_VCCIO0_1_3_IOC_CON4 : > > > + > RK3576_VCCIO0_1_3_IOC_CON2; > > > + > > > + /* m0 && m1 delay enabled */ > > > + regmap_write(bsp_priv->php_grf, offset_con, > > > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > > > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > > > + DELAY_ENABLE(RK3576, tx_delay, rx_delay)); > > > + > > > + /* m0 && m1 delay value */ > > > + regmap_write(bsp_priv->php_grf, offset_con, > > > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > > > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > > > + regmap_write(bsp_priv->php_grf, offset_con + 0x4, > > > + RK3576_GMAC_CLK_TX_DL_CFG(tx_delay) | > > > + RK3576_GMAC_CLK_RX_DL_CFG(rx_delay)); > > > +} > > > + > > > +static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv) > > > +{ > > > + struct device *dev = &bsp_priv->pdev->dev; > > > + unsigned int offset_con; > > > + > > > + if (IS_ERR(bsp_priv->php_grf)) { > > > + dev_err(dev, "%s: Missing rockchip,php_grf property\n", > __func__); > > > + return; > > > + } > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > > + RK3576_GRF_GMAC_CON0; > > > + > > > + regmap_write(bsp_priv->grf, offset_con, RK3576_GMAC_RMII_MODE); > > > +} > > > + > > > +static void rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv, int > > > speed) +{ > > > + struct device *dev = &bsp_priv->pdev->dev; > > > + unsigned int val = 0, offset_con; > > > + > > > + switch (speed) { > > > + case 10: > > > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > > + val = RK3576_GMAC_CLK_RMII_DIV20; > > > + else > > > + val = RK3576_GMAC_CLK_RGMII_DIV50; > > > > val = bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII ? > > RK3576_GMAC_CLK_RMII_DIV20 : > > RK3576_GMAC_CLK_RGMII_DIV50; > > perhaps? > > This way matches how it is written in rk3588_set_gmac_speed(). I find that > having similar code for similar functions helps reading and understanding it > better (although I agree that your suggestion looks better). > > I'd rather keep it like it is for now if that's ok. ok, there is not much difference between the two variants anyway. > > > + break; > > > + case 100: > > > + if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > > + val = RK3576_GMAC_CLK_RMII_DIV2; > > > + else > > > + val = RK3576_GMAC_CLK_RGMII_DIV5; > > > > same as above? > > > > > + break; > > > + case 1000: > > > + if (bsp_priv->phy_iface != PHY_INTERFACE_MODE_RMII) > > > + val = RK3576_GMAC_CLK_RGMII_DIV1; > > > + else > > > + goto err; > > > > if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) > > goto err; > > > > val = RK3576_GMAC_CLK_RGMII_DIV1; > > > > > + break; > > > + default: > > > + goto err; > > > + } > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > > + RK3576_GRF_GMAC_CON0; > > > + > > > + regmap_write(bsp_priv->grf, offset_con, val); > > > + > > > + return; > > > +err: > > > + dev_err(dev, "unknown speed value for GMAC speed=%d", speed); > > > +} > > > + > > > +static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, > > > bool input, + bool enable) > > > +{ > > > + unsigned int val = input ? RK3576_GMAC_CLK_SELET_IO : > > > + RK3576_GMAC_CLK_SELET_CRU; > > > + unsigned int offset_con; > > > + > > > + val |= enable ? RK3576_GMAC_CLK_RMII_NOGATE : > > > + RK3576_GMAC_CLK_RMII_GATE; > > > + > > > + offset_con = bsp_priv->id == 1 ? RK3576_GRF_GMAC_CON1 : > > > + RK3576_GRF_GMAC_CON0; > > > > nit: alignment of both looks like it could be nicer > > That's strange, the alignments looks good in vim and git diff. It also looks > nice on the archive: https://lore.kernel.org/linux-rockchip/ > 20240808170113.82775-3-detlev.casanova@collabora.com/ ok, probably just some display artifact here :-) ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-08-15 17:46 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-08 17:00 [PATCH v2 0/2] Add GMAC support for rk3576 Detlev Casanova
2024-08-08 17:00 ` Detlev Casanova
2024-08-08 17:00 ` [PATCH v2 1/2] dt-bindings: net: Add support for rk3576 dwmac Detlev Casanova
2024-08-08 17:00 ` Detlev Casanova
2024-08-08 17:00 ` [PATCH v2 2/2] ethernet: stmmac: dwmac-rk: Add GMAC support for RK3576 Detlev Casanova
2024-08-08 17:00 ` Detlev Casanova
2024-08-09 13:16 ` Heiko Stübner
2024-08-09 13:16 ` Heiko Stübner
2024-08-09 14:38 ` Detlev Casanova
2024-08-09 14:38 ` Detlev Casanova
[not found] ` <a73ff2ab-7e68-4d6b-b38d-37e7303af40d@rock-chips.com>
2024-08-15 16:35 ` Heiko Stübner
2024-08-15 16:35 ` Heiko Stübner
2024-08-15 16:37 ` Heiko Stübner
2024-08-15 16:37 ` Heiko Stübner
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.