Commit d5b16264 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: mvpp2: update PCS driver to use neg_mode 



Update mvpp2's embedded PCS drivers to use neg_mode rather than the
mode argument, remembering to update the ACPI path as well. As there
are no pcs_link_up() methods, this only affects the two pcs_config()
methods.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1qA8EJ-00EaFx-P6@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 140d1002

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

+8 −6
Original line number Diff line number Diff line
@@ -6168,8 +6168,7 @@ static void mvpp2_xlg_pcs_get_state(struct phylink_pcs *pcs, 
		state->pause |= MLO_PAUSE_RX;

}



static int mvpp2_xlg_pcs_config(struct phylink_pcs *pcs,

				unsigned int mode,

static int mvpp2_xlg_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,

				phy_interface_t interface,

				const unsigned long *advertising,

				bool permit_pause_to_mac)
@@ -6232,7 +6231,7 @@ static void mvpp2_gmac_pcs_get_state(struct phylink_pcs *pcs, 
		state->pause |= MLO_PAUSE_TX;

}



static int mvpp2_gmac_pcs_config(struct phylink_pcs *pcs, unsigned int mode,

static int mvpp2_gmac_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,

				 phy_interface_t interface,

				 const unsigned long *advertising,

				 bool permit_pause_to_mac)
@@ -6246,7 +6245,7 @@ static int mvpp2_gmac_pcs_config(struct phylink_pcs *pcs, unsigned int mode, 
	       MVPP2_GMAC_FLOW_CTRL_AUTONEG |

	       MVPP2_GMAC_AN_DUPLEX_EN;



	if (phylink_autoneg_inband(mode)) {

	if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED) {

		mask |= MVPP2_GMAC_CONFIG_MII_SPEED |

			MVPP2_GMAC_CONFIG_GMII_SPEED |

			MVPP2_GMAC_CONFIG_FULL_DUPLEX;
@@ -6649,8 +6648,9 @@ static void mvpp2_acpi_start(struct mvpp2_port *port) 
	mvpp2_mac_prepare(&port->phylink_config, MLO_AN_INBAND,

			  port->phy_interface);

	mvpp2_mac_config(&port->phylink_config, MLO_AN_INBAND, &state);

	pcs->ops->pcs_config(pcs, MLO_AN_INBAND, port->phy_interface,

			     state.advertising, false);

	pcs->ops->pcs_config(pcs, PHYLINK_PCS_NEG_INBAND_ENABLED,

			     port->phy_interface, state.advertising,

			     false);

	mvpp2_mac_finish(&port->phylink_config, MLO_AN_INBAND,

			 port->phy_interface);

	mvpp2_mac_link_up(&port->phylink_config, NULL,
@@ -6896,7 +6896,9 @@ static int mvpp2_port_probe(struct platform_device *pdev, 
	dev->dev.of_node = port_node;



	port->pcs_gmac.ops = &mvpp2_phylink_gmac_pcs_ops;

	port->pcs_gmac.neg_mode = true;

	port->pcs_xlg.ops = &mvpp2_phylink_xlg_pcs_ops;

	port->pcs_xlg.neg_mode = true;



	if (!mvpp2_use_acpi_compat_mode(port_fwnode)) {

		port->phylink_config.dev = &dev->dev;