| Message ID | 20230616111414.1578-1-josua@solid-run.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9a43827e876c9a071826cc81783aa2222b020f1d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: dpaa2-mac: add 25gbase-r support | expand |
On Fri, Jun 16, 2023 at 02:14:14PM +0300, Josua Mayer wrote: > Layerscape MACs support 25Gbps network speed with dpmac "CAUI" mode. > Add the mappings between DPMAC_ETH_IF_* and HY_INTERFACE_MODE_*, as well Missing "P" for "PHY_". > as the 25000 mac capability. > > Tested on SolidRun LX2162a Clearfog, serdes 1 protocol 18. > > Signed-off-by: Josua Mayer <josua@solid-run.com> Otherwise, Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Thanks!
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 16 Jun 2023 14:14:14 +0300 you wrote: > Layerscape MACs support 25Gbps network speed with dpmac "CAUI" mode. > Add the mappings between DPMAC_ETH_IF_* and HY_INTERFACE_MODE_*, as well > as the 25000 mac capability. > > Tested on SolidRun LX2162a Clearfog, serdes 1 protocol 18. > > Signed-off-by: Josua Mayer <josua@solid-run.com> > > [...] Here is the summary with links: - net: dpaa2-mac: add 25gbase-r support https://git.kernel.org/netdev/net/c/9a43827e876c You are awesome, thank you!
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c index d860d9fe73af..a69bb22c37ea 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c @@ -54,6 +54,9 @@ static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode) case DPMAC_ETH_IF_XFI: *if_mode = PHY_INTERFACE_MODE_10GBASER; break; + case DPMAC_ETH_IF_CAUI: + *if_mode = PHY_INTERFACE_MODE_25GBASER; + break; default: return -EINVAL; } @@ -79,6 +82,8 @@ static enum dpmac_eth_if dpmac_eth_if_mode(phy_interface_t if_mode) return DPMAC_ETH_IF_XFI; case PHY_INTERFACE_MODE_1000BASEX: return DPMAC_ETH_IF_1000BASEX; + case PHY_INTERFACE_MODE_25GBASER: + return DPMAC_ETH_IF_CAUI; default: return DPMAC_ETH_IF_MII; } @@ -415,7 +420,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) mac->phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE | MAC_10FD | MAC_100FD | MAC_1000FD | MAC_2500FD | MAC_5000FD | - MAC_10000FD; + MAC_10000FD | MAC_25000FD; dpaa2_mac_set_supported_interfaces(mac);
Layerscape MACs support 25Gbps network speed with dpmac "CAUI" mode. Add the mappings between DPMAC_ETH_IF_* and HY_INTERFACE_MODE_*, as well as the 25000 mac capability. Tested on SolidRun LX2162a Clearfog, serdes 1 protocol 18. Signed-off-by: Josua Mayer <josua@solid-run.com> --- drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)