ravb: Add MII support for R-Car V4M
Subsystems (3)
v2 cover ravb: Add MII support for R-Car V4M
Hi all,
All EtherAVB instances on R-Car Gen3/Gen4 SoCs support the RGMII interface. In addition, the first two EtherAVB instances on R-Car V4M also support the MII interface, but this is not yet supported by the driver. This patch series adds support for MII on R-Car Gen4, after the customary cleanup.
Changes compared to v1[1]:
- New patch "ravb: Improve ravb_hw_info instance order",
- Add Reviewed-by,
- Rename ravb_emac_init_rcar_apsr() to ravb_emac_init_rcar_gen4(),
- Restrict MII support to R-Car Gen4 by adding a new ravb_hw_info instance.
The corresponding pin control support is available in [2].
Compile-tested only, as all AVB interfaces on the Gray Hawk Single development board are connected to RGMII PHYs.
No regressions on R-Car V4H.
Thanks for your comments!
[1] "[PATCH/RFC] net: ravb: Add MII support for R-Car V4M"
https://lore.kernel.org/f0ef3e00aec461beb33869ab69ccb44a23d78f51.1718378166.git.geert+renesas@glider.be
[2] "[PATCH/RFC] pinctrl: renesas: r8a779h0: Add AVB MII pins and groups"
https://lore.kernel.org/4a0a12227f2145ef53b18bc08f45b19dcd745fc6.1718378739.git.geert+renesas@glider.be/
Geert Uytterhoeven (2):
ravb: Improve ravb_hw_info instance order
ravb: Add MII support for R-Car V4M
drivers/net/ethernet/renesas/ravb.h | 1 + drivers/net/ethernet/renesas/ravb_main.c | 45 +++++++++++++++++++++--- 2 files changed, 41 insertions(+), 5 deletions(-)
Signature · 12 lines
2.34.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsPATCH v2 1/2 ravb: Improve ravb_hw_info instance order
Move ravb_gen2_hw_info before ravb_gen3_hw_info to match ravb_match_table[] order.
---
v2:
- New.
--- drivers/net/ethernet/renesas/ravb_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/ethernet/renesas/ravb_main.c +9 -9
@@ -2652,7 +2652,7 @@ static int ravb_mdio_release(struct ravb_private *priv)return 0 ; } -static const struct ravb_hw_info ravb_gen3_hw_info = { +static const struct ravb_hw_info ravb_gen2_hw_info = { .receive = ravb_rx_rcar, .set_rate = ravb_set_rate_rcar, .set_feature = ravb_set_features_rcar,
@@ -2668,16 +2668,13 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { .rx_buffer_size = SZ_2K + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)), .rx_desc_size = sizeof(struct ravb_ex_rx_desc), - .internal_delay = 1, - .tx_counters = 1, - .multi_irqs = 1, - .irq_en_dis = 1, - .ccc_gac = 1, + .aligned_tx = 1, + .gptp = 1, .nc_queues = 1, .magic_pkt = 1, }; -static const struct ravb_hw_info ravb_gen2_hw_info = { +static const struct ravb_hw_info ravb_gen3_hw_info = { .receive = ravb_rx_rcar, .set_rate = ravb_set_rate_rcar, .set_feature = ravb_set_features_rcar,
@@ -2693,8 +2690,11 @@ static const struct ravb_hw_info ravb_gen2_hw_info = { .rx_buffer_size = SZ_2K + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)), .rx_desc_size = sizeof(struct ravb_ex_rx_desc), - .aligned_tx = 1, - .gptp = 1, + .internal_delay = 1, + .tx_counters = 1, + .multi_irqs = 1, + .irq_en_dis = 1, + .ccc_gac = 1, .nc_queues = 1, .magic_pkt = 1, };
Signature · 1 line
2.34.1
Re: [PATCH net-next v2 1/2] ravb: Improve ravb_hw_info instance order
Hi Geert,
Thanks for your work.
Quoted 4 lines · Geert Uytterhoeven
Move
ravb_gen2_hw_infobeforeravb_gen3_hw_infoto match ravb_match_table[] order.Signed-off-by Geert Uytterhoeven <[email protected]>
Quoted 57 lines
---
v2:
- New.--- drivers/net/ethernet/renesas/ravb_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)drivers/net/ethernet/renesas/ravb_main.c +9
-9@@ -2652,7 +2652,7 @@ static int ravb_mdio_release(struct ravb_private *priv)return 0 ; } -static const struct ravb_hw_info ravb_gen3_hw_info = { +static const struct ravb_hw_info ravb_gen2_hw_info = { .receive = ravb_rx_rcar, .set_rate = ravb_set_rate_rcar, .set_feature = ravb_set_features_rcar,@@ -2668,16 +2668,13 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { .rx_buffer_size = SZ_2K + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)), .rx_desc_size = sizeof(struct ravb_ex_rx_desc), - .internal_delay = 1, - .tx_counters = 1, - .multi_irqs = 1, - .irq_en_dis = 1, - .ccc_gac = 1, + .aligned_tx = 1, + .gptp = 1, .nc_queues = 1, .magic_pkt = 1, }; -static const struct ravb_hw_info ravb_gen2_hw_info = { +static const struct ravb_hw_info ravb_gen3_hw_info = { .receive = ravb_rx_rcar, .set_rate = ravb_set_rate_rcar, .set_feature = ravb_set_features_rcar,@@ -2693,8 +2690,11 @@ static const struct ravb_hw_info ravb_gen2_hw_info = { .rx_buffer_size = SZ_2K + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)), .rx_desc_size = sizeof(struct ravb_ex_rx_desc), - .aligned_tx = 1, - .gptp = 1, + .internal_delay = 1, + .tx_counters = 1, + .multi_irqs = 1, + .irq_en_dis = 1, + .ccc_gac = 1, .nc_queues = 1, .magic_pkt = 1, };Signature · 1 line
2.34.1
Signature · 2 lines
Kind Regards, Niklas Söderlund
Re: [PATCH net-next v2 1/2] ravb: Improve ravb_hw_info instance order
In reply to Geert UytterhoevenQuoted 4 lines · Geert Uytterhoeven
Move
ravb_gen2_hw_infobeforeravb_gen3_hw_infoto match ravb_match_table[] order.Signed-off-by Geert Uytterhoeven <[email protected]>
[...]
MBR, Sergey
PATCH v2 2/2 ravb: Add MII support for R-Car V4M
In reply to Geert UytterhoevenAll EtherAVB instances on R-Car Gen3/Gen4 SoCs support the RGMII interface. In addition, the first two EtherAVB instances on R-Car V4M also support the MII interface, but this is not yet supported by the driver.
Add support for MII on R-Car Gen4 by adding an R-Car Gen4-specific EMAC initialization function that selects the MII clock instead of the RGMII clock when the PHY interface is MII. Note that all implementations of EtherAVB on R-Car Gen4 SoCs have the APSR register, but only MII-capable instances are documented to have the MIISELECT bit, which has a documented value of zero when reserved.
---
v2:
- Add Reviewed-by,
- Rename ravb_emac_init_rcar_apsr() to ravb_emac_init_rcar_gen4(),
- Restrict MII support to R-Car Gen4 by adding a new ravb_hw_info instance.
--- drivers/net/ethernet/renesas/ravb.h | 1 + drivers/net/ethernet/renesas/ravb_main.c | 37 +++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-)
drivers/net/ethernet/renesas/ravb.h +1 -0
@@ -258,6 +258,7 @@ enum APSR_BIT {APSR_CMSW =0x00000010 ,APSR_RDM =0x00002000 ,APSR_TDM =0x00004000 , + APSR_MIISELECT = 0x01000000, /* R-Car V4M only */ };/* RCR */
drivers/net/ethernet/renesas/ravb_main.c +36 -1
@@ -579,6 +579,16 @@ static void ravb_emac_init_rcar(struct net_device *ndev)ravb_write (ndev,ECSIPR_ICDIP |ECSIPR_MPDIP |ECSIPR_LCHNGIP ,ECSIPR ); } +static void ravb_emac_init_rcar_gen4 (struct net_device *ndev) +{ +struct ravb_private *priv =netdev_priv (ndev); +bool mii = priv->phy_interface ==PHY_INTERFACE_MODE_MII ; + +ravb_modify (ndev,APSR ,APSR_MIISELECT , mii ?APSR_MIISELECT :0 ); + +ravb_emac_init_rcar (ndev); +} +/* E-MAC init function */ static void ravb_emac_init (struct net_device *ndev) {
@@ -2699,6 +2709,31 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { .magic_pkt = 1, }; +static const struct ravb_hw_info ravb_gen4_hw_info = { + .receive = ravb_rx_rcar, + .set_rate = ravb_set_rate_rcar, + .set_feature = ravb_set_features_rcar, + .dmac_init = ravb_dmac_init_rcar, + .emac_init = ravb_emac_init_rcar_gen4, + .gstrings_stats = ravb_gstrings_stats, + .gstrings_size =sizeof (ravb_gstrings_stats), + .net_hw_features =NETIF_F_RXCSUM , + .net_features =NETIF_F_RXCSUM , + .stats_len =ARRAY_SIZE (ravb_gstrings_stats), + .tccr_mask =TCCR_TSRQ0 |TCCR_TSRQ1 |TCCR_TSRQ2 |TCCR_TSRQ3 , + .rx_max_frame_size =SZ_2K , + .rx_buffer_size =SZ_2K + +SKB_DATA_ALIGN (sizeof (struct skb_shared_info )), + .rx_desc_size =sizeof (struct ravb_ex_rx_desc ), + .internal_delay =1 , + .tx_counters =1 , + .multi_irqs =1 , + .irq_en_dis =1 , + .ccc_gac =1 , + .nc_queues =1 , + .magic_pkt =1 , +}; +static const struct ravb_hw_info ravb_rzv2m_hw_info = { .receive = ravb_rx_rcar, .set_rate = ravb_set_rate_rcar,
@@ -2751,7 +2786,7 @@ static const struct of_device_id ravb_match_table[] = { { .compatible = "renesas,etheravb-rcar-gen2", .data = &ravb_gen2_hw_info }, { .compatible = "renesas,etheravb-r8a7795", .data = &ravb_gen3_hw_info }, { .compatible = "renesas,etheravb-rcar-gen3", .data = &ravb_gen3_hw_info }, - { .compatible = "renesas,etheravb-rcar-gen4", .data = &ravb_gen3_hw_info }, + { .compatible = "renesas,etheravb-rcar-gen4", .data = &ravb_gen4_hw_info }, { .compatible = "renesas,etheravb-rzv2m", .data = &ravb_rzv2m_hw_info }, { .compatible = "renesas,rzg2l-gbeth", .data = &gbeth_hw_info }, { }
Signature · 1 line
2.34.1
Quoted 12 lines · Geert Uytterhoeven
All EtherAVB instances on R-Car Gen3/Gen4 SoCs support the RGMII interface. In addition, the first two EtherAVB instances on R-Car V4M also support the MII interface, but this is not yet supported by the driver.
Add support for MII on R-Car Gen4 by adding an R-Car Gen4-specific EMAC initialization function that selects the MII clock instead of the RGMII clock when the PHY interface is MII. Note that all implementations of EtherAVB on R-Car Gen4 SoCs have the APSR register, but only MII-capable instances are documented to have the MIISELECT bit, which has a documented value of zero when reserved.
Quoted 2 lines
Signed-off-by Geert Uytterhoeven <[email protected]>Reviewed-by Niklas Söderlund <[email protected]>
[...]
MBR, Sergey
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Mon, 24 Jun 2024 15:25:23 +0200 you wrote:
Hi all,
All EtherAVB instances on R-Car Gen3/Gen4 SoCs support the RGMII interface. In addition, the first two EtherAVB instances on R-Car V4M also support the MII interface, but this is not yet supported by the driver. This patch series adds support for MII on R-Car Gen4, after the customary cleanup.
[...]
Here is the summary with links:
- [net-next,v2,1/2] ravb: Improve ravb_hw_info instance order
https://git.kernel.org/netdev/net-next/c/8d653d26ffc7 - [net-next,v2,2/2] ravb: Add MII support for R-Car V4M https://git.kernel.org/netdev/net-next/c/6e0713cc8206
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html