net: mvpp2: 1000baseX support
This patch adds the 1000Base-X PHY mode support in the Marvell PPv2 driver. 1000Base-X is quite close the SGMII and uses nearly the same code path. Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Antoine Tenart
David S. Miller
parent
9ad8bd819b
commit
d97c9f4ab0
@ -4870,6 +4870,7 @@ static int mvpp22_gop_init(struct mvpp2_port *port)
|
||||
mvpp22_gop_init_rgmii(port);
|
||||
break;
|
||||
case PHY_INTERFACE_MODE_SGMII:
|
||||
case PHY_INTERFACE_MODE_1000BASEX:
|
||||
mvpp22_gop_init_sgmii(port);
|
||||
break;
|
||||
case PHY_INTERFACE_MODE_10GKR:
|
||||
@ -4907,7 +4908,8 @@ static void mvpp22_gop_unmask_irq(struct mvpp2_port *port)
|
||||
u32 val;
|
||||
|
||||
if (phy_interface_mode_is_rgmii(port->phy_interface) ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_SGMII) {
|
||||
port->phy_interface == PHY_INTERFACE_MODE_SGMII ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_1000BASEX) {
|
||||
/* Enable the GMAC link status irq for this port */
|
||||
val = readl(port->base + MVPP22_GMAC_INT_SUM_MASK);
|
||||
val |= MVPP22_GMAC_INT_SUM_MASK_LINK_STAT;
|
||||
@ -4937,7 +4939,8 @@ static void mvpp22_gop_mask_irq(struct mvpp2_port *port)
|
||||
}
|
||||
|
||||
if (phy_interface_mode_is_rgmii(port->phy_interface) ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_SGMII) {
|
||||
port->phy_interface == PHY_INTERFACE_MODE_SGMII ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_1000BASEX) {
|
||||
val = readl(port->base + MVPP22_GMAC_INT_SUM_MASK);
|
||||
val &= ~MVPP22_GMAC_INT_SUM_MASK_LINK_STAT;
|
||||
writel(val, port->base + MVPP22_GMAC_INT_SUM_MASK);
|
||||
@ -4949,7 +4952,8 @@ static void mvpp22_gop_setup_irq(struct mvpp2_port *port)
|
||||
u32 val;
|
||||
|
||||
if (phy_interface_mode_is_rgmii(port->phy_interface) ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_SGMII) {
|
||||
port->phy_interface == PHY_INTERFACE_MODE_SGMII ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_1000BASEX) {
|
||||
val = readl(port->base + MVPP22_GMAC_INT_MASK);
|
||||
val |= MVPP22_GMAC_INT_MASK_LINK_STAT;
|
||||
writel(val, port->base + MVPP22_GMAC_INT_MASK);
|
||||
@ -4974,6 +4978,7 @@ static int mvpp22_comphy_init(struct mvpp2_port *port)
|
||||
|
||||
switch (port->phy_interface) {
|
||||
case PHY_INTERFACE_MODE_SGMII:
|
||||
case PHY_INTERFACE_MODE_1000BASEX:
|
||||
mode = PHY_MODE_SGMII;
|
||||
break;
|
||||
case PHY_INTERFACE_MODE_10GKR:
|
||||
@ -5056,7 +5061,8 @@ static void mvpp2_port_loopback_set(struct mvpp2_port *port,
|
||||
else
|
||||
val &= ~MVPP2_GMAC_GMII_LB_EN_MASK;
|
||||
|
||||
if (port->phy_interface == PHY_INTERFACE_MODE_SGMII)
|
||||
if (port->phy_interface == PHY_INTERFACE_MODE_SGMII ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_1000BASEX)
|
||||
val |= MVPP2_GMAC_PCS_LB_EN_MASK;
|
||||
else
|
||||
val &= ~MVPP2_GMAC_PCS_LB_EN_MASK;
|
||||
@ -6266,7 +6272,8 @@ static irqreturn_t mvpp2_link_status_isr(int irq, void *dev_id)
|
||||
link = true;
|
||||
}
|
||||
} else if (phy_interface_mode_is_rgmii(port->phy_interface) ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_SGMII) {
|
||||
port->phy_interface == PHY_INTERFACE_MODE_SGMII ||
|
||||
port->phy_interface == PHY_INTERFACE_MODE_1000BASEX) {
|
||||
val = readl(port->base + MVPP22_GMAC_INT_STAT);
|
||||
if (val & MVPP22_GMAC_INT_STAT_LINK) {
|
||||
event = true;
|
||||
@ -8032,20 +8039,25 @@ static void mvpp2_phylink_validate(struct net_device *dev,
|
||||
phylink_set(mask, Pause);
|
||||
phylink_set(mask, Asym_Pause);
|
||||
|
||||
phylink_set(mask, 10baseT_Half);
|
||||
phylink_set(mask, 10baseT_Full);
|
||||
phylink_set(mask, 100baseT_Half);
|
||||
phylink_set(mask, 100baseT_Full);
|
||||
phylink_set(mask, 1000baseT_Full);
|
||||
phylink_set(mask, 10000baseT_Full);
|
||||
|
||||
if (state->interface == PHY_INTERFACE_MODE_10GKR) {
|
||||
switch (state->interface) {
|
||||
case PHY_INTERFACE_MODE_10GKR:
|
||||
phylink_set(mask, 10000baseCR_Full);
|
||||
phylink_set(mask, 10000baseSR_Full);
|
||||
phylink_set(mask, 10000baseLR_Full);
|
||||
phylink_set(mask, 10000baseLRM_Full);
|
||||
phylink_set(mask, 10000baseER_Full);
|
||||
phylink_set(mask, 10000baseKR_Full);
|
||||
/* Fall-through */
|
||||
default:
|
||||
phylink_set(mask, 10baseT_Half);
|
||||
phylink_set(mask, 10baseT_Full);
|
||||
phylink_set(mask, 100baseT_Half);
|
||||
phylink_set(mask, 100baseT_Full);
|
||||
phylink_set(mask, 10000baseT_Full);
|
||||
/* Fall-through */
|
||||
case PHY_INTERFACE_MODE_1000BASEX:
|
||||
phylink_set(mask, 1000baseT_Full);
|
||||
phylink_set(mask, 1000baseX_Full);
|
||||
}
|
||||
|
||||
bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);
|
||||
@ -8084,12 +8096,18 @@ static void mvpp2_gmac_link_state(struct mvpp2_port *port,
|
||||
state->link = !!(val & MVPP2_GMAC_STATUS0_LINK_UP);
|
||||
state->duplex = !!(val & MVPP2_GMAC_STATUS0_FULL_DUPLEX);
|
||||
|
||||
if (val & MVPP2_GMAC_STATUS0_GMII_SPEED)
|
||||
switch (port->phy_interface) {
|
||||
case PHY_INTERFACE_MODE_1000BASEX:
|
||||
state->speed = SPEED_1000;
|
||||
else if (val & MVPP2_GMAC_STATUS0_MII_SPEED)
|
||||
state->speed = SPEED_100;
|
||||
else
|
||||
state->speed = SPEED_10;
|
||||
break;
|
||||
default:
|
||||
if (val & MVPP2_GMAC_STATUS0_GMII_SPEED)
|
||||
state->speed = SPEED_1000;
|
||||
else if (val & MVPP2_GMAC_STATUS0_MII_SPEED)
|
||||
state->speed = SPEED_100;
|
||||
else
|
||||
state->speed = SPEED_10;
|
||||
}
|
||||
|
||||
state->pause = 0;
|
||||
if (val & MVPP2_GMAC_STATUS0_RX_PAUSE)
|
||||
@ -8181,8 +8199,18 @@ static void mvpp2_gmac_config(struct mvpp2_port *port, unsigned int mode,
|
||||
ctrl0 &= ~MVPP2_GMAC_PORT_TYPE_MASK;
|
||||
ctrl2 &= ~(MVPP2_GMAC_PORT_RESET_MASK | MVPP2_GMAC_PCS_ENABLE_MASK);
|
||||
|
||||
if (!phy_interface_mode_is_rgmii(state->interface))
|
||||
if (state->interface == PHY_INTERFACE_MODE_1000BASEX) {
|
||||
/* 1000BaseX port cannot negotiate speed nor can it negotiate
|
||||
* duplex: they are always operating with a fixed speed of
|
||||
* 1000Mbps in full duplex, so force 1000 speed and full duplex
|
||||
* here.
|
||||
*/
|
||||
ctrl0 |= MVPP2_GMAC_PORT_TYPE_MASK;
|
||||
an |= MVPP2_GMAC_CONFIG_GMII_SPEED |
|
||||
MVPP2_GMAC_CONFIG_FULL_DUPLEX;
|
||||
} else if (!phy_interface_mode_is_rgmii(state->interface)) {
|
||||
an |= MVPP2_GMAC_AN_SPEED_EN | MVPP2_GMAC_FLOW_CTRL_AUTONEG;
|
||||
}
|
||||
|
||||
if (state->duplex)
|
||||
an |= MVPP2_GMAC_CONFIG_FULL_DUPLEX;
|
||||
@ -8191,7 +8219,8 @@ static void mvpp2_gmac_config(struct mvpp2_port *port, unsigned int mode,
|
||||
if (phylink_test(state->advertising, Asym_Pause))
|
||||
an |= MVPP2_GMAC_FC_ADV_ASM_EN;
|
||||
|
||||
if (state->interface == PHY_INTERFACE_MODE_SGMII) {
|
||||
if (state->interface == PHY_INTERFACE_MODE_SGMII ||
|
||||
state->interface == PHY_INTERFACE_MODE_1000BASEX) {
|
||||
an |= MVPP2_GMAC_IN_BAND_AUTONEG;
|
||||
ctrl2 |= MVPP2_GMAC_INBAND_AN_MASK | MVPP2_GMAC_PCS_ENABLE_MASK;
|
||||
|
||||
@ -8256,7 +8285,8 @@ static void mvpp2_mac_config(struct net_device *dev, unsigned int mode,
|
||||
if (state->interface == PHY_INTERFACE_MODE_10GKR)
|
||||
mvpp2_xlg_config(port, mode, state);
|
||||
else if (phy_interface_mode_is_rgmii(state->interface) ||
|
||||
state->interface == PHY_INTERFACE_MODE_SGMII)
|
||||
state->interface == PHY_INTERFACE_MODE_SGMII ||
|
||||
state->interface == PHY_INTERFACE_MODE_1000BASEX)
|
||||
mvpp2_gmac_config(port, mode, state);
|
||||
|
||||
if (port->priv->hw_version == MVPP21 && port->flags & MVPP2_F_LOOPBACK)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user