net: marvell: mvpp2: add mvpp2_is_xlg() helper
Subsystems (3)
PATCH 1/2 net: marvell: mvpp2: add mvpp2_is_xlg() helper
Add a mvpp2_is_xlg() helper to identify whether the interface mode should be using the XLGMAC rather than the GMAC.
Signed-off-by Russell King <[email protected]>
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +9 -11
@@ -965,6 +965,11 @@ mvpp2_shared_interrupt_mask_unmask(struct mvpp2_port *port, bool mask) }/* Port configuration routines */ +static bool mvpp2_is_xlg (phy_interface_t interface) +{ +return interface ==PHY_INTERFACE_MODE_10GKR || + interface ==PHY_INTERFACE_MODE_XAUI ; +}static void mvpp22_gop_init_rgmii (struct mvpp2_port *port) {
@@ -1196,9 +1201,7 @@ static void mvpp2_port_enable(struct mvpp2_port *port)u32 val;/* Only GOP port 0 has an XLG MAC */ -if (port->gop_id ==0 && - (port->phy_interface ==PHY_INTERFACE_MODE_XAUI || - port->phy_interface ==PHY_INTERFACE_MODE_10GKR )) { +if (port->gop_id ==0 &&mvpp2_is_xlg (port->phy_interface)) { val =readl (port->base +MVPP22_XLG_CTRL0_REG ); val |=MVPP22_XLG_CTRL0_PORT_EN |MVPP22_XLG_CTRL0_MAC_RESET_DIS ;
@@ -1217,9 +1220,7 @@ static void mvpp2_port_disable(struct mvpp2_port *port)u32 val;/* Only GOP port 0 has an XLG MAC */ -if (port->gop_id ==0 && - (port->phy_interface ==PHY_INTERFACE_MODE_XAUI || - port->phy_interface ==PHY_INTERFACE_MODE_10GKR )) { +if (port->gop_id ==0 &&mvpp2_is_xlg (port->phy_interface)) { val =readl (port->base +MVPP22_XLG_CTRL0_REG ); val &= ~MVPP22_XLG_CTRL0_PORT_EN ;writel (val, port->base +MVPP22_XLG_CTRL0_REG );
@@ -3161,8 +3162,7 @@ static void mvpp22_mode_reconfigure(struct mvpp2_port *port) ctrl3 =readl (port->base +MVPP22_XLG_CTRL3_REG ); ctrl3 &= ~MVPP22_XLG_CTRL3_MACMODESELECT_MASK ; -if (port->phy_interface ==PHY_INTERFACE_MODE_XAUI || - port->phy_interface ==PHY_INTERFACE_MODE_10GKR ) +if (mvpp2_is_xlg (port->phy_interface)) ctrl3 |=MVPP22_XLG_CTRL3_MACMODESELECT_10G ;else ctrl3 |=MVPP22_XLG_CTRL3_MACMODESELECT_GMAC ;
@@ -3170,9 +3170,7 @@ static void mvpp22_mode_reconfigure(struct mvpp2_port *port)writel (ctrl3, port->base +MVPP22_XLG_CTRL3_REG ); } -if (port->gop_id ==0 && - (port->phy_interface ==PHY_INTERFACE_MODE_XAUI || - port->phy_interface ==PHY_INTERFACE_MODE_10GKR )) +if (port->gop_id ==0 &&mvpp2_is_xlg (port->phy_interface))mvpp2_xlg_max_rx_size_set (port);else mvpp2_gmac_max_rx_size_set (port);
Signature · 1 line
2.7.4
Hello Russell,
Quoted 4 lines · On Mon, 11 Feb 2019 10:23:10 +0000 Russell King <[email protected]>…
Add a
mvpp2_is_xlg()helper to identify whether the interface mode should be using the XLGMAC rather than the GMAC.Signed-off-by Russell King <[email protected]>
Reviewed-by Maxime Chevallier <[email protected]>
Thanks,
Maxime
From: Russell King <[email protected]>
Date: Mon, 11 Feb 2019 10:23:10 +0000
Quoted 4 lines
Add a
mvpp2_is_xlg()helper to identify whether the interface mode should be using the XLGMAC rather than the GMAC.Signed-off-by Russell King <[email protected]>
Applied.