MediaTek Ethernet Patches on MT8195
Subsystems (6)
v2 cover MediaTek Ethernet Patches on MT8195
Changes in v2:
1. fix errors/warnings in mediatek-dwmac.yaml with upgraded dtschema tools
This series include 5 patches:
1. add platform level clocks management for dwmac-mediatek
2. resue more common features defined in stmmac_platform.c
3. add ethernet entry for mt8195
4. convert mediatek-dwmac.txt to mediatek-dwmac.yaml
5. add ethernet device node for mt8195
Biao Huang (5):
net: stmmac: dwmac-mediatek: add platform level clocks management
net: stmmac: dwmac-mediatek: Reuse more common features
net: stmmac: dwmac-mediatek: add support for mt8195
dt-bindings: net: dwmac: Convert mediatek-dwmac to DT schema
arm64: dts: mt8195: add ethernet device node
.../bindings/net/mediatek-dwmac.txt | 91 ----- .../bindings/net/mediatek-dwmac.yaml | 211 ++++++++++++ arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 92 +++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 70 ++++ .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 313 ++++++++++++++++-- 5 files changed, 664 insertions(+), 113 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.txt create mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.yaml
--
2.18.0
PATCH v2 1/5 net: stmmac: dwmac-mediatek: add platform level clocks management
This patch implements clks_config callback for dwmac-mediatek platform, which could support platform level clocks management.
--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +18 -6
@@ -359,9 +359,6 @@ static int mediatek_dwmac_init(struct platform_device *pdev, void *priv)return ret; } -pm_runtime_enable (&pdev->dev); -pm_runtime_get_sync (&pdev->dev); -return 0 ; }
@@ -370,11 +367,25 @@ static void mediatek_dwmac_exit(struct platform_device *pdev, void *priv)struct mediatek_dwmac_plat_data *plat = priv;clk_bulk_disable_unprepare (plat->num_clks_to_config, plat->clks); - -pm_runtime_put_sync (&pdev->dev); -pm_runtime_disable (&pdev->dev); } +static int mediatek_dwmac_clks_config (void *priv,bool enabled) +{ +struct mediatek_dwmac_plat_data *plat = priv; +int ret =0 ; + +if (enabled) { + ret =clk_bulk_prepare_enable (plat->num_clks_to_config, plat->clks); +if (ret) { +dev_err (plat->dev,"failed to enable clks, err = %d\n" , ret); +return ret; + } + }else { +clk_bulk_disable_unprepare (plat->num_clks_to_config, plat->clks); + } + +return ret; +}static int mediatek_dwmac_probe (struct platform_device *pdev) {struct mediatek_dwmac_plat_data *priv_plat;
@@ -420,6 +431,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) plat_dat->bsp_priv = priv_plat; plat_dat->init = mediatek_dwmac_init; plat_dat->exit = mediatek_dwmac_exit; + plat_dat->clks_config = mediatek_dwmac_clks_config;mediatek_dwmac_init (pdev, priv_plat); ret =stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res);
Signature · 1 line
2.25.1
PATCH v2 2/5 net: stmmac: dwmac-mediatek: Reuse more common features
In reply to Biao HuangThis patch makes dwmac-mediatek reuse more features supported by stmmac_platform.c.
--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +15 -17
@@ -335,22 +335,20 @@ static int mediatek_dwmac_init(struct platform_device *pdev, void *priv)const struct mediatek_dwmac_variant *variant = plat->variant;int ret; - ret =dma_set_mask_and_coherent (plat->dev,DMA_BIT_MASK (variant->dma_bit_mask)); -if (ret) { -dev_err (plat->dev,"No suitable DMA available, err = %d\n" , ret); -return ret; - } - - ret = variant->dwmac_set_phy_interface (plat); -if (ret) { -dev_err (plat->dev,"failed to set phy interface, err = %d\n" , ret); -return ret; +if (variant->dwmac_set_phy_interface) { + ret = variant->dwmac_set_phy_interface (plat); +if (ret) { +dev_err (plat->dev,"failed to set phy interface, err = %d\n" , ret); +return ret; + } } - ret = variant->dwmac_set_delay (plat); -if (ret) { -dev_err (plat->dev,"failed to set delay value, err = %d\n" , ret); -return ret; +if (variant->dwmac_set_delay) { + ret = variant->dwmac_set_delay (plat); +if (ret) { +dev_err (plat->dev,"failed to set delay value, err = %d\n" , ret); +return ret; + } } ret =clk_bulk_prepare_enable (plat->num_clks_to_config, plat->clks);
@@ -423,15 +421,15 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)return PTR_ERR (plat_dat); plat_dat->interface = priv_plat->phy_mode; - plat_dat->has_gmac4 =1 ; - plat_dat->has_gmac =0 ; - plat_dat->pmt =0 ; + plat_dat->use_phy_wol =1 ; plat_dat->riwt_off =1 ; plat_dat->maxmtu =ETH_DATA_LEN ; + plat_dat->addr64 = priv_plat->variant->dma_bit_mask; plat_dat->bsp_priv = priv_plat; plat_dat->init = mediatek_dwmac_init; plat_dat->exit = mediatek_dwmac_exit; plat_dat->clks_config = mediatek_dwmac_clks_config; +mediatek_dwmac_init (pdev, priv_plat); ret =stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res);
Signature · 1 line
2.25.1
Re: [PATCH v2 2/5] net: stmmac: dwmac-mediatek: Reuse more common features
Il 11/11/21 08:12, Biao Huang ha scritto:
Quoted 8 lines
This patch makes dwmac-mediatek reuse more features supported by
stmmac_platform.c.Signed-off-by Biao Huang <[email protected]>--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-)
Re: [PATCH v2 2/5] net: stmmac: dwmac-mediatek: Reuse more common features
Dear Angelo,
Thanks for your comments.
Quoted 11 lines · AngeloGioacchino Del Regno
Il 11/11/21 08:12, Biao Huang ha scritto:
Quoted 9 lines
This patch makes dwmac-mediatek reuse more features supported by
stmmac_platform.c.Signed-off-by Biao Huang <[email protected]>--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 32 +++++++++----- ----- 1 file changed, 15 insertions(+), 17 deletions(-)
Quoted 2 lines
Acked-by: AngeloGioacchino Del Regno <
[email protected]>
OK, will add this info in next send.
PATCH v2 3/5 net: stmmac: dwmac-mediatek: add support for mt8195
In reply to Biao HuangAdd Ethernet support for MediaTek SoCs from the mt8195 family.
--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 261 +++++++++++++++++- 1 file changed, 260 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +260 -1
@@ -40,6 +40,33 @@#define ETH_FINE_DLY_GTXC BIT(1)#define ETH_FINE_DLY_RXC BIT(0) +/* Peri Configuration register for mt8195 */ +#define MT8195_PERI_ETH_CTRL0 0xFD0 +#define MT8195_RMII_CLK_SRC_INTERNAL BIT(28) +#define MT8195_RMII_CLK_SRC_RXC BIT(27) +#define MT8195_ETH_INTF_SEL GENMASK(26, 24) +#define MT8195_RGMII_TXC_PHASE_CTRL BIT(22) +#define MT8195_EXT_PHY_MODE BIT(21) +#define MT8195_DLY_GTXC_INV BIT(12) +#define MT8195_DLY_GTXC_ENABLE BIT(5) +#define MT8195_DLY_GTXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL1 0xFD4 +#define MT8195_DLY_RXC_INV BIT(25) +#define MT8195_DLY_RXC_ENABLE BIT(18) +#define MT8195_DLY_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_TXC_INV BIT(12) +#define MT8195_DLY_TXC_ENABLE BIT(5) +#define MT8195_DLY_TXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL2 0xFD8 +#define MT8195_DLY_RMII_RXC_INV BIT(25) +#define MT8195_DLY_RMII_RXC_ENABLE BIT(18) +#define MT8195_DLY_RMII_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_RMII_TXC_INV BIT(12) +#define MT8195_DLY_RMII_TXC_ENABLE BIT(5) +#define MT8195_DLY_RMII_TXC_STAGES GENMASK(4, 0) +struct mac_delay_struct {u32 tx_delay;u32 rx_delay;
@@ -58,11 +85,13 @@ struct mediatek_dwmac_plat_data {int num_clks_to_config;bool rmii_clk_from_mac;bool rmii_rxc; +bool mac_wol; };struct mediatek_dwmac_variant {int (*dwmac_set_phy_interface)(struct mediatek_dwmac_plat_data *plat);int (*dwmac_set_delay)(struct mediatek_dwmac_plat_data *plat); +void (*dwmac_fix_mac_speed)(void *priv,unsigned int speed);/* clock ids to be requested */ const char *const *clk_list;
@@ -78,6 +107,10 @@ static const char * const mt2712_dwmac_clk_l[] = { "axi", "apb", "mac_main", "ptp_ref", "rmii_internal" }; +static const char *const mt8195_dwmac_clk_l[] = { +"axi" ,"apb" ,"mac_cg" ,"mac_main" ,"ptp_ref" ,"rmii_internal" +}; +static int mt2712_set_interface (struct mediatek_dwmac_plat_data *plat) {int rmii_clk_from_mac = plat->rmii_clk_from_mac ?RMII_CLK_SRC_INTERNAL :0 ;
@@ -268,6 +301,204 @@ static const struct mediatek_dwmac_variant mt2712_gmac_variant = { .tx_delay_max = 17600, }; +static int mt8195_set_interface (struct mediatek_dwmac_plat_data *plat) +{ +int rmii_clk_from_mac = plat->rmii_clk_from_mac ?MT8195_RMII_CLK_SRC_INTERNAL :0 ; +int rmii_rxc = plat->rmii_rxc ?MT8195_RMII_CLK_SRC_RXC :0 ; +u32 intf_val =0 ; + +/* The clock labeled as "rmii_internal" in mt8195_dwmac_clk_l is needed +* only in RMII(when MAC provides the reference clock), and useless for +* RGMII/MII/RMII(when PHY provides the reference clock). +* num_clks_to_config indicates the real number of clocks should be +* configured, equals to (plat->variant->num_clks - 1) in default for all the case, +* then +1 for rmii_clk_from_mac case. +*/ + plat->num_clks_to_config = plat->variant->num_clks -1 ; + +/* select phy interface in top control domain */ +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_MII ); +break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) + plat->num_clks_to_config++; + intf_val |= (rmii_rxc | rmii_clk_from_mac); + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_RMII ); +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_RGMII ); +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +/* MT8195 only support external PHY */ + intf_val |=MT8195_EXT_PHY_MODE ; + +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL0 , intf_val); + +return 0 ; +} + +static void mt8195_delay_ps2stage (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay /=290 ; + mac_delay->rx_delay /=290 ; +} + +static void mt8195_delay_stage2ps (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay *=290 ; + mac_delay->rx_delay *=290 ; +} + +static int mt8195_set_delay (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; +u32 gtxc_delay_val, delay_val =0 , rmii_delay_val =0 ; + +mt8195_delay_ps2stage (plat); + +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + delay_val |=FIELD_PREP (MT8195_DLY_TXC_ENABLE , !!mac_delay->tx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_STAGES , mac_delay->tx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_INV , mac_delay->tx_inv); + + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , mac_delay->rx_inv); +break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) { +/* case 1: mac provides the rmii reference clock, +* and the clock output to TXC pin. +* The egress timing can be adjusted by RMII_TXC delay macro circuit. +* The ingress timing can be adjusted by RMII_RXC delay macro circuit. +*/ + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_ENABLE , + !!mac_delay->tx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_STAGES , + mac_delay->tx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_INV , + mac_delay->tx_inv); + + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_ENABLE , + !!mac_delay->rx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_STAGES , + mac_delay->rx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_INV , + mac_delay->rx_inv); + }else { +/* case 2: the rmii reference clock is from external phy, +* and the property "rmii_rxc" indicates which pin(TXC/RXC) +* the reference clk is connected to. The reference clock is a +* received signal, so rx_delay/rx_inv are used to indicate +* the reference clock timing adjustment +*/ +if (plat->rmii_rxc) { +/* the rmii reference clock from outside is connected +* to RXC pin, the reference clock will be adjusted +* by RXC delay macro circuit. +*/ + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , + !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , + mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , + mac_delay->rx_inv); + }else { +/* the rmii reference clock from outside is connected +* to TXC pin, the reference clock will be adjusted +* by TXC delay macro circuit. +*/ + delay_val |=FIELD_PREP (MT8195_DLY_TXC_ENABLE , + !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_STAGES , + mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_INV , + mac_delay->rx_inv); + } + } +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_ENABLE , !!mac_delay->tx_delay); + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_STAGES , mac_delay->tx_delay); + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_INV , mac_delay->tx_inv); + + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , mac_delay->rx_inv); + +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +regmap_update_bits (plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_STAGES , + gtxc_delay_val); +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL1 , delay_val); +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL2 , rmii_delay_val); + +mt8195_delay_stage2ps (plat); + +return 0 ; +} + +static void mt8195_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *priv_plat = priv; + +if ((phy_interface_mode_is_rgmii (priv_plat->phy_mode))) { +/* prefer 2ns fixed delay which is controlled by TXC_PHASE_CTRL, +* when link speed is 1Gbps with RGMII interface, +* Fall back to delay macro circuit for 10/100Mbps link speed. +*/ +if (speed ==SPEED_1000 ) +regmap_update_bits (priv_plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_STAGES , +MT8195_RGMII_TXC_PHASE_CTRL ); +else +mt8195_set_delay (priv_plat); + } +} + +static const struct mediatek_dwmac_variant mt8195_gmac_variant = { + .dwmac_set_phy_interface = mt8195_set_interface, + .dwmac_set_delay = mt8195_set_delay, + .dwmac_fix_mac_speed = mt8195_fix_mac_speed, + .clk_list = mt8195_dwmac_clk_l, + .num_clks =ARRAY_SIZE (mt8195_dwmac_clk_l), + .dma_bit_mask =35 , + .rx_delay_max =9280 , + .tx_delay_max =9280 , +}; +static int mediatek_dwmac_config_dt (struct mediatek_dwmac_plat_data *plat) {struct mac_delay_struct *mac_delay = &plat->mac_delay;
@@ -308,6 +539,7 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat) mac_delay->rx_inv =of_property_read_bool (plat->np,"mediatek,rxc-inverse" ); plat->rmii_rxc =of_property_read_bool (plat->np,"mediatek,rmii-rxc" ); plat->rmii_clk_from_mac =of_property_read_bool (plat->np,"mediatek,rmii-clk-from-mac" ); + plat->mac_wol =of_property_read_bool (plat->np,"mediatek,mac-wol" );return 0 ; }
@@ -384,6 +616,16 @@ static int mediatek_dwmac_clks_config(void *priv, bool enabled)return ret; } + +static void mediatek_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *plat = priv; +const struct mediatek_dwmac_variant *variant = plat->variant; + +if (variant->dwmac_fix_mac_speed) + variant->dwmac_fix_mac_speed (priv, speed); +} +static int mediatek_dwmac_probe (struct platform_device *pdev) {struct mediatek_dwmac_plat_data *priv_plat;
@@ -421,7 +663,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)return PTR_ERR (plat_dat); plat_dat->interface = priv_plat->phy_mode; - plat_dat->use_phy_wol =1 ; + plat_dat->use_phy_wol = priv_plat->mac_wol ?0 :1 ; plat_dat->riwt_off =1 ; plat_dat->maxmtu =ETH_DATA_LEN ; plat_dat->addr64 = priv_plat->variant->dma_bit_mask;
@@ -429,7 +671,22 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) plat_dat->init = mediatek_dwmac_init; plat_dat->exit = mediatek_dwmac_exit; plat_dat->clks_config = mediatek_dwmac_clks_config; + plat_dat->fix_mac_speed = mediatek_fix_mac_speed; + plat_dat->safety_feat_cfg =devm_kzalloc (&pdev->dev, +sizeof (*plat_dat->safety_feat_cfg), +GFP_KERNEL ); +if (!plat_dat->safety_feat_cfg) +return -ENOMEM ; + plat_dat->safety_feat_cfg->tsoee =1 ; + plat_dat->safety_feat_cfg->mrxpee =0 ; + plat_dat->safety_feat_cfg->mestee =1 ; + plat_dat->safety_feat_cfg->mrxee =1 ; + plat_dat->safety_feat_cfg->mtxee =1 ; + plat_dat->safety_feat_cfg->epsi =0 ; + plat_dat->safety_feat_cfg->edpp =1 ; + plat_dat->safety_feat_cfg->prtyen =1 ; + plat_dat->safety_feat_cfg->tmouten =1 ;mediatek_dwmac_init (pdev, priv_plat); ret =stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res);
@@ -444,6 +701,8 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)static const struct of_device_id mediatek_dwmac_match[] = { { .compatible ="mediatek,mt2712-gmac" , .data = &mt2712_gmac_variant }, + { .compatible ="mediatek,mt8195-gmac" , + .data = &mt8195_gmac_variant }, { } };
Signature · 1 line
2.25.1
Re: [PATCH v2 3/5] net: stmmac: dwmac-mediatek: add support for mt8195
Il 11/11/21 08:12, Biao Huang ha scritto:
Quoted 311 lines
Add Ethernet support for MediaTek SoCs from the mt8195 family.
Signed-off-by Biao Huang <[email protected]>--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 261 +++++++++++++++++- 1 file changed, 260 insertions(+), 1 deletion(-)drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +242
-0@@ -40,6 +40,33 @@#define ETH_FINE_DLY_GTXC BIT(1)#define ETH_FINE_DLY_RXC BIT(0) +/* Peri Configuration register for mt8195 */ +#define MT8195_PERI_ETH_CTRL0 0xFD0 +#define MT8195_RMII_CLK_SRC_INTERNAL BIT(28) +#define MT8195_RMII_CLK_SRC_RXC BIT(27) +#define MT8195_ETH_INTF_SEL GENMASK(26, 24) +#define MT8195_RGMII_TXC_PHASE_CTRL BIT(22) +#define MT8195_EXT_PHY_MODE BIT(21) +#define MT8195_DLY_GTXC_INV BIT(12) +#define MT8195_DLY_GTXC_ENABLE BIT(5) +#define MT8195_DLY_GTXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL1 0xFD4 +#define MT8195_DLY_RXC_INV BIT(25) +#define MT8195_DLY_RXC_ENABLE BIT(18) +#define MT8195_DLY_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_TXC_INV BIT(12) +#define MT8195_DLY_TXC_ENABLE BIT(5) +#define MT8195_DLY_TXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL2 0xFD8 +#define MT8195_DLY_RMII_RXC_INV BIT(25) +#define MT8195_DLY_RMII_RXC_ENABLE BIT(18) +#define MT8195_DLY_RMII_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_RMII_TXC_INV BIT(12) +#define MT8195_DLY_RMII_TXC_ENABLE BIT(5) +#define MT8195_DLY_RMII_TXC_STAGES GENMASK(4, 0) +struct mac_delay_struct {u32 tx_delay;u32 rx_delay;@@ -58,11 +85,13 @@ struct mediatek_dwmac_plat_data {int num_clks_to_config;bool rmii_clk_from_mac;bool rmii_rxc; +bool mac_wol; };struct mediatek_dwmac_variant {int (*dwmac_set_phy_interface)(struct mediatek_dwmac_plat_data *plat);int (*dwmac_set_delay)(struct mediatek_dwmac_plat_data *plat); +void (*dwmac_fix_mac_speed)(void *priv,unsigned int speed);/* clock ids to be requested */ const char *const *clk_list;@@ -78,6 +107,10 @@ static const char * const mt2712_dwmac_clk_l[] = { "axi", "apb", "mac_main", "ptp_ref", "rmii_internal" }; +static const char *const mt8195_dwmac_clk_l[] = { +"axi" ,"apb" ,"mac_cg" ,"mac_main" ,"ptp_ref" ,"rmii_internal" +}; +static int mt2712_set_interface (struct mediatek_dwmac_plat_data *plat) {int rmii_clk_from_mac = plat->rmii_clk_from_mac ?RMII_CLK_SRC_INTERNAL :0 ;@@ -268,6 +301,204 @@ static const struct mediatek_dwmac_variant mt2712_gmac_variant = { .tx_delay_max = 17600, }; +static int mt8195_set_interface (struct mediatek_dwmac_plat_data *plat) +{ +int rmii_clk_from_mac = plat->rmii_clk_from_mac ?MT8195_RMII_CLK_SRC_INTERNAL :0 ; +int rmii_rxc = plat->rmii_rxc ?MT8195_RMII_CLK_SRC_RXC :0 ; +u32 intf_val =0 ; + +/* The clock labeled as "rmii_internal" in mt8195_dwmac_clk_l is needed +* only in RMII(when MAC provides the reference clock), and useless for +* RGMII/MII/RMII(when PHY provides the reference clock). +* num_clks_to_config indicates the real number of clocks should be +* configured, equals to (plat->variant->num_clks - 1) in default for all the case, +* then +1 for rmii_clk_from_mac case. +*/ + plat->num_clks_to_config = plat->variant->num_clks -1 ; + +/* select phy interface in top control domain */ +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_MII ); +break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) + plat->num_clks_to_config++; + intf_val |= (rmii_rxc | rmii_clk_from_mac); + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_RMII ); +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_RGMII ); +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +/* MT8195 only support external PHY */ + intf_val |=MT8195_EXT_PHY_MODE ; + +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL0 , intf_val); + +return 0 ; +} + +static void mt8195_delay_ps2stage (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay /=290 ; + mac_delay->rx_delay /=290 ; +} + +static void mt8195_delay_stage2ps (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay *=290 ; + mac_delay->rx_delay *=290 ; +} + +static int mt8195_set_delay (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; +u32 gtxc_delay_val, delay_val =0 , rmii_delay_val =0 ; + +mt8195_delay_ps2stage (plat); + +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + delay_val |=FIELD_PREP (MT8195_DLY_TXC_ENABLE , !!mac_delay->tx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_STAGES , mac_delay->tx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_INV , mac_delay->tx_inv); + + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , mac_delay->rx_inv); +break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) { +/* case 1: mac provides the rmii reference clock, +* and the clock output to TXC pin. +* The egress timing can be adjusted by RMII_TXC delay macro circuit. +* The ingress timing can be adjusted by RMII_RXC delay macro circuit. +*/ + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_ENABLE , + !!mac_delay->tx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_STAGES , + mac_delay->tx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_INV , + mac_delay->tx_inv); + + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_ENABLE , + !!mac_delay->rx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_STAGES , + mac_delay->rx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_INV , + mac_delay->rx_inv); + }else { +/* case 2: the rmii reference clock is from external phy, +* and the property "rmii_rxc" indicates which pin(TXC/RXC) +* the reference clk is connected to. The reference clock is a +* received signal, so rx_delay/rx_inv are used to indicate +* the reference clock timing adjustment +*/ +if (plat->rmii_rxc) { +/* the rmii reference clock from outside is connected +* to RXC pin, the reference clock will be adjusted +* by RXC delay macro circuit. +*/ + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , + !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , + mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , + mac_delay->rx_inv); + }else { +/* the rmii reference clock from outside is connected +* to TXC pin, the reference clock will be adjusted +* by TXC delay macro circuit. +*/ + delay_val |=FIELD_PREP (MT8195_DLY_TXC_ENABLE , + !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_STAGES , + mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_INV , + mac_delay->rx_inv); + } + } +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_ENABLE , !!mac_delay->tx_delay); + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_STAGES , mac_delay->tx_delay); + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_INV , mac_delay->tx_inv); + + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , mac_delay->rx_inv); + +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +regmap_update_bits (plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_STAGES , + gtxc_delay_val); +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL1 , delay_val); +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL2 , rmii_delay_val); + +mt8195_delay_stage2ps (plat); + +return 0 ; +} + +static void mt8195_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *priv_plat = priv; + +if ((phy_interface_mode_is_rgmii (priv_plat->phy_mode))) { +/* prefer 2ns fixed delay which is controlled by TXC_PHASE_CTRL, +* when link speed is 1Gbps with RGMII interface, +* Fall back to delay macro circuit for 10/100Mbps link speed. +*/ +if (speed ==SPEED_1000 ) +regmap_update_bits (priv_plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_STAGES , +MT8195_RGMII_TXC_PHASE_CTRL ); +else +mt8195_set_delay (priv_plat); + } +} + +static const struct mediatek_dwmac_variant mt8195_gmac_variant = { + .dwmac_set_phy_interface = mt8195_set_interface, + .dwmac_set_delay = mt8195_set_delay, + .dwmac_fix_mac_speed = mt8195_fix_mac_speed, + .clk_list = mt8195_dwmac_clk_l, + .num_clks =ARRAY_SIZE (mt8195_dwmac_clk_l), + .dma_bit_mask =35 , + .rx_delay_max =9280 , + .tx_delay_max =9280 , +}; +static int mediatek_dwmac_config_dt (struct mediatek_dwmac_plat_data *plat) {struct mac_delay_struct *mac_delay = &plat->mac_delay;@@ -308,6 +539,7 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat) mac_delay->rx_inv =of_property_read_bool (plat->np,"mediatek,rxc-inverse" ); plat->rmii_rxc =of_property_read_bool (plat->np,"mediatek,rmii-rxc" ); plat->rmii_clk_from_mac =of_property_read_bool (plat->np,"mediatek,rmii-clk-from-mac" ); + plat->mac_wol =of_property_read_bool (plat->np,"mediatek,mac-wol" );return 0 ; }@@ -384,6 +616,16 @@ static int mediatek_dwmac_clks_config(void *priv, bool enabled)return ret; } + +static void mediatek_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *plat = priv; +const struct mediatek_dwmac_variant *variant = plat->variant; + +if (variant->dwmac_fix_mac_speed) + variant->dwmac_fix_mac_speed (priv, speed); +} +static int mediatek_dwmac_probe (struct platform_device *pdev) {struct
mediatek_dwmac_plat_data*priv_plat;drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-1@@ -421,7 +663,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)return PTR_ERR (plat_dat); plat_dat->interface = priv_plat->phy_mode; - plat_dat->use_phy_wol =1 ; + plat_dat->use_phy_wol = priv_plat->mac_wol ?0 :1 ; plat_dat->riwt_off =1 ; plat_dat->maxmtu =ETH_DATA_LEN ; plat_dat->addr64 = priv_plat->variant->dma_bit_mask;
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c static int mediatek_dwmac_probe(struct platform_device *pdev) · line 674
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0@@ -429,7 +671,22 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) plat_dat->init = mediatek_dwmac_init; plat_dat->exit = mediatek_dwmac_exit; plat_dat->clks_config = mediatek_dwmac_clks_config; + plat_dat->fix_mac_speed = mediatek_fix_mac_speed;
So, since that function serves as a wrapper only....
if (priv_plat->variant->dwmac_fix_mac_speed) lat_dat->fix_mac_speed = priv_plat->variant->dwmac_fix_mac_speed;
seems to be a good option :)
Regards,
- Angelo
Re: [PATCH v2 3/5] net: stmmac: dwmac-mediatek: add support for mt8195
Dear Angelo,
Thanks for your comments~
Quoted 403 lines · AngeloGioacchino Del Regno
Il 11/11/21 08:12, Biao Huang ha scritto:
Quoted 390 lines
Add Ethernet support for MediaTek SoCs from the mt8195 family.
Signed-off-by Biao Huang <[email protected]>--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 261 +++++++++++++++++- 1 file changed, 260 insertions(+), 1 deletion(-)drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +29
-0@@ -40,6 +40,33 @@#define ETH_FINE_DLY_GTXC BIT(1)#define ETH_FINE_DLY_RXC BIT(0) +/* Peri Configuration register for mt8195 */ +#define MT8195_PERI_ETH_CTRL0 0xFD0 +#define MT8195_RMII_CLK_SRC_INTERNAL BIT(28) +#define MT8195_RMII_CLK_SRC_RXC BIT(27) +#define MT8195_ETH_INTF_SEL GENMASK(26, 24) +#define MT8195_RGMII_TXC_PHASE_CTRL BIT(22) +#define MT8195_EXT_PHY_MODE BIT(21) +#define MT8195_DLY_GTXC_INV BIT(12) +#define MT8195_DLY_GTXC_ENABLE BIT(5) +#define MT8195_DLY_GTXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL1 0xFD4 +#define MT8195_DLY_RXC_INV BIT(25) +#define MT8195_DLY_RXC_ENABLE BIT(18) +#define MT8195_DLY_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_TXC_INV BIT(12) +#define MT8195_DLY_TXC_ENABLE BIT(5) +#define MT8195_DLY_TXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL2 0xFD8 +#define MT8195_DLY_RMII_RXC_INV BIT(25) +#define MT8195_DLY_RMII_RXC_ENABLE BIT(18) +#define MT8195_DLY_RMII_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_RMII_TXC_INV BIT(12) +#define MT8195_DLY_RMII_TXC_ENABLE BIT(5) +#define MT8195_DLY_RMII_TXC_STAGES GENMASK(4, 0) +struct mac_delay_struct {u32 tx_delay;u32 rx_delay;@@ -58,11 +85,13 @@ struct mediatek_dwmac_plat_data {int num_clks_to_config;bool rmii_clk_from_mac;bool rmii_rxc; +bool mac_wol; };struct mediatek_dwmac_variant {int (*dwmac_set_phy_interface)(struct mediatek_dwmac_plat_data *plat);int (*dwmac_set_delay)(struct mediatek_dwmac_plat_data *plat); +void (*dwmac_fix_mac_speed)(void *priv,unsigned int speed);/* clock ids to be requested */ const char * const
*clk_list;drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +4
-0@@ -78,6 +107,10 @@ static const char * const mt2712_dwmac_clk_l[] = {"axi" ,"apb" ,"mac_main" ,"ptp_ref" ,"rmii_internal" }; +static const char *const mt8195_dwmac_clk_l[] = { +"axi" ,"apb" ,"mac_cg" ,"mac_main" ,"ptp_ref" ,"rmii_internal" +}; +static int mt2712_set_interface (struct mediatek_dwmac_plat_data *plat){
intrmii_clk_from_mac=plat->rmii_clk_from_mac?RMII_CLK_SRC_INTERNAL: 0;drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +7
-0@@ -268,6 +301,204 @@ static const struct mediatek_dwmac_variant mt2712_gmac_variant = { .tx_delay_max = 17600, }; +static int mt8195_set_interface (struct mediatek_dwmac_plat_data *plat) +{ +int rmii_clk_from_mac = plat->rmii_clk_from_mac ?MT8195_RMII_CLK_SRC_INTERNAL :0 ; +int rmii_rxc = plat->rmii_rxc ?MT8195_RMII_CLK_SRC_RXC :0 ; +u32 intf_val =0 ; + +/* The clock labeled as "rmii_internal" in mt8195_dwmac_clk_l is needed
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+* only in RMII(when MAC provides the reference clock), and useless for
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+* RGMII/MII/RMII(when PHY provides the reference clock). +* num_clks_to_config indicates the real number of clocks should be
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+* configured, equals to (plat->variant->num_clks - 1) in default for all the case,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +8
-0+* then +1 for rmii_clk_from_mac case. +*/ + plat->num_clks_to_config = plat->variant->num_clks -1 ; + +/* select phy interface in top control domain */ +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + intf_val |= FIELD_PREP(MT8195_ETH_INTF_SEL,
PHY_INTF_MII);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +6
-0+break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) + plat->num_clks_to_config++; + intf_val |= (rmii_rxc | rmii_clk_from_mac); + intf_val |= FIELD_PREP(MT8195_ETH_INTF_SEL,
PHY_INTF_RMII);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +6
-0+break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + intf_val |= FIELD_PREP(MT8195_ETH_INTF_SEL,
PHY_INTF_RGMII);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +10
-0+break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +/* MT8195 only support external PHY */ + intf_val |=MT8195_EXT_PHY_MODE ; + + regmap_write(plat->peri_regmap, MT8195_PERI_ETH_CTRL0,
intf_val);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +5
-0+ +return 0 ; +} + +static void mt8195_delay_ps2stage(struct mediatek_dwmac_plat_data*plat)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +9
-0+{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay /=290 ; + mac_delay->rx_delay /=290 ; +} + +static void mt8195_delay_stage2ps(struct mediatek_dwmac_plat_data*plat)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +18
-0+{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay *=290 ; + mac_delay->rx_delay *=290 ; +} + +static int mt8195_set_delay (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; +u32 gtxc_delay_val, delay_val =0 , rmii_delay_val =0 ; + +mt8195_delay_ps2stage (plat); + +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + delay_val |= FIELD_PREP(MT8195_DLY_TXC_ENABLE,!!mac_delay->tx_delay);
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |= FIELD_PREP(MT8195_DLY_TXC_STAGES,
mac_delay->tx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |= FIELD_PREP(MT8195_DLY_TXC_INV, mac_delay-Quoted 1 line
tx_inv);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+ + delay_val |= FIELD_PREP(MT8195_DLY_RXC_ENABLE,!!mac_delay->rx_delay);
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |= FIELD_PREP(MT8195_DLY_RXC_STAGES,
mac_delay->rx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |= FIELD_PREP(MT8195_DLY_RXC_INV, mac_delay-Quoted 1 line
rx_inv);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +4
-0+break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) { +/* case 1: mac provides the rmii reference clock,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+* and the clock output to TXC pin. +* The egress timing can be adjusted by
RMII_TXCdelay macro circuit.drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+* The ingress timing can be adjusted by
RMII_RXCdelay macro circuit.drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+*/ + rmii_delay_val |=FIELD_PREP(MT8195_DLY_RMII_TXC_ENABLE,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ !!mac_delay-Quoted 1 line
tx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ rmii_delay_val |=FIELD_PREP(MT8195_DLY_RMII_TXC_STAGES,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ mac_delay-Quoted 1 line
tx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ rmii_delay_val |=FIELD_PREP(MT8195_DLY_RMII_TXC_INV,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ mac_delay-Quoted 1 line
tx_inv);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+ + rmii_delay_val |=FIELD_PREP(MT8195_DLY_RMII_RXC_ENABLE,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ !!mac_delay-Quoted 1 line
rx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ rmii_delay_val |=FIELD_PREP(MT8195_DLY_RMII_RXC_STAGES,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ mac_delay-Quoted 1 line
rx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ rmii_delay_val |=FIELD_PREP(MT8195_DLY_RMII_RXC_INV,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ mac_delay-Quoted 1 line
rx_inv);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+ }else { +/* case 2: the rmii reference clock is from external phy,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+* and the property "rmii_rxc" indicates which pin(TXC/RXC)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+* the reference clk is connected to. The reference clock is a
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+* received signal, so rx_delay/rx_inv are used to indicate
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +4
-0+* the reference clock timing adjustment +*/ +if (plat->rmii_rxc) { +/* the rmii reference clock from outside is connected
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+* to RXC pin, the reference clock will be adjusted
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +3
-0+* by RXC delay macro circuit. +*/ + delay_val |=FIELD_PREP(MT8195_DLY_RXC_ENABLE,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ !!mac_delay-Quoted 1 line
rx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |=FIELD_PREP(MT8195_DLY_RXC_STAGES,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ mac_delay-Quoted 1 line
rx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |=FIELD_PREP(MT8195_DLY_RXC_INV,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ mac_delay-Quoted 1 line
rx_inv);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+ }else { +/* the rmii reference clock from outside is connected
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+* to TXC pin, the reference clock will be adjusted
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +3
-0+* by TXC delay macro circuit. +*/ + delay_val |=FIELD_PREP(MT8195_DLY_TXC_ENABLE,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ !!mac_delay-Quoted 1 line
rx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |=FIELD_PREP(MT8195_DLY_TXC_STAGES,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ mac_delay-Quoted 1 line
rx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |=FIELD_PREP(MT8195_DLY_TXC_INV,
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ mac_delay-Quoted 1 line
rx_inv);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +8
-0+ } + } +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + gtxc_delay_val |= FIELD_PREP(MT8195_DLY_GTXC_ENABLE,!!mac_delay->tx_delay);
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ gtxc_delay_val |= FIELD_PREP(MT8195_DLY_GTXC_STAGES,
mac_delay->tx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ gtxc_delay_val |= FIELD_PREP(MT8195_DLY_GTXC_INV,
mac_delay->tx_inv);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+ + delay_val |= FIELD_PREP(MT8195_DLY_RXC_ENABLE,!!mac_delay->rx_delay);
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |= FIELD_PREP(MT8195_DLY_RXC_STAGES,
mac_delay->rx_delay);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ delay_val |= FIELD_PREP(MT8195_DLY_RXC_INV, mac_delay-Quoted 1 line
rx_inv);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +15
-0+ +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +regmap_update_bits (plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_STAGES , + gtxc_delay_val); + regmap_write(plat->peri_regmap, MT8195_PERI_ETH_CTRL1,
delay_val);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ regmap_write(plat->peri_regmap, MT8195_PERI_ETH_CTRL2,
rmii_delay_val);drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +12
-0+ +mt8195_delay_stage2ps (plat); + +return 0 ; +} + +static void mt8195_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *priv_plat = priv; + +if ((phy_interface_mode_is_rgmii (priv_plat->phy_mode))) { +/* prefer 2ns fixed delay which is controlled by
TXC_PHASE_CTRL,drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +2
-0+* when link speed is 1Gbps with RGMII interface, +* Fall back to delay macro circuit for 10/100Mbps link speed.
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +5
-0+*/ +if (speed ==SPEED_1000 ) +regmap_update_bits (priv_plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , + MT8195_RGMII_TXC_PHASE_CTRL|
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +4
-0+MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_STAGES , + MT8195_RGMII_TXC_PHASE_CTRL);
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +16
-0+else +mt8195_set_delay (priv_plat); + } +} + +static const struct mediatek_dwmac_variant mt8195_gmac_variant = { + .dwmac_set_phy_interface = mt8195_set_interface, + .dwmac_set_delay = mt8195_set_delay, + .dwmac_fix_mac_speed = mt8195_fix_mac_speed, + .clk_list = mt8195_dwmac_clk_l, + .num_clks =ARRAY_SIZE (mt8195_dwmac_clk_l), + .dma_bit_mask =35 , + .rx_delay_max =9280 , + .tx_delay_max =9280 , +}; + static int mediatek_dwmac_config_dt(struct
mediatek_dwmac_plat_data*plat)
{
structmac_delay_struct*mac_delay=&plat->mac_delay;drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +0
-0@@ -308,6 +539,7 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat) mac_delay->rx_inv = of_property_read_bool(plat->np,"mediatek,rxc-inverse" ); plat->rmii_rxc =of_property_read_bool (plat->np,"mediatek,rmii-rxc" ); plat->rmii_clk_from_mac = of_property_read_bool(plat->np,"mediatek,rmii-clk-from-mac");
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0+ plat->mac_wol = of_property_read_bool(plat->np, "mediatek,mac-wol");
return 0; }drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +10
-0@@ -384,6 +616,16 @@ static int mediatek_dwmac_clks_config(void *priv, bool enabled)return ret; } + +static void mediatek_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *plat = priv; +const struct mediatek_dwmac_variant *variant = plat->variant; + +if (variant->dwmac_fix_mac_speed) + variant->dwmac_fix_mac_speed (priv, speed); +} +static int mediatek_dwmac_probe (struct platform_device *pdev) {struct
mediatek_dwmac_plat_data*priv_plat;drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-1@@ -421,7 +663,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)return PTR_ERR (plat_dat); plat_dat->interface = priv_plat->phy_mode; - plat_dat->use_phy_wol =1 ; + plat_dat->use_phy_wol = priv_plat->mac_wol ?0 :1 ; plat_dat->riwt_off =1 ; plat_dat->maxmtu =ETH_DATA_LEN ;plat_dat->addr64 = priv_plat->variant->dma_bit_mask;drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c static int mediatek_dwmac_probe(struct · line 675
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0@@ -429,7 +671,22 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) plat_dat->init = mediatek_dwmac_init; plat_dat->exit = mediatek_dwmac_exit; plat_dat->clks_config = mediatek_dwmac_clks_config; + plat_dat->fix_mac_speed = mediatek_fix_mac_speed;So, since that function serves as a wrapper only....
Quoted 9 lines
if (priv_plat->variant->dwmac_fix_mac_speed) lat_dat->fix_mac_speed = priv_plat->variant-drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c static int mediatek_dwmac_probe(struct · line 676
Quoted 1 line
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +0
-0dwmac_fix_mac_speed;seems to be a good option :)
Yes, that makes sense, will fix it in next send.
Quoted 8 lines
Regards,
- Angelo
AngeloGioacchino Del Regno
maintainerRe: [PATCH v2 3/5] net: stmmac: dwmac-mediatek: add support for mt8195
In reply to Biao HuangIl 11/11/21 08:12, Biao Huang ha scritto:
Quoted 7 lines
Add Ethernet support for MediaTek SoCs from the mt8195 family.
Signed-off-by Biao Huang <[email protected]>--- .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 261 +++++++++++++++++- 1 file changed, 260 insertions(+), 1 deletion(-)
Hello Biao,
thanks for the patch!
Quoted 278 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +232
-0@@ -40,6 +40,33 @@#define ETH_FINE_DLY_GTXC BIT(1)#define ETH_FINE_DLY_RXC BIT(0) +/* Peri Configuration register for mt8195 */ +#define MT8195_PERI_ETH_CTRL0 0xFD0 +#define MT8195_RMII_CLK_SRC_INTERNAL BIT(28) +#define MT8195_RMII_CLK_SRC_RXC BIT(27) +#define MT8195_ETH_INTF_SEL GENMASK(26, 24) +#define MT8195_RGMII_TXC_PHASE_CTRL BIT(22) +#define MT8195_EXT_PHY_MODE BIT(21) +#define MT8195_DLY_GTXC_INV BIT(12) +#define MT8195_DLY_GTXC_ENABLE BIT(5) +#define MT8195_DLY_GTXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL1 0xFD4 +#define MT8195_DLY_RXC_INV BIT(25) +#define MT8195_DLY_RXC_ENABLE BIT(18) +#define MT8195_DLY_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_TXC_INV BIT(12) +#define MT8195_DLY_TXC_ENABLE BIT(5) +#define MT8195_DLY_TXC_STAGES GENMASK(4, 0) + +#define MT8195_PERI_ETH_CTRL2 0xFD8 +#define MT8195_DLY_RMII_RXC_INV BIT(25) +#define MT8195_DLY_RMII_RXC_ENABLE BIT(18) +#define MT8195_DLY_RMII_RXC_STAGES GENMASK(17, 13) +#define MT8195_DLY_RMII_TXC_INV BIT(12) +#define MT8195_DLY_RMII_TXC_ENABLE BIT(5) +#define MT8195_DLY_RMII_TXC_STAGES GENMASK(4, 0) +struct mac_delay_struct {u32 tx_delay;u32 rx_delay;@@ -58,11 +85,13 @@ struct mediatek_dwmac_plat_data {int num_clks_to_config;bool rmii_clk_from_mac;bool rmii_rxc; +bool mac_wol; };struct mediatek_dwmac_variant {int (*dwmac_set_phy_interface)(struct mediatek_dwmac_plat_data *plat);int (*dwmac_set_delay)(struct mediatek_dwmac_plat_data *plat); +void (*dwmac_fix_mac_speed)(void *priv,unsigned int speed);/* clock ids to be requested */ const char *const *clk_list;@@ -78,6 +107,10 @@ static const char * const mt2712_dwmac_clk_l[] = { "axi", "apb", "mac_main", "ptp_ref", "rmii_internal" }; +static const char *const mt8195_dwmac_clk_l[] = { +"axi" ,"apb" ,"mac_cg" ,"mac_main" ,"ptp_ref" ,"rmii_internal" +}; +static int mt2712_set_interface (struct mediatek_dwmac_plat_data *plat) {int rmii_clk_from_mac = plat->rmii_clk_from_mac ?RMII_CLK_SRC_INTERNAL :0 ;@@ -268,6 +301,204 @@ static const struct mediatek_dwmac_variant mt2712_gmac_variant = { .tx_delay_max = 17600, }; +static int mt8195_set_interface (struct mediatek_dwmac_plat_data *plat) +{ +int rmii_clk_from_mac = plat->rmii_clk_from_mac ?MT8195_RMII_CLK_SRC_INTERNAL :0 ; +int rmii_rxc = plat->rmii_rxc ?MT8195_RMII_CLK_SRC_RXC :0 ; +u32 intf_val =0 ; + +/* The clock labeled as "rmii_internal" in mt8195_dwmac_clk_l is needed +* only in RMII(when MAC provides the reference clock), and useless for +* RGMII/MII/RMII(when PHY provides the reference clock). +* num_clks_to_config indicates the real number of clocks should be +* configured, equals to (plat->variant->num_clks - 1) in default for all the case, +* then +1 for rmii_clk_from_mac case. +*/ + plat->num_clks_to_config = plat->variant->num_clks -1 ; + +/* select phy interface in top control domain */ +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_MII ); +break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) + plat->num_clks_to_config++; + intf_val |= (rmii_rxc | rmii_clk_from_mac); + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_RMII ); +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + intf_val |=FIELD_PREP (MT8195_ETH_INTF_SEL ,PHY_INTF_RGMII ); +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +/* MT8195 only support external PHY */ + intf_val |=MT8195_EXT_PHY_MODE ; + +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL0 , intf_val); + +return 0 ; +} + +static void mt8195_delay_ps2stage (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay /=290 ; + mac_delay->rx_delay /=290 ; +} + +static void mt8195_delay_stage2ps (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; + +/* 290ps per stage */ + mac_delay->tx_delay *=290 ; + mac_delay->rx_delay *=290 ; +} + +static int mt8195_set_delay (struct mediatek_dwmac_plat_data *plat) +{ +struct mac_delay_struct *mac_delay = &plat->mac_delay; +u32 gtxc_delay_val, delay_val =0 , rmii_delay_val =0 ; + +mt8195_delay_ps2stage (plat); + +switch (plat->phy_mode) { +case PHY_INTERFACE_MODE_MII : + delay_val |=FIELD_PREP (MT8195_DLY_TXC_ENABLE , !!mac_delay->tx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_STAGES , mac_delay->tx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_INV , mac_delay->tx_inv); + + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , mac_delay->rx_inv); +break ; +case PHY_INTERFACE_MODE_RMII : +if (plat->rmii_clk_from_mac) { +/* case 1: mac provides the rmii reference clock, +* and the clock output to TXC pin. +* The egress timing can be adjusted by RMII_TXC delay macro circuit. +* The ingress timing can be adjusted by RMII_RXC delay macro circuit. +*/ + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_ENABLE , + !!mac_delay->tx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_STAGES , + mac_delay->tx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_TXC_INV , + mac_delay->tx_inv); + + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_ENABLE , + !!mac_delay->rx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_STAGES , + mac_delay->rx_delay); + rmii_delay_val |=FIELD_PREP (MT8195_DLY_RMII_RXC_INV , + mac_delay->rx_inv); + }else { +/* case 2: the rmii reference clock is from external phy, +* and the property "rmii_rxc" indicates which pin(TXC/RXC) +* the reference clk is connected to. The reference clock is a +* received signal, so rx_delay/rx_inv are used to indicate +* the reference clock timing adjustment +*/ +if (plat->rmii_rxc) { +/* the rmii reference clock from outside is connected +* to RXC pin, the reference clock will be adjusted +* by RXC delay macro circuit. +*/ + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , + !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , + mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , + mac_delay->rx_inv); + }else { +/* the rmii reference clock from outside is connected +* to TXC pin, the reference clock will be adjusted +* by TXC delay macro circuit. +*/ + delay_val |=FIELD_PREP (MT8195_DLY_TXC_ENABLE , + !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_STAGES , + mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_TXC_INV , + mac_delay->rx_inv); + } + } +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_ID : + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_ENABLE , !!mac_delay->tx_delay); + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_STAGES , mac_delay->tx_delay); + gtxc_delay_val |=FIELD_PREP (MT8195_DLY_GTXC_INV , mac_delay->tx_inv); + + delay_val |=FIELD_PREP (MT8195_DLY_RXC_ENABLE , !!mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_STAGES , mac_delay->rx_delay); + delay_val |=FIELD_PREP (MT8195_DLY_RXC_INV , mac_delay->rx_inv); + +break ; +default : +dev_err (plat->dev,"phy interface not supported\n" ); +return -EINVAL ; + } + +regmap_update_bits (plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_STAGES , + gtxc_delay_val); +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL1 , delay_val); +regmap_write (plat->peri_regmap,MT8195_PERI_ETH_CTRL2 , rmii_delay_val); + +mt8195_delay_stage2ps (plat); + +return 0 ; +} + +static void mt8195_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *priv_plat = priv; + +if ((phy_interface_mode_is_rgmii (priv_plat->phy_mode))) { +/* prefer 2ns fixed delay which is controlled by TXC_PHASE_CTRL, +* when link speed is 1Gbps with RGMII interface, +* Fall back to delay macro circuit for 10/100Mbps link speed. +*/ +if (speed ==SPEED_1000 ) +regmap_update_bits (priv_plat->peri_regmap, +MT8195_PERI_ETH_CTRL0 , +MT8195_RGMII_TXC_PHASE_CTRL | +MT8195_DLY_GTXC_ENABLE | +MT8195_DLY_GTXC_INV | +MT8195_DLY_GTXC_STAGES , +MT8195_RGMII_TXC_PHASE_CTRL ); +else +mt8195_set_delay (priv_plat); + } +} + +static const struct mediatek_dwmac_variant mt8195_gmac_variant = { + .dwmac_set_phy_interface = mt8195_set_interface, + .dwmac_set_delay = mt8195_set_delay, + .dwmac_fix_mac_speed = mt8195_fix_mac_speed, + .clk_list = mt8195_dwmac_clk_l, + .num_clks =ARRAY_SIZE (mt8195_dwmac_clk_l), + .dma_bit_mask =35 , + .rx_delay_max =9280 , + .tx_delay_max =9280 , +}; +static int mediatek_dwmac_config_dt (struct mediatek_dwmac_plat_data *plat) {struct mac_delay_struct *mac_delay = &plat->mac_delay;@@ -308,6 +539,7 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat) mac_delay->rx_inv =of_property_read_bool (plat->np,"mediatek,rxc-inverse" ); plat->rmii_rxc =of_property_read_bool (plat->np,"mediatek,rmii-rxc" ); plat->rmii_clk_from_mac =of_property_read_bool (plat->np,"mediatek,rmii-clk-from-mac" ); + plat->mac_wol =of_property_read_bool (plat->np,"mediatek,mac-wol" );return 0 ; }@@ -384,6 +616,16 @@ static int mediatek_dwmac_clks_config(void *priv, bool enabled)
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c static int mediatek_dwmac_clks_config(void *priv, bool enabled) · line 626
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +8
-0return ret; } + +static void mediatek_fix_mac_speed (void *priv,unsigned int speed) +{ +struct mediatek_dwmac_plat_data *plat = priv; +const struct mediatek_dwmac_variant *variant = plat->variant; + +if (variant->dwmac_fix_mac_speed) + variant->dwmac_fix_mac_speed (priv, speed);
This function serves only as a wrapper to call variant->dwmac_fix_mac_speed, which
also happens to have the same function signature as the one in plat_stmmacenet_data
...so, why are you introducing this?
Is this function expected to do more than just wrap the call?
Quoted 15 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +3
-1+} +static int mediatek_dwmac_probe (struct platform_device *pdev) {struct mediatek_dwmac_plat_data *priv_plat;@@ -421,7 +663,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)return PTR_ERR (plat_dat); plat_dat->interface = priv_plat->phy_mode; - plat_dat->use_phy_wol =1 ; + plat_dat->use_phy_wol = priv_plat->mac_wol ?0 :1 ; plat_dat->riwt_off =1 ; plat_dat->maxmtu =ETH_DATA_LEN ; plat_dat->addr64 = priv_plat->variant->dma_bit_mask;
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c static int mediatek_dwmac_probe(struct platform_device *pdev) · line 674
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +1
-0@@ -429,7 +671,22 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) plat_dat->init = mediatek_dwmac_init; plat_dat->exit = mediatek_dwmac_exit; plat_dat->clks_config = mediatek_dwmac_clks_config; + plat_dat->fix_mac_speed = mediatek_fix_mac_speed;
So, since that function serves as a wrapper only....
if (priv_plat->variant->dwmac_fix_mac_speed) lat_dat->fix_mac_speed = priv_plat->variant->dwmac_fix_mac_speed;
seems to be a good option :)
Regards,
- Angelo
PATCH v2 4/5 dt-bindings: net: dwmac: Convert mediatek-dwmac to DT schema
In reply to Biao HuangConvert mediatek-dwmac to DT schema, and delete old mediatek-dwmac.txt.
--- .../bindings/net/mediatek-dwmac.txt | 91 -------- .../bindings/net/mediatek-dwmac.yaml | 211 ++++++++++++++++++ 2 files changed, 211 insertions(+), 91 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.txt create mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.yaml
Documentation/devicetree/bindings/net/mediatek-dwmac.txt deleted +0 -91
@@ -1,91 +0,0 @@ -MediaTek DWMAC glue layer controller - -This file documents platform glue layer for stmmac. -Please see stmmac.txt for the other unchanged properties. - -The device node has following properties. - -Required properties: -- compatible: Should be "mediatek,mt2712-gmac" for MT2712 SoC -- reg: Address and length of the register set for the device -- interrupts: Should contain the MAC interrupts -- interrupt-names: Should contain a list of interrupt names corresponding to - the interrupts in the interrupts property, if available. - Should be "macirq" for the main MAC IRQ -- clocks: Must contain a phandle for each entry in clock-names. -- clock-names: The name of the clock listed in the clocks property. These are - "axi", "apb", "mac_main", "ptp_ref", "rmii_internal" for MT2712 SoC. -- mac-address: See ethernet.txt in the same directory -- phy-mode: See ethernet.txt in the same directory -- mediatek,pericfg: A phandle to the syscon node that control ethernet - interface and timing delay. - -Optional properties: -- mediatek,tx-delay-ps: TX clock delay macro value. Default is 0. - It should be defined for RGMII/MII interface. - It should be defined for RMII interface when the reference clock is from MT2712 SoC. -- mediatek,rx-delay-ps: RX clock delay macro value. Default is 0. - It should be defined for RGMII/MII interface. - It should be defined for RMII interface. -Both delay properties need to be a multiple of 170 for RGMII interface, -or will round down. Range 0~31*170. -Both delay properties need to be a multiple of 550 for MII/RMII interface, -or will round down. Range 0~31*550. - -- mediatek,rmii-rxc: boolean property, if present indicates that the RMII - reference clock, which is from external PHYs, is connected to RXC pin - on MT2712 SoC. - Otherwise, is connected to TXC pin. -- mediatek,rmii-clk-from-mac: boolean property, if present indicates that - MT2712 SoC provides the RMII reference clock, which outputs to TXC pin only. -- mediatek,txc-inverse: boolean property, if present indicates that - 1. tx clock will be inversed in MII/RGMII case, - 2. tx clock inside MAC will be inversed relative to reference clock - which is from external PHYs in RMII case, and it rarely happen. - 3. the reference clock, which outputs to TXC pin will be inversed in RMII case - when the reference clock is from MT2712 SoC. -- mediatek,rxc-inverse: boolean property, if present indicates that - 1. rx clock will be inversed in MII/RGMII case. - 2. reference clock will be inversed when arrived at MAC in RMII case, when - the reference clock is from external PHYs. - 3. the inside clock, which be sent to MAC, will be inversed in RMII case when - the reference clock is from MT2712 SoC. -- assigned-clocks: mac_main and ptp_ref clocks -- assigned-clock-parents: parent clocks of the assigned clocks - -Example: - eth: ethernet@1101c000 { - compatible = "mediatek,mt2712-gmac"; - reg = <0 0x1101c000 0 0x1300>; - interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>; - interrupt-names = "macirq"; - phy-mode ="rgmii-rxid"; - mac-address = [00 55 7b b5 7d f7]; - clock-names = "axi", - "apb", - "mac_main", - "ptp_ref", - "rmii_internal"; - clocks = <&pericfg CLK_PERI_GMAC>, - <&pericfg CLK_PERI_GMAC_PCLK>, - <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; - assigned-clocks = <&topckgen CLK_TOP_ETHER_125M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_SEL>, - <&topckgen CLK_TOP_ETHER_50M_RMII_SEL>; - assigned-clock-parents = <&topckgen CLK_TOP_ETHERPLL_125M>, - <&topckgen CLK_TOP_APLL1_D3>, - <&topckgen CLK_TOP_ETHERPLL_50M>; - power-domains = <&scpsys MT2712_POWER_DOMAIN_AUDIO>; - mediatek,pericfg = <&pericfg>; - mediatek,tx-delay-ps = <1530>; - mediatek,rx-delay-ps = <1530>; - mediatek,rmii-rxc; - mediatek,txc-inverse; - mediatek,rxc-inverse; - snps,txpbl = <1>; - snps,rxpbl = <1>; - snps,reset-gpio = <&pio 87 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - };
Documentation/devicetree/bindings/net/mediatek-dwmac.yaml new file +211 -0
211 lines not on this page · raw message
Signature · 1 line
2.25.1
AngeloGioacchino Del Regno
maintainerRe: [PATCH v2 4/5] dt-bindings: net: dwmac: Convert mediatek-dwmac to DT schema
Il 11/11/21 08:12, Biao Huang ha scritto:
Quoted 10 lines
Convert mediatek-dwmac to DT schema, and delete old mediatek-dwmac.txt.
Signed-off-by Biao Huang <[email protected]>--- .../bindings/net/mediatek-dwmac.txt | 91 -------- .../bindings/net/mediatek-dwmac.yaml | 211 ++++++++++++++++++ 2 files changed, 211 insertions(+), 91 deletions(-)delete mode 100644
Documentation/devicetree/bindings/net/mediatek-dwmac.txtcreate mode 100644Documentation/devicetree/bindings/net/mediatek-dwmac.yaml
Thanks for the DT schema conversion!
Anyway, you should split this in two commits: in the first one, you convert the txt documentation to schema, as it is... and in the second one, you add mt8195 bindings.
Re: [PATCH v2 4/5] dt-bindings: net: dwmac: Convert mediatek-dwmac to DT schema
Dear AngeloGioacchino,
Thanks for your comments~
Quoted 16 lines · AngeloGioacchino Del Regno
Il 11/11/21 08:12, Biao Huang ha scritto:
Quoted 9 lines
Convert mediatek-dwmac to DT schema, and delete old mediatek- dwmac.txt.
Signed-off-by Biao Huang <[email protected]>--- .../bindings/net/mediatek-dwmac.txt | 91 -------- .../bindings/net/mediatek-dwmac.yaml | 211 ++++++++++++++++++ 2 files changed, 211 insertions(+), 91 deletions(-)Quoted 5 lines
delete mode 100644
Documentation/devicetree/bindings/net/mediatek-dwmac.txt
create mode 100644Documentation/devicetree/bindings/net/mediatek-dwmac.yaml
Quoted 7 lines
Thanks for the DT schema conversion!
Anyway, you should split this in two commits: in the first one, you convert the
txt documentation to schema, as it is... and in the second one, you add mt8195
bindings.
OK, I'll split it in next send.
Rob Herring
maintainerRe: [PATCH v2 4/5] dt-bindings: net: dwmac: Convert mediatek-dwmac to DT schema
In reply to Biao HuangQuoted 10 lines · Biao Huang
Convert mediatek-dwmac to DT schema, and delete old mediatek-dwmac.txt.
Signed-off-by Biao Huang <[email protected]>--- .../bindings/net/mediatek-dwmac.txt | 91 -------- .../bindings/net/mediatek-dwmac.yaml | 211 ++++++++++++++++++ 2 files changed, 211 insertions(+), 91 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.txt create mode 100644 Documentation/devicetree/bindings/net/mediatek-dwmac.yaml
Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.
Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future.
Full log is available here: https://patchwork.ozlabs.org/patch/1553803
ethernet@1101c000: clock-names: ['axi', 'apb', 'mac_main', 'ptp_ref'] is too short
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
ethernet@1101c000: clocks: [[27, 34], [27, 37], [6, 154], [6, 155]] is too short
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
ethernet@1101c000: compatible: ['mediatek,mt2712-gmac'] does not contain items matching the given schema
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
ethernet@1101c000: compatible: 'oneOf' conditional failed, one must be fixed:
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
Re: [PATCH v2 4/5] dt-bindings: net: dwmac: Convert mediatek-dwmac to DT schema
Dear Rob,
Thanks for your comments~
Quoted 36 lines · Rob Herring
Quoted 12 lines · Biao Huang
Convert mediatek-dwmac to DT schema, and delete old mediatek- dwmac.txt.
Signed-off-by Biao Huang <[email protected]>--- .../bindings/net/mediatek-dwmac.txt | 91 -------- .../bindings/net/mediatek-dwmac.yaml | 211 ++++++++++++++++++ 2 files changed, 211 insertions(+), 91 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/mediatek- dwmac.txt create mode 100644 Documentation/devicetree/bindings/net/mediatek-Quoted 2 lines
dwmac.yamlRunning 'make
dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.Note that it is not yet a requirement to have 0 warnings for
dtbs_check.
This will change in the future.Full log is available here:
https://patchwork.ozlabs.org/patch/1553803ethernet@1101c000: clock-names: ['axi', 'apb', '
mac_main', 'ptp_ref'] is too shortarch/arm64/boot/dts/mediatek/mt2712-evb.dt.yamlethernet@1101c000: clocks: [[27, 34], [27, 37], [6, 154], [6, 155]] is too short
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
Quoted 8 lines
ethernet@1101c000: compatible: ['mediatek,mt2712-gmac'] does not contain items matching the given schema
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yamlethernet@1101c000: compatible: 'oneOf' conditional failed, one must be fixed:
arch/arm64/boot/dts/mediatek/mt2712-evb.dt.yaml
Yes, I should add a dts related patch to fix this issue in next send.
PATCH v2 5/5 arm64: dts: mt8195: add ethernet device node
In reply to Biao HuangThis patch adds device node for mt8195 ethernet.
--- arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 92 +++++++++++++++++++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 70 ++++++++++++++++ 2 files changed, 162 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-evb.dts +92 -0
@@ -5,6 +5,8 @@ */ /dts-v1/; #include "mt8195.dtsi" +#include <dt-bindings/pinctrl/mt8195-pinfunc.h> +#include <dt-bindings/gpio/gpio.h> / { model = "MediaTek MT8195 evaluation board";
@@ -32,6 +34,96 @@ reserved_memory: reserved-memory { }; }; +ð { + phy-mode ="rgmii-rxid"; + phy-handle = <ð_phy0>; + snps,reset-gpio = <&pio 93 GPIO_ACTIVE_HIGH>; + snps,reset-delays-us = <0 10000 10000>; + mediatek,tx-delay-ps = <2030>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <ð_default>; + pinctrl-1 = <ð_sleep>; + status = "okay"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + eth_phy0: eth_phy0@1 { + compatible = "ethernet-phy-id001c.c916"; + reg = <0x1>; + }; + }; +}; + +&pio { + eth_default: eth_default { + txd_pins { + pinmux = <PINMUX_GPIO77__FUNC_GBE_TXD3>, + <PINMUX_GPIO78__FUNC_GBE_TXD2>, + <PINMUX_GPIO79__FUNC_GBE_TXD1>, + <PINMUX_GPIO80__FUNC_GBE_TXD0>; + drive-strength = <MTK_DRIVE_8mA>; + }; + cc_pins { + pinmux = <PINMUX_GPIO85__FUNC_GBE_TXC>, + <PINMUX_GPIO88__FUNC_GBE_TXEN>, + <PINMUX_GPIO87__FUNC_GBE_RXDV>, + <PINMUX_GPIO86__FUNC_GBE_RXC>; + drive-strength = <MTK_DRIVE_8mA>; + }; + rxd_pins { + pinmux = <PINMUX_GPIO81__FUNC_GBE_RXD3>, + <PINMUX_GPIO82__FUNC_GBE_RXD2>, + <PINMUX_GPIO83__FUNC_GBE_RXD1>, + <PINMUX_GPIO84__FUNC_GBE_RXD0>; + }; + mdio_pins { + pinmux = <PINMUX_GPIO89__FUNC_GBE_MDC>, + <PINMUX_GPIO90__FUNC_GBE_MDIO>; + input-enable; + }; + power_pins { + pinmux = <PINMUX_GPIO91__FUNC_GPIO91>, + <PINMUX_GPIO92__FUNC_GPIO92>; + output-high; + }; + }; + + eth_sleep: eth_sleep { + txd_pins { + pinmux = <PINMUX_GPIO77__FUNC_GPIO77>, + <PINMUX_GPIO78__FUNC_GPIO78>, + <PINMUX_GPIO79__FUNC_GPIO79>, + <PINMUX_GPIO80__FUNC_GPIO80>; + }; + cc_pins { + pinmux = <PINMUX_GPIO85__FUNC_GPIO85>, + <PINMUX_GPIO88__FUNC_GPIO88>, + <PINMUX_GPIO87__FUNC_GPIO87>, + <PINMUX_GPIO86__FUNC_GPIO86>; + }; + rxd_pins { + pinmux = <PINMUX_GPIO81__FUNC_GPIO81>, + <PINMUX_GPIO82__FUNC_GPIO82>, + <PINMUX_GPIO83__FUNC_GPIO83>, + <PINMUX_GPIO84__FUNC_GPIO84>; + }; + mdio_pins { + pinmux = <PINMUX_GPIO89__FUNC_GPIO89>, + <PINMUX_GPIO90__FUNC_GPIO90>; + input-disable; + bias-disable; + }; + power_pins { + pinmux = <PINMUX_GPIO91__FUNC_GPIO91>, + <PINMUX_GPIO92__FUNC_GPIO92>; + input-disable; + bias-disable; + }; + }; +}; + &uart0 { status = "okay"; };
arch/arm64/boot/dts/mediatek/mt8195.dtsi +70 -0
76 lines not on this page · raw message
Signature · 1 line
2.25.1
11/11/21 10:12 AM, Biao Huang пишет:
Quoted 9 lines
Changes in v2:
1. fix errors/warnings inmediatek-dwmac.yamlwith upgraded dtschema toolsThis series include 5 patches:
1. add platform level clocks management for dwmac-mediatek
2. resue more common features defined instmmac_platform.c
3. add ethernet entry for mt8195
4. convert mediatek-dwmac.txt tomediatek-dwmac.yaml
5. add ethernet device node for mt8195
all new feature should be sent prefixed with net-next
Quoted 21 lines
Biao Huang (5):
net: stmmac: dwmac-mediatek: add platform level clocks management
net: stmmac: dwmac-mediatek: Reuse more common features
net: stmmac: dwmac-mediatek: add support for mt8195
dt-bindings: net: dwmac: Convert mediatek-dwmac to DT schema
arm64: dts: mt8195: add ethernet device node.../bindings/net/mediatek-dwmac.txt | 91 ----- .../bindings/net/mediatek-dwmac.yaml | 211 ++++++++++++ arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 92 +++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 70 ++++ .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 313 ++++++++++++++++-- 5 files changed, 664 insertions(+), 113 deletions(-)delete mode 100644
Documentation/devicetree/bindings/net/mediatek-dwmac.txtcreate mode 100644Documentation/devicetree/bindings/net/mediatek-dwmac.yaml--
2.18.0
Dear Denis,
Thanks for your comments~
Quoted 6 lines · Denis Kirjanov
11/11/21 10:12 AM, Biao Huang пишет:
Quoted 4 lines
Changes in v2:
1. fix errors/warnings inmediatek-dwmac.yamlwith upgraded dtschema tools
Quoted 8 lines
Quoted 6 lines
This series include 5 patches:
1. add platform level clocks management for dwmac-mediatek
2. resue more common features defined instmmac_platform.c
3. add ethernet entry for mt8195
4. convert mediatek-dwmac.txt tomediatek-dwmac.yaml
5. add ethernet device node for mt8195all new feature should be sent prefixed with net-next
OK, I'll fix it in next version.
Quoted 25 lines
Quoted 25 lines
Biao Huang (5):
net: stmmac: dwmac-mediatek: add platform level clocks
management
net: stmmac: dwmac-mediatek: Reuse more common features
net: stmmac: dwmac-mediatek: add support for mt8195
dt-bindings: net: dwmac: Convert mediatek-dwmac to DT schema
arm64: dts: mt8195: add ethernet device node.../bindings/net/mediatek-dwmac.txt | 91 ----- .../bindings/net/mediatek-dwmac.yaml | 211 ++++++++++++ arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 92 +++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 70 ++++ .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 313 ++++++++++++++++-- 5 files changed, 664 insertions(+), 113 deletions(-)delete mode 100644
Documentation/devicetree/bindings/net/mediatek-dwmac.txt
create mode 100644Documentation/devicetree/bindings/net/mediatek-dwmac.yaml--
2.18.0