Add ethernet driver for StarFive JH7110 SoC
Subsystems (4)
v2 cover Add ethernet driver for StarFive JH7110 SoC
This series adds ethernet support for the StarFive JH7110 RISC-V SoC. The series includes PHY and MAC drivers. The PHY model is YT8531 (from Motorcomm Inc), and the MAC version is dwmac-5.20 (from Synopsys DesignWare).
The implementation of the phy driver is ported from linux, but it has been adjusted for the u-boot framework.
The PHY and MAC driver has been tested on the StarFive VisionFive 2 1.2A and 1.3B boards and works normally.
For more information and support,you can visit RVspace wiki[1].
This patchset should be applied after the patchset [2].
[1] https://wiki.rvspace.org/
[2] https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/
v2:
- Reworded the phy driver. Added platform private data struct to save the configuration data read from dts.
- Reworded the MAC driver. Added platform private data struct to save the configuration data read from dts.
Previous versions:
v1 - https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/
Yanhong Wang (5):
net: phy: Add driver for Motorcomm yt8531 gigabit ethernet phy
net: dwc_eth_qos: Add StarFive ethernet driver glue layer
riscv: dts: jh7110: Add ethernet device tree nodes
riscv: dts: starfive: Add phy clock delay configuration for StarFive
VisionFive2 board
configs: starfive: Enable ethernet configuration for StarFive
VisionFive 2
.../jh7110-starfive-visionfive-2-v1.2a.dts | 13 + .../jh7110-starfive-visionfive-2-v1.3b.dts | 27 ++ .../dts/jh7110-starfive-visionfive-2.dtsi | 34 ++ arch/riscv/dts/jh7110.dtsi | 69 +++ configs/starfive_visionfive2_12a_defconfig | 12 +- configs/starfive_visionfive2_13b_defconfig | 12 +- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/dwc_eth_qos.c | 6 + drivers/net/dwc_eth_qos.h | 1 + drivers/net/dwc_eth_qos_starfive.c | 249 ++++++++++ drivers/net/phy/Kconfig | 6 + drivers/net/phy/Makefile | 1 + drivers/net/phy/motorcomm.c | 450 ++++++++++++++++++ drivers/net/phy/phy.c | 4 +- include/phy.h | 1 + 16 files changed, 890 insertions(+), 3 deletions(-) create mode 100644 drivers/net/dwc_eth_qos_starfive.c create mode 100644 drivers/net/phy/motorcomm.c
base-commit: d7c2e87a0b8025314ae7dd62a8add292b7524e0b
Signature · 1 line
2.17.1
PATCH v2 1/5 net: phy: Add driver for Motorcomm yt8531 gigabit ethernet phy
Add a driver for the motorcomm yt8531 gigabit ethernet phy. We have verified the driver on StarFive VisionFive2 board.
--- drivers/net/phy/Kconfig | 6 + drivers/net/phy/Makefile | 1 + drivers/net/phy/motorcomm.c | 450 ++++++++++++++++++++++++++++++++++++ drivers/net/phy/phy.c | 4 +- include/phy.h | 1 + 5 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 drivers/net/phy/motorcomm.c
drivers/net/phy/Kconfig +6 -0
@@ -212,6 +212,12 @@ config PHY_MICREL_KSZ8XXX endif # PHY_MICREL +config PHY_MOTORCOMM + tristate "Motorcomm PHYs" + help + Enables support for Motorcomm network PHYs. + Currently supports the YT8531 Gigabit Ethernet PHYs. + config PHY_MSCC bool "Microsemi Corp Ethernet PHYs support"
drivers/net/phy/Makefile +1 -0
@@ -23,6 +23,7 @@ obj-$(CONFIG_PHY_MARVELL) += marvell.o obj-$(CONFIG_PHY_MICREL_KSZ8XXX) += micrel_ksz8xxx.o obj-$(CONFIG_PHY_MICREL_KSZ90X1) += micrel_ksz90x1.o obj-$(CONFIG_PHY_MESON_GXL) += meson-gxl.o +obj-$(CONFIG_PHY_MOTORCOMM) += motorcomm.o obj-$(CONFIG_PHY_NATSEMI) += natsemi.o obj-$(CONFIG_PHY_NXP_C45_TJA11XX) += nxp-c45-tja11xx.o obj-$(CONFIG_PHY_NXP_TJA11XX) += nxp-tja11xx.o
drivers/net/phy/motorcomm.c new file +450 -0
450 lines not on this page · raw message
drivers/net/phy/phy.c +3 -1
@@ -570,6 +570,9 @@ int phy_init(void)#endif #ifdef CONFIG_PHY_XILINX_GMII2RGMII phy_xilinx_gmii2rgmii_init (); +#endif +#ifdef CONFIG_PHY_MOTORCOMM +phy_motorcomm_init ();#endif genphy_init ();
@@ -755,7 +758,6 @@ static struct phy_device *create_phy_by_mask(struct mii_dev *bus,while (phy_mask) {int addr =ffs (phy_mask) -1 ;int r =get_phy_id (bus, addr, devad, &phy_id); -/* * If the PHY ID is flat 0 we ignore it. There are C45 PHYs * that return all 0s for C22 reads (like Aquantia AQR112) and
include/phy.h +1 -0
@@ -344,6 +344,7 @@ int phy_mscc_init(void);int phy_fixed_init (void );int phy_ncsi_init (void );int phy_xilinx_gmii2rgmii_init (void ); +int phy_motorcomm_init (void );int board_phy_config (struct phy_device *phydev);int get_phy_id (struct mii_dev *bus,int addr,int devad,u32 *phy_id);
Signature · 1 line
2.17.1
Re: [PATCH v2 1/5] net: phy: Add driver for Motorcomm yt8531 gigabit ethernet phy
Quoted 534 lines · Yanhong Wang
Add a driver for the motorcomm yt8531 gigabit ethernet phy. We have verified the driver on StarFive VisionFive2 board.
Signed-off-by Yanhong Wang <[email protected]>--- drivers/net/phy/Kconfig | 6 + drivers/net/phy/Makefile | 1 + drivers/net/phy/motorcomm.c | 450 ++++++++++++++++++++++++++++++++++++ drivers/net/phy/phy.c | 4 +- include/phy.h | 1 + 5 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 drivers/net/phy/motorcomm.cdrivers/net/phy/Kconfig +6
-0@@ -212,6 +212,12 @@ config PHY_MICREL_KSZ8XXX endif # PHY_MICREL +config PHY_MOTORCOMM + tristate "Motorcomm PHYs" + help + Enables support for Motorcomm network PHYs. + Currently supports the YT8531 Gigabit Ethernet PHYs. + config PHY_MSCC bool "Microsemi Corp Ethernet PHYs support"drivers/net/phy/Makefile +1
-0@@ -23,6 +23,7 @@ obj-$(CONFIG_PHY_MARVELL) += marvell.o obj-$(CONFIG_PHY_MICREL_KSZ8XXX) += micrel_ksz8xxx.o obj-$(CONFIG_PHY_MICREL_KSZ90X1) += micrel_ksz90x1.o obj-$(CONFIG_PHY_MESON_GXL) += meson-gxl.o +obj-$(CONFIG_PHY_MOTORCOMM) += motorcomm.o obj-$(CONFIG_PHY_NATSEMI) += natsemi.o obj-$(CONFIG_PHY_NXP_C45_TJA11XX) += nxp-c45-tja11xx.o obj-$(CONFIG_PHY_NXP_TJA11XX) += nxp-tja11xx.odrivers/net/phy/motorcomm.c new file +450
-0@@ -0,0 +1,450 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Motorcomm 8531 PHY driver. +* +* Copyright (C) 2023 StarFive Technology Co., Ltd. +*/ + +#include <config.h> +#include <common.h> +#include <malloc.h> +#include <phy.h> +#include <linux/bitfield.h> + +#define PHY_ID_YT8531 0x4f51e91b +#define PHY_ID_MASK GENMASK(31, 0) + +/* Extended Register's Address Offset Register */ +#define YTPHY_PAGE_SELECT 0x1E + +/* Extended Register's Data Register */ +#define YTPHY_PAGE_DATA 0x1F + +#define YTPHY_SYNCE_CFG_REG 0xA012 + +#define YTPHY_DTS_OUTPUT_CLK_DIS 0 +#define YTPHY_DTS_OUTPUT_CLK_25M 25000000 +#define YTPHY_DTS_OUTPUT_CLK_125M 125000000 + +#define YT8531_SCR_SYNCE_ENABLE BIT(6) +/* 1b0 output 25m clock *default* +* 1b1 output 125m clock +*/ +#define YT8531_SCR_CLK_FRE_SEL_125M BIT(4) +#define YT8531_SCR_CLK_SRC_MASK GENMASK(3, 1) +#define YT8531_SCR_CLK_SRC_PLL_125M 0 +#define YT8531_SCR_CLK_SRC_UTP_RX 1 +#define YT8531_SCR_CLK_SRC_SDS_RX 2 +#define YT8531_SCR_CLK_SRC_CLOCK_FROM_DIGITAL 3 +#define YT8531_SCR_CLK_SRC_REF_25M 4 +#define YT8531_SCR_CLK_SRC_SSC_25M 5 + +/* 1b0 use original tx_clk_rgmii *default* +* 1b1 use inverted tx_clk_rgmii. +*/ +#define YT8531_RC1R_TX_CLK_SEL_INVERTED BIT(14) +#define YT8531_RC1R_RX_DELAY_MASK GENMASK(13, 10) +#define YT8531_RC1R_FE_TX_DELAY_MASK GENMASK(7, 4) +#define YT8531_RC1R_GE_TX_DELAY_MASK GENMASK(3, 0) +#define YT8531_RC1R_RGMII_0_000_NS 0 +#define YT8531_RC1R_RGMII_0_150_NS 1 +#define YT8531_RC1R_RGMII_0_300_NS 2 +#define YT8531_RC1R_RGMII_0_450_NS 3 +#define YT8531_RC1R_RGMII_0_600_NS 4 +#define YT8531_RC1R_RGMII_0_750_NS 5 +#define YT8531_RC1R_RGMII_0_900_NS 6 +#define YT8531_RC1R_RGMII_1_050_NS 7 +#define YT8531_RC1R_RGMII_1_200_NS 8 +#define YT8531_RC1R_RGMII_1_350_NS 9 +#define YT8531_RC1R_RGMII_1_500_NS 10 +#define YT8531_RC1R_RGMII_1_650_NS 11 +#define YT8531_RC1R_RGMII_1_800_NS 12 +#define YT8531_RC1R_RGMII_1_950_NS 13 +#define YT8531_RC1R_RGMII_2_100_NS 14 +#define YT8531_RC1R_RGMII_2_250_NS 15 + +/* Phy gmii clock gating Register */ +#define YT8531_CLOCK_GATING_REG 0xC +#define YT8531_CGR_RX_CLK_EN BIT(12) + +/* Specific Status Register */ +#define YTPHY_SPECIFIC_STATUS_REG 0x11 +#define YTPHY_DUPLEX_MASK BIT(13) +#define YTPHY_DUPLEX_SHIFT 13 +#define YTPHY_SPEED_MODE_MASK GENMASK(15, 14) +#define YTPHY_SPEED_MODE_SHIFT 14 + +#define YT8531_EXTREG_SLEEP_CONTROL1_REG 0x27 +#define YT8531_ESC1R_SLEEP_SW BIT(15) +#define YT8531_ESC1R_PLLON_SLP BIT(14) + +#define YT8531_RGMII_CONFIG1_REG 0xA003 + +#define YT8531_CHIP_CONFIG_REG 0xA001 +#define YT8531_CCR_SW_RST BIT(15) +/* 1b0 disable 1.9ns rxc clock delay *default* +* 1b1 enable 1.9ns rxc clock delay +*/ +#define YT8531_CCR_RXC_DLY_EN BIT(8) +#define YT8531_CCR_RXC_DLY_1_900_NS 1900 + +/* bits in struct ytphy_plat_priv->flag */ +#define TX_CLK_ADJ_ENABLED BIT(0) +#define AUTO_SLEEP_DISABLED BIT(1) +#define KEEP_PLL_ENABLED BIT(2) +#define TX_CLK_10_INVERTED BIT(3) +#define TX_CLK_100_INVERTED BIT(4) +#define TX_CLK_1000_INVERTED BIT(5) + +struct ytphy_plat_priv { +u32 rx_delay_ps; +u32 tx_delay_ps; +u32 clk_out_frequency; +u32 flag; +}; + +/** +* struct ytphy_cfg_reg_map - map a config value to a register value +* @cfg: value in device configuration +* @reg: value in the register +*/ +struct ytphy_cfg_reg_map { +u32 cfg; +u32 reg; +}; + +static const struct ytphy_cfg_reg_map ytphy_rgmii_delays[] = { +/* for tx delay / rx delay with YT8531_CCR_RXC_DLY_EN is not set. */ + {0 ,YT8531_RC1R_RGMII_0_000_NS }, + {150 ,YT8531_RC1R_RGMII_0_150_NS }, + {300 ,YT8531_RC1R_RGMII_0_300_NS }, + {450 ,YT8531_RC1R_RGMII_0_450_NS }, + {600 ,YT8531_RC1R_RGMII_0_600_NS }, + {750 ,YT8531_RC1R_RGMII_0_750_NS }, + {900 ,YT8531_RC1R_RGMII_0_900_NS }, + {1050 ,YT8531_RC1R_RGMII_1_050_NS }, + {1200 ,YT8531_RC1R_RGMII_1_200_NS }, + {1350 ,YT8531_RC1R_RGMII_1_350_NS }, + {1500 ,YT8531_RC1R_RGMII_1_500_NS }, + {1650 ,YT8531_RC1R_RGMII_1_650_NS }, + {1800 ,YT8531_RC1R_RGMII_1_800_NS }, + {1950 ,YT8531_RC1R_RGMII_1_950_NS },/* default tx/rx delay */ + {2100 ,YT8531_RC1R_RGMII_2_100_NS }, + {2250 ,YT8531_RC1R_RGMII_2_250_NS }, + +/* only for rx delay with YT8531_CCR_RXC_DLY_EN is set. */ + {0 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_0_000_NS }, + {150 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_0_150_NS }, + {300 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_0_300_NS }, + {450 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_0_450_NS }, + {600 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_0_600_NS }, + {750 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_0_750_NS }, + {900 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_0_900_NS }, + {1050 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_1_050_NS }, + {1200 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_1_200_NS }, + {1350 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_1_350_NS }, + {1500 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_1_500_NS }, + {1650 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_1_650_NS }, + {1800 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_1_800_NS }, + {1950 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_1_950_NS }, + {2100 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_2_100_NS }, + {2250 +YT8531_CCR_RXC_DLY_1_900_NS ,YT8531_RC1R_RGMII_2_250_NS } +}; + +static u32 ytphy_get_delay_reg_value (struct phy_device *phydev, +u32 val, +u16 *rxc_dly_en) +{ +int tb_size =ARRAY_SIZE (ytphy_rgmii_delays); +int tb_size_half = tb_size /2 ; +int i; + +/* when rxc_dly_en is NULL, it is get the delay for tx, only half of +* tb_size is valid. +*/ +if (!rxc_dly_en) + tb_size = tb_size_half; + +for (i =0 ; i < tb_size; i++) { +if (ytphy_rgmii_delays[i].cfg == val) { +if (rxc_dly_en && i < tb_size_half) + *rxc_dly_en =0 ; +return ytphy_rgmii_delays[i].reg; + } + } + +pr_warn ("Unsupported value %d, using default (%u)\n" , + val,YT8531_RC1R_RGMII_1_950_NS ); + +/* when rxc_dly_en is not NULL, it is get the delay for rx. +* The rx default in dts and ytphy_rgmii_clk_delay_config is 1950 ps, +* so YT8531_CCR_RXC_DLY_EN should not be set. +*/ +if (rxc_dly_en) + *rxc_dly_en =0 ; + +return YT8531_RC1R_RGMII_1_950_NS ; +} + +static int ytphy_modify_ext (struct phy_device *phydev,u16 regnum,u16 mask, +u16 set) +{ +int ret; + + ret =phy_write (phydev,MDIO_DEVAD_NONE ,YTPHY_PAGE_SELECT , regnum); +if (ret <0 ) +return ret; + +return phy_modify (phydev,MDIO_DEVAD_NONE ,YTPHY_PAGE_DATA , mask, set); +} + +static int ytphy_rgmii_clk_delay_config (struct phy_device *phydev) +{ +struct ytphy_plat_priv *priv = phydev->priv; +u16 rxc_dly_en =YT8531_CCR_RXC_DLY_EN ; +u32 rx_reg, tx_reg; +u16 mask, val =0 ; +int ret; + + rx_reg =ytphy_get_delay_reg_value (phydev, priv->rx_delay_ps, + &rxc_dly_en); + tx_reg =ytphy_get_delay_reg_value (phydev, priv->tx_delay_ps, +NULL ); + +switch (phydev->interface) { +case PHY_INTERFACE_MODE_RGMII : + rxc_dly_en =0 ; +break ; +case PHY_INTERFACE_MODE_RGMII_RXID : + val |=FIELD_PREP (YT8531_RC1R_RX_DELAY_MASK , rx_reg); +break ; +case PHY_INTERFACE_MODE_RGMII_TXID : + rxc_dly_en =0 ; + val |=FIELD_PREP (YT8531_RC1R_GE_TX_DELAY_MASK , tx_reg); +break ; +case PHY_INTERFACE_MODE_RGMII_ID : + val |=FIELD_PREP (YT8531_RC1R_RX_DELAY_MASK , rx_reg) | +FIELD_PREP (YT8531_RC1R_GE_TX_DELAY_MASK , tx_reg); +break ; +default :/* do not support other modes */ +return -EOPNOTSUPP ; + } + + ret =ytphy_modify_ext (phydev,YT8531_CHIP_CONFIG_REG , +YT8531_CCR_RXC_DLY_EN , rxc_dly_en); +if (ret <0 ) +return ret; + +/* Generally, it is not necessary to adjust YT8531_RC1R_FE_TX_DELAY */ + mask =YT8531_RC1R_RX_DELAY_MASK |YT8531_RC1R_GE_TX_DELAY_MASK ; +return ytphy_modify_ext (phydev,YT8531_RGMII_CONFIG1_REG , mask, val); +} + +static int yt8531_parse_status (struct phy_device *phydev) +{ +int val; +int speed, speed_mode; + + val =phy_read (phydev,MDIO_DEVAD_NONE ,YTPHY_SPECIFIC_STATUS_REG ); +if (val <0 ) +return val; + + speed_mode = (val &YTPHY_SPEED_MODE_MASK ) >>YTPHY_SPEED_MODE_SHIFT ; +switch (speed_mode) { +case 2 : + speed =SPEED_1000 ; +break ; +case 1 : + speed =SPEED_100 ; +break ; +default : + speed =SPEED_10 ; +break ; + } + + phydev->speed = speed; + phydev->duplex = (val &YTPHY_DUPLEX_MASK ) >>YTPHY_DUPLEX_SHIFT ; + +return 0 ; +} + +static int yt8531_startup (struct phy_device *phydev) +{ +struct ytphy_plat_priv *priv = phydev->priv; +u16 val =0 ; +int ret; + + ret =genphy_update_link (phydev); +if (ret) +return ret; + + ret =yt8531_parse_status (phydev); +if (ret) +return ret; + +if (phydev->speed <0 ) +return -EINVAL ; + +if (!(priv->flag &TX_CLK_ADJ_ENABLED )) +return 0 ; + +switch (phydev->speed) { +case SPEED_1000 : +if (priv->flag &TX_CLK_1000_INVERTED ) + val =YT8531_RC1R_TX_CLK_SEL_INVERTED ; +break ; +case SPEED_100 : +if (priv->flag &TX_CLK_100_INVERTED ) + val =YT8531_RC1R_TX_CLK_SEL_INVERTED ; +break ; +case SPEED_10 : +if (priv->flag &TX_CLK_10_INVERTED ) + val =YT8531_RC1R_TX_CLK_SEL_INVERTED ; +break ; +default : +printf ("UNKNOWN SPEED\n" ); +return -EINVAL ; + } + + ret =ytphy_modify_ext (phydev,YT8531_RGMII_CONFIG1_REG , +YT8531_RC1R_TX_CLK_SEL_INVERTED , val); +if (ret <0 ) +pr_warn ("Modify TX_CLK_SEL err:%d\n" , ret); + +return 0 ; +} + +static void ytphy_dt_parse (struct phy_device *phydev) +{ +struct ytphy_plat_priv *priv = phydev->priv; +int ret; + + ret =ofnode_read_u32 (phydev->node,"motorcomm,clk-out-frequency-hz" , + &priv->clk_out_frequency); +if (ret <0 ) + priv->clk_out_frequency =YTPHY_DTS_OUTPUT_CLK_DIS ; + + ret =ofnode_read_u32 (phydev->node,"rx-internal-delay-ps" , + &priv->rx_delay_ps); +if (ret <0 ) + priv->rx_delay_ps =YT8531_RC1R_RGMII_1_950_NS ; + + ret =ofnode_read_u32 (phydev->node,"tx-internal-delay-ps" , + &priv->tx_delay_ps); +if (ret <0 ) + priv->tx_delay_ps =YT8531_RC1R_RGMII_1_950_NS ; + +if (ofnode_read_bool (phydev->node,"motorcomm,auto-sleep-disabled" )) + priv->flag |=AUTO_SLEEP_DISABLED ; + +if (ofnode_read_bool (phydev->node,"motorcomm,keep-pll-enabled" )) + priv->flag |=KEEP_PLL_ENABLED ; + +if (ofnode_read_bool (phydev->node,"motorcomm,tx-clk-adj-enabled" )) + priv->flag |=TX_CLK_ADJ_ENABLED ; + +if (ofnode_read_bool (phydev->node,"motorcomm,tx-clk-10-inverted" )) + priv->flag |=TX_CLK_10_INVERTED ; + +if (ofnode_read_bool (phydev->node,"motorcomm,tx-clk-100-inverted" )) + priv->flag |=TX_CLK_100_INVERTED ; + +if (ofnode_read_bool (phydev->node,"motorcomm,tx-clk-1000-inverted" )) + priv->flag |=TX_CLK_1000_INVERTED ; +} + +static int yt8531_config (struct phy_device *phydev) +{ +struct ytphy_plat_priv *priv = phydev->priv; +u16 mask, val; +int ret; + + ret =genphy_config_aneg (phydev); +if (ret <0 ) +return ret; + +ytphy_dt_parse (phydev); +switch (priv->clk_out_frequency) { +case YTPHY_DTS_OUTPUT_CLK_DIS : + mask =YT8531_SCR_SYNCE_ENABLE ; + val =0 ; +break ; +case YTPHY_DTS_OUTPUT_CLK_25M : + mask =YT8531_SCR_SYNCE_ENABLE |YT8531_SCR_CLK_SRC_MASK | +YT8531_SCR_CLK_FRE_SEL_125M ; + val =YT8531_SCR_SYNCE_ENABLE | +FIELD_PREP (YT8531_SCR_CLK_SRC_MASK , +YT8531_SCR_CLK_SRC_REF_25M ); +break ; +case YTPHY_DTS_OUTPUT_CLK_125M : + mask =YT8531_SCR_SYNCE_ENABLE |YT8531_SCR_CLK_SRC_MASK | +YT8531_SCR_CLK_FRE_SEL_125M ; + val =YT8531_SCR_SYNCE_ENABLE |YT8531_SCR_CLK_FRE_SEL_125M | +FIELD_PREP (YT8531_SCR_CLK_SRC_MASK , +YT8531_SCR_CLK_SRC_PLL_125M ); +break ; +default : +pr_warn ("Freq err:%u\n" , priv->clk_out_frequency); +return -EINVAL ; + } + + ret =ytphy_modify_ext (phydev,YTPHY_SYNCE_CFG_REG , mask, + val); +if (ret <0 ) +return ret; + + ret =ytphy_rgmii_clk_delay_config (phydev); +if (ret <0 ) +return ret; + +if (priv->flag &AUTO_SLEEP_DISABLED ) { +/* disable auto sleep */ + ret =ytphy_modify_ext (phydev, +YT8531_EXTREG_SLEEP_CONTROL1_REG , +YT8531_ESC1R_SLEEP_SW ,0 ); +if (ret <0 ) +return ret; + } + +if (priv->flag &KEEP_PLL_ENABLED ) { +/* enable RXC clock when no wire plug */ + ret =ytphy_modify_ext (phydev, +YT8531_CLOCK_GATING_REG , +YT8531_CGR_RX_CLK_EN ,0 ); +if (ret <0 ) +return ret; + } + +return 0 ; +} + +static int yt8531_probe (struct phy_device *phydev) +{ +struct ytphy_plat_priv *priv; + + priv =calloc (1 ,sizeof (struct ytphy_plat_priv )); +if (!priv) +return -ENOMEM ; + + phydev->priv = priv; + +return 0 ; +} + +static struct phy_driver motorcomm8531_driver = { + .name ="YT8531 Gigabit Ethernet" , + .uid =PHY_ID_YT8531 , + .mask =PHY_ID_MASK , + .features =PHY_GBIT_FEATURES , + .probe = &yt8531_probe, + .config = &yt8531_config, + .startup = &yt8531_startup, + .shutdown = &genphy_shutdown, +}; + +int phy_motorcomm_init (void ) +{ +phy_register (&motorcomm8531_driver); + +return 0 ; +}drivers/net/phy/phy.c +3
-1@@ -570,6 +570,9 @@ int phy_init(void)#endif #ifdef CONFIG_PHY_XILINX_GMII2RGMII phy_xilinx_gmii2rgmii_init (); +#endif +#ifdef CONFIG_PHY_MOTORCOMM +phy_motorcomm_init ();#endif genphy_init ();@@ -755,7 +758,6 @@ static struct phy_device *create_phy_by_mask(struct mii_dev *bus,while (phy_mask) {int addr =ffs (phy_mask) -1 ;int r =get_phy_id (bus, addr, devad, &phy_id); -/* * If the PHY ID is flat 0 we ignore it. There are C45 PHYs * that return all 0s for C22 reads (like Aquantia AQR112) and include/phy.h +1
-1@@ -344,6 +344,7 @@ int phy_mscc_init(void);int phy_fixed_init (void );int phy_ncsi_init (void );int phy_xilinx_gmii2rgmii_init (void ); +int phy_motorcomm_init (void );int board_phy_config (struct phy_device *phydev);int get_phy_id (struct mii_dev *bus,int addr,int devad,u32 *phy_id); --
Quoted 2 lines
2.17.1
PATCH v2 2/5 net: dwc_eth_qos: Add StarFive ethernet driver glue layer
In reply to Yanhong WangThe StarFive ETHQOS hardware has its own clock and reset,so add a corresponding glue driver to configure them.
--- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/dwc_eth_qos.c | 6 + drivers/net/dwc_eth_qos.h | 1 + drivers/net/dwc_eth_qos_starfive.c | 249 +++++++++++++++++++++++++++++ 5 files changed, 264 insertions(+) create mode 100644 drivers/net/dwc_eth_qos_starfive.c
drivers/net/Kconfig +7 -0
@@ -249,6 +249,13 @@ config DWC_ETH_QOS_QCOM The Synopsys Designware Ethernet QOS IP block with specific configuration used in Qcom QCS404 SoC. +config DWC_ETH_QOS_STARFIVE + bool "Synopsys DWC Ethernet QOS device support for STARFIVE" + depends on DWC_ETH_QOS + help + The Synopsys Designware Ethernet QOS IP block with specific + configuration used in STARFIVE JH7110 soc. + config E1000 bool "Intel PRO/1000 Gigabit Ethernet support" depends on PCI
drivers/net/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-$(CONFIG_DSA_SANDBOX) += dsa_sandbox.o obj-$(CONFIG_DWC_ETH_QOS) += dwc_eth_qos.o obj-$(CONFIG_DWC_ETH_QOS_IMX) += dwc_eth_qos_imx.o obj-$(CONFIG_DWC_ETH_QOS_QCOM) += dwc_eth_qos_qcom.o +obj-$(CONFIG_DWC_ETH_QOS_STARFIVE) += dwc_eth_qos_starfive.o obj-$(CONFIG_E1000) += e1000.o obj-$(CONFIG_E1000_SPI) += e1000_spi.o obj-$(CONFIG_EEPRO100) += eepro100.o
drivers/net/dwc_eth_qos.c +6 -0
@@ -1718,6 +1718,12 @@ static const struct udevice_id eqos_ids[] = { .data = (ulong)&eqos_qcom_config },#endif +#if IS_ENABLED (CONFIG_DWC_ETH_QOS_STARFIVE ) + { + .compatible = "starfive,jh7110-dwmac", + .data = (ulong)&eqos_jh7110_config + }, +#endif { } };
drivers/net/dwc_eth_qos.h +1 -0
@@ -289,3 +289,4 @@ int eqos_null_ops(struct udevice *dev);extern struct eqos_config eqos_imx_config;extern struct eqos_config eqos_qcom_config; +extern struct eqos_config eqos_jh7110_config;
drivers/net/dwc_eth_qos_starfive.c new file +249 -0
249 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v2 2/5] net: dwc_eth_qos: Add StarFive ethernet driver glue layer
Hi Yanhong,
Quoted 14 lines · Yanhong Wang
The StarFive ETHQOS hardware has its own clock and reset,so add a corresponding glue driver to configure them.
Signed-off-by Yanhong Wang <[email protected]>--- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/dwc_eth_qos.c | 6 + drivers/net/dwc_eth_qos.h | 1 + drivers/net/dwc_eth_qos_starfive.c | 249 +++++++++++++++++++++++++++++ 5 files changed, 264 insertions(+) create mode 100644 drivers/net/dwc_eth_qos_starfive.c
[..]
Quoted 7 lines
drivers/net/dwc_eth_qos_starfive.c new file +7
-0+static struct eqos_ops eqos_jh7110_ops = { + .eqos_inval_desc = eqos_inval_desc_generic, + .eqos_flush_desc = eqos_flush_desc_generic, + .eqos_inval_buffer = eqos_inval_buffer_generic, + .eqos_flush_buffer = eqos_flush_buffer_generic, + .eqos_probe_resources = eqos_probe_resources_jh7110, + .eqos_remove_resources = eqos_remove_resources_jh7110,
drivers/net/dwc_eth_qos_starfive.c line 231
Quoted 10 lines
drivers/net/dwc_eth_qos_starfive.c new file +10
-0+ .eqos_stop_resets = eqos_stop_resets_jh7110, + .eqos_start_resets = eqos_start_resets_jh7110, + .eqos_stop_clks = eqos_stop_clks_jh7110, + .eqos_start_clks = eqos_start_clks_jh7110, + .eqos_calibrate_pads = eqos_null_ops, + .eqos_disable_calibration = eqos_null_ops, + .eqos_set_tx_clk_speed = eqos_set_tx_clk_speed_jh7110, + .eqos_get_enetaddr = eqos_null_ops, + .eqos_get_tick_clk_rate = eqos_get_tick_clk_rate_jh7110 +};
What is eqos_ops? Why is this layer needed in U-Boot?
Can you not use driver model directly?
Regards,
Simon
Re: [PATCH v2 2/5] net: dwc_eth_qos: Add StarFive ethernet driver glue layer
Quoted 32 lines · Simon Glass
Hi Yanhong,
Quoted 14 lines · Yanhong Wang
The StarFive ETHQOS hardware has its own clock and reset,so add a corresponding glue driver to configure them.
Signed-off-by Yanhong Wang <[email protected]>--- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/dwc_eth_qos.c | 6 + drivers/net/dwc_eth_qos.h | 1 + drivers/net/dwc_eth_qos_starfive.c | 249 +++++++++++++++++++++++++++++ 5 files changed, 264 insertions(+) create mode 100644 drivers/net/dwc_eth_qos_starfive.c[..]
Quoted 11 lines
drivers/net/dwc_eth_qos_starfive.c new file +11
-0+static struct eqos_ops eqos_jh7110_ops = { + .eqos_inval_desc = eqos_inval_desc_generic, + .eqos_flush_desc = eqos_flush_desc_generic, + .eqos_inval_buffer = eqos_inval_buffer_generic, + .eqos_flush_buffer = eqos_flush_buffer_generic, + .eqos_probe_resources = eqos_probe_resources_jh7110, + .eqos_remove_resources = eqos_remove_resources_jh7110, + .eqos_stop_resets = eqos_stop_resets_jh7110, + .eqos_start_resets = eqos_start_resets_jh7110, + .eqos_stop_clks = eqos_stop_clks_jh7110, + .eqos_start_clks = eqos_start_clks_jh7110,
Quoted 9 lines
drivers/net/dwc_eth_qos_starfive.c line 231
Quoted 6 lines
drivers/net/dwc_eth_qos_starfive.c new file +6
-0+ .eqos_calibrate_pads = eqos_null_ops, + .eqos_disable_calibration = eqos_null_ops, + .eqos_set_tx_clk_speed = eqos_set_tx_clk_speed_jh7110, + .eqos_get_enetaddr = eqos_null_ops, + .eqos_get_tick_clk_rate = eqos_get_tick_clk_rate_jh7110 +};What is
eqos_ops? Why is this layer needed in U-Boot?
The JH7110 uses the Synopsys Designware Ethernet QOS (Quality Of Service) IP block, the driver implementation uses 'dwc_eth_qos.c,' but there are some differences in clock and reset, so there is a corresponding glue layer. This glue layer references the implementation of 'dwc_eth_qos_imx.c' and 'dwc_eth_qos_qcom.c'.
Quoted 2 lines
Can you not use driver model directly?
If you use the driver model directly, many of the implementations are the same
as "dwc_eth_qos.c", so to avoid duplicate implementations, just add the glue layer.
Quoted 2 lines
Regards,
Simon
PATCH v2 3/5 riscv: dts: jh7110: Add ethernet device tree nodes
In reply to Yanhong WangAdd ethernet device tree node to support StarFive ethernet driver for the JH7110 RISC-V SoC.
--- arch/riscv/dts/jh7110.dtsi | 69 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+)
arch/riscv/dts/jh7110.dtsi +69 -0
@@ -235,6 +235,13 @@ #clock-cells = <0>; }; + stmmac_axi_setup: stmmac-axi-config { + snps,lpi_en; + snps,wr_osr_lmt = <4>; + snps,rd_osr_lmt = <4>; + snps,blen = <256 128 64 32 0 0 0>; + }; + soc { compatible = "simple-bus"; interrupt-parent = <&plic>;
@@ -539,6 +546,68 @@ status = "disabled"; }; + gmac0: ethernet@16030000 { + compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20"; + reg = <0x0 0x16030000 0x0 0x10000>; + clocks = <&aoncrg JH7110_AONCLK_GMAC0_AXI>, + <&aoncrg JH7110_AONCLK_GMAC0_AHB>, + <&syscrg JH7110_SYSCLK_GMAC0_PTP>, + <&aoncrg JH7110_AONCLK_GMAC0_TX_INV>, + <&syscrg JH7110_SYSCLK_GMAC0_GTXC>; + clock-names = "stmmaceth", "pclk", "ptp_ref", + "tx", "gtx"; + resets = <&aoncrg JH7110_AONRST_GMAC0_AXI>, + <&aoncrg JH7110_AONRST_GMAC0_AHB>; + reset-names = "stmmaceth", "ahb"; + interrupts = <7>, <6>, <5>; + interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; + snps,multicast-filter-bins = <64>; + snps,perfect-filter-entries = <8>; + rx-fifo-depth = <2048>; + tx-fifo-depth = <2048>; + snps,fixed-burst; + snps,no-pbl-x8; + snps,force_thresh_dma_mode; + snps,axi-config = <&stmmac_axi_setup>; + snps,tso; + snps,en-tx-lpi-clockgating; + snps,txpbl = <16>; + snps,rxpbl = <16>; + starfive,syscon = <&aon_syscon 0xc 0x12>; + status = "disabled"; + }; + + gmac1: ethernet@16040000 { + compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20"; + reg = <0x0 0x16040000 0x0 0x10000>; + clocks = <&syscrg JH7110_SYSCLK_GMAC1_AXI>, + <&syscrg JH7110_SYSCLK_GMAC1_AHB>, + <&syscrg JH7110_SYSCLK_GMAC1_PTP>, + <&syscrg JH7110_SYSCLK_GMAC1_TX_INV>, + <&syscrg JH7110_SYSCLK_GMAC1_GTXC>; + clock-names = "stmmaceth", "pclk", "ptp_ref", + "tx", "gtx"; + resets = <&syscrg JH7110_SYSRST_GMAC1_AXI>, + <&syscrg JH7110_SYSRST_GMAC1_AHB>; + reset-names = "stmmaceth", "ahb"; + interrupts = <78>, <77>, <76>; + interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; + snps,multicast-filter-bins = <64>; + snps,perfect-filter-entries = <8>; + rx-fifo-depth = <2048>; + tx-fifo-depth = <2048>; + snps,fixed-burst; + snps,no-pbl-x8; + snps,force_thresh_dma_mode; + snps,axi-config = <&stmmac_axi_setup>; + snps,tso; + snps,en-tx-lpi-clockgating; + snps,txpbl = <16>; + snps,rxpbl = <16>; + starfive,syscon = <&sys_syscon 0x90 0x2>; + status = "disabled"; + }; + aoncrg: clock-controller@17000000 { compatible = "starfive,jh7110-aoncrg"; reg = <0x0 0x17000000 0x0 0x10000>;
Signature · 1 line
2.17.1
PATCH v2 4/5 riscv: dts: starfive: Add phy clock delay configuration for StarFive VisionFive2 board
In reply to Yanhong WangThe StarFive VisionFive2 board include 1.2A and 1.3B version.
v1.3B uses motorcomm YT8531(rgmii-id phy) x2, phy clock need delay and inverse configurations.
v1.2A gmac0 uses motorcomm YT8531(rgmii-id) PHY, and needs phy clock delay configurations.
v1.2A gmac1 uses motorcomm YT8512(rmii) PHY, and needs to switch rx and tx to external clock sources.
--- .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 +++++++ .../jh7110-starfive-visionfive-2-v1.3b.dts | 27 +++++++++++++++ .../dts/jh7110-starfive-visionfive-2.dtsi | 34 +++++++++++++++++++ 3 files changed, 74 insertions(+)
arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a.dts +13 -0
@@ -10,3 +10,16 @@ model = "StarFive VisionFive 2 v1.2A"; compatible = "starfive,visionfive-2-v1.2a", "starfive,jh7110"; }; + +&gmac1 { + phy-mode = "rmii"; + assigned-clocks = <&syscrg JH7110_SYSCLK_GMAC1_TX>, + <&syscrg JH7110_SYSCLK_GMAC1_RX>; + assigned-clock-parents = <&syscrg JH7110_SYSCLK_GMAC1_RMII_RTX>, + <&syscrg JH7110_SYSCLK_GMAC1_RMII_RTX>; +}; + +&phy0 { + rx-internal-delay-ps = <1900>; + tx-internal-delay-ps = <1350>; +};
arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b.dts +27 -0
@@ -10,3 +10,30 @@ model = "StarFive VisionFive 2 v1.3B"; compatible = "starfive,visionfive-2-v1.3b", "starfive,jh7110"; }; + +&gmac0 { + starfive,tx-use-rgmii-clk; + assigned-clocks = <&aoncrg JH7110_AONCLK_GMAC0_TX>; + assigned-clock-parents = <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>; +}; + +&gmac1 { + starfive,tx-use-rgmii-clk; + assigned-clocks = <&syscrg JH7110_SYSCLK_GMAC1_TX>; + assigned-clock-parents = <&syscrg JH7110_SYSCLK_GMAC1_RMII_RTX>; +}; + +&phy0 { + motorcomm,tx-clk-adj-enabled; + motorcomm,tx-clk-100-inverted; + motorcomm,tx-clk-1000-inverted; + rx-internal-delay-ps = <1900>; + tx-internal-delay-ps = <1500>; +}; + +&phy1 { + motorcomm,tx-clk-adj-enabled; + motorcomm,tx-clk-100-inverted; + rx-internal-delay-ps = <0>; + tx-internal-delay-ps = <0>; +};
arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi +34 -0
@@ -17,6 +17,8 @@ i2c2 = &i2c2; i2c5 = &i2c5; i2c6 = &i2c6; + ethernet0 = &gmac0; + ethernet1 = &gmac1; }; chosen {
@@ -317,3 +319,35 @@ assigned-clock-parents = <&osc>; assigned-clock-rates = <0>; }; + +&gmac0 { + phy-handle = <&phy0>; + phy-mode = "rgmii-id"; + status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + + phy0: ethernet-phy@0 { + reg = <0>; + }; + }; +}; + +&gmac1 { + phy-handle = <&phy1>; + phy-mode = "rgmii-id"; + status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + + phy1: ethernet-phy@1 { + reg = <0>; + }; + }; +};
Signature · 1 line
2.17.1
PATCH v2 5/5 configs: starfive: Enable ethernet configuration for StarFive VisionFive 2
In reply to Yanhong WangEnable DWC_ETH_QOS and PHY_MOTORCOMM configuration to support ethernet function for StarFive VisionFive 2 board,including versions 1.2A and 1.3B.
--- configs/starfive_visionfive2_12a_defconfig | 12 +++++++++++- configs/starfive_visionfive2_13b_defconfig | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-)
configs/starfive_visionfive2_12a_defconfig +11 -1
@@ -21,8 +21,8 @@ CONFIG_SPL_OPENSBI_LOAD_ADDR=0x40000000 CONFIG_ARCH_RV64I=y CONFIG_CMODEL_MEDANY=y CONFIG_RISCV_SMODE=y -CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_QSPI_BOOT=y CONFIG_SD_BOOT=y CONFIG_USE_BOOTARGS=y
@@ -52,6 +52,9 @@ CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_MEMINFO=y CONFIG_CMD_TFTPPUT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_JH7110=y
@@ -65,6 +68,13 @@ CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_ISSI=y CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_PHY_MOTORCOMM=y +CONFIG_DM_MDIO=y +CONFIG_DM_ETH_PHY=y +CONFIG_DWC_ETH_QOS=y +CONFIG_DWC_ETH_QOS_STARFIVE=y +CONFIG_RGMII=y +CONFIG_RMII=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_SPL_PINCTRL=y
configs/starfive_visionfive2_13b_defconfig +11 -1
@@ -21,8 +21,8 @@ CONFIG_SPL_OPENSBI_LOAD_ADDR=0x40000000 CONFIG_ARCH_RV64I=y CONFIG_CMODEL_MEDANY=y CONFIG_RISCV_SMODE=y -CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y +CONFIG_DISTRO_DEFAULTS=y CONFIG_QSPI_BOOT=y CONFIG_SD_BOOT=y CONFIG_USE_BOOTARGS=y
@@ -52,6 +52,9 @@ CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_MEMINFO=y CONFIG_CMD_TFTPPUT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_JH7110=y
@@ -65,6 +68,13 @@ CONFIG_SPI_FLASH_EON=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_ISSI=y CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_PHY_MOTORCOMM=y +CONFIG_DM_MDIO=y +CONFIG_DM_ETH_PHY=y +CONFIG_DWC_ETH_QOS=y +CONFIG_DWC_ETH_QOS_STARFIVE=y +CONFIG_RGMII=y +CONFIG_RMII=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_SPL_PINCTRL=y
Signature · 1 line
2.17.1