Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a4cec72 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: marvell: mvpp2: use phy_interface_mode_is_8023z() helper 



Use the phy_interface_mode_is_8023z() helper for detecting interface
modes that use 802.3z serial encoding.  This is equivalent to testing
for both 1000base-X and 2500base-X.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7194d92b

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+15 −23
Original line number Diff line number Diff line
@@ -1090,9 +1090,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_1000BASEX ||

	    port->phy_interface == PHY_INTERFACE_MODE_2500BASEX) {

	    phy_interface_mode_is_8023z(port->phy_interface) ||

	    port->phy_interface == PHY_INTERFACE_MODE_SGMII) {

		/* 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;
@@ -1122,9 +1121,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_1000BASEX ||

	    port->phy_interface == PHY_INTERFACE_MODE_2500BASEX) {

	    phy_interface_mode_is_8023z(port->phy_interface) ||

	    port->phy_interface == PHY_INTERFACE_MODE_SGMII) {

		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);
@@ -1136,9 +1134,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_1000BASEX ||

	    port->phy_interface == PHY_INTERFACE_MODE_2500BASEX) {

	    phy_interface_mode_is_8023z(port->phy_interface) ||

	    port->phy_interface == PHY_INTERFACE_MODE_SGMII) {

		val = readl(port->base + MVPP22_GMAC_INT_MASK);

		val |= MVPP22_GMAC_INT_MASK_LINK_STAT;

		writel(val, port->base + MVPP22_GMAC_INT_MASK);
@@ -1244,9 +1241,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 ||

	    port->phy_interface == PHY_INTERFACE_MODE_1000BASEX ||

	    port->phy_interface == PHY_INTERFACE_MODE_2500BASEX)

	if (phy_interface_mode_is_8023z(port->phy_interface) ||

	    port->phy_interface == PHY_INTERFACE_MODE_SGMII)

		val |= MVPP2_GMAC_PCS_LB_EN_MASK;

	else

		val &= ~MVPP2_GMAC_PCS_LB_EN_MASK;
@@ -2472,9 +2468,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_1000BASEX ||

		   port->phy_interface == PHY_INTERFACE_MODE_2500BASEX) {

		   phy_interface_mode_is_8023z(port->phy_interface) ||

		   port->phy_interface == PHY_INTERFACE_MODE_SGMII) {

		val = readl(port->base + MVPP22_GMAC_INT_STAT);

		if (val & MVPP22_GMAC_INT_STAT_LINK) {

			event = true;
@@ -4566,8 +4561,7 @@ 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 (state->interface == PHY_INTERFACE_MODE_1000BASEX ||

	    state->interface == PHY_INTERFACE_MODE_2500BASEX) {

	if (phy_interface_mode_is_8023z(state->interface)) {

		/* 1000BaseX and 2500BaseX ports cannot negotiate speed nor can

		 * they negotiate duplex: they are always operating with a fixed

		 * speed of 1000/2500Mbps in full duplex, so force 1000/2500
@@ -4587,9 +4581,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 ||

	    state->interface == PHY_INTERFACE_MODE_1000BASEX ||

	    state->interface == PHY_INTERFACE_MODE_2500BASEX) {

	if (phy_interface_mode_is_8023z(state->interface) ||

	    state->interface == PHY_INTERFACE_MODE_SGMII) {

		an |= MVPP2_GMAC_IN_BAND_AUTONEG;

		ctrl2 |= MVPP2_GMAC_INBAND_AN_MASK | MVPP2_GMAC_PCS_ENABLE_MASK;
@@ -4650,9 +4643,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_1000BASEX ||

		 state->interface == PHY_INTERFACE_MODE_2500BASEX)

		 phy_interface_mode_is_8023z(state->interface) ||

		 state->interface == PHY_INTERFACE_MODE_SGMII)

		mvpp2_gmac_config(port, mode, state);



	if (port->priv->hw_version == MVPP21 && port->flags & MVPP2_F_LOOPBACK)