renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

net: mvpp2: convert to use mac_prepare()/mac_finish()

Browse Source 
Convert mvpp2 to use the mac_prepare() and mac_finish() methods in
preparation to converting mvpp2 to split-PCS support.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2020-09-01 14:48:17 +01:00 committed by David S. Miller
parent 87745c7481
commit bfe301ebbc
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
View File

@ -5691,31 +5691,35 @@ static void mvpp2_gmac_config(struct mvpp2_port *port, unsigned int mode,
} }
} }
static void mvpp2_mac_config(struct phylink_config *config, unsigned int mode, static int mvpp2_mac_prepare(struct phylink_config *config, unsigned int mode,
const struct phylink_link_state *state) phy_interface_t interface)
{ {
struct mvpp2_port *port = mvpp2_phylink_to_port(config); struct mvpp2_port *port = mvpp2_phylink_to_port(config);
bool change_interface = port->phy_interface != state->interface;
/* Check for invalid configuration */ /* Check for invalid configuration */
if (mvpp2_is_xlg(state->interface) && port->gop_id != 0) { if (mvpp2_is_xlg(interface) && port->gop_id != 0) {
netdev_err(port->dev, "Invalid mode on %s\n", port->dev->name); netdev_err(port->dev, "Invalid mode on %s\n", port->dev->name);
return; return -EINVAL;
} }
/* Make sure the port is disabled when reconfiguring the mode */ /* Make sure the port is disabled when reconfiguring the mode */
mvpp2_port_disable(port); mvpp2_port_disable(port);
if (port->priv->hw_version == MVPP22 && change_interface) { if (port->priv->hw_version == MVPP22 &&
port->phy_interface != interface) {
mvpp22_gop_mask_irq(port); mvpp22_gop_mask_irq(port);
port->phy_interface = state->interface;
/* Reconfigure the serdes lanes */
phy_power_off(port->comphy); phy_power_off(port->comphy);
mvpp22_mode_reconfigure(port);
} }
return 0;
}
static void mvpp2_mac_config(struct phylink_config *config, unsigned int mode,
const struct phylink_link_state *state)
{
struct mvpp2_port *port = mvpp2_phylink_to_port(config);
/* mac (re)configuration */ /* mac (re)configuration */
if (mvpp2_is_xlg(state->interface)) if (mvpp2_is_xlg(state->interface))
mvpp2_xlg_config(port, mode, state); mvpp2_xlg_config(port, mode, state);
@ -5726,11 +5730,27 @@ static void mvpp2_mac_config(struct phylink_config *config, unsigned int mode,
if (port->priv->hw_version == MVPP21 && port->flags & MVPP2_F_LOOPBACK) if (port->priv->hw_version == MVPP21 && port->flags & MVPP2_F_LOOPBACK)
mvpp2_port_loopback_set(port, state); mvpp2_port_loopback_set(port, state);
}
if (port->priv->hw_version == MVPP22 && change_interface) static int mvpp2_mac_finish(struct phylink_config *config, unsigned int mode,
phy_interface_t interface)
{
struct mvpp2_port *port = mvpp2_phylink_to_port(config);
if (port->priv->hw_version == MVPP22 &&
port->phy_interface != interface) {
port->phy_interface = interface;
/* Reconfigure the serdes lanes */
mvpp22_mode_reconfigure(port);
/* Unmask interrupts */
mvpp22_gop_unmask_irq(port); mvpp22_gop_unmask_irq(port);
}
mvpp2_port_enable(port); mvpp2_port_enable(port);
return 0;
} }
static void mvpp2_mac_link_up(struct phylink_config *config, static void mvpp2_mac_link_up(struct phylink_config *config,
@ -5829,7 +5849,9 @@ static const struct phylink_mac_ops mvpp2_phylink_ops = {
.validate = mvpp2_phylink_validate, .validate = mvpp2_phylink_validate,
.mac_pcs_get_state = mvpp2_phylink_mac_pcs_get_state, .mac_pcs_get_state = mvpp2_phylink_mac_pcs_get_state,
.mac_an_restart = mvpp2_mac_an_restart, .mac_an_restart = mvpp2_mac_an_restart,
.mac_prepare = mvpp2_mac_prepare,
.mac_config = mvpp2_mac_config, .mac_config = mvpp2_mac_config,
.mac_finish = mvpp2_mac_finish,
.mac_link_up = mvpp2_mac_link_up, .mac_link_up = mvpp2_mac_link_up,
.mac_link_down = mvpp2_mac_link_down, .mac_link_down = mvpp2_mac_link_down,
}; };
@ -5844,7 +5866,11 @@ static void mvpp2_acpi_start(struct mvpp2_port *port)
struct phylink_link_state state = { struct phylink_link_state state = {
.interface = port->phy_interface, .interface = port->phy_interface,
}; };
mvpp2_mac_prepare(&port->phylink_config, MLO_AN_INBAND,
port->phy_interface);
mvpp2_mac_config(&port->phylink_config, MLO_AN_INBAND, &state); mvpp2_mac_config(&port->phylink_config, MLO_AN_INBAND, &state);
mvpp2_mac_finish(&port->phylink_config, MLO_AN_INBAND,
port->phy_interface);
mvpp2_mac_link_up(&port->phylink_config, NULL, mvpp2_mac_link_up(&port->phylink_config, NULL,
MLO_AN_INBAND, port->phy_interface, MLO_AN_INBAND, port->phy_interface,
SPEED_UNKNOWN, DUPLEX_UNKNOWN, false, false); SPEED_UNKNOWN, DUPLEX_UNKNOWN, false, false);