Commit 37556a4a authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: dpaa2-mac: use resolved link config in mac_link_up() 



Convert the DPAA2 ethernet driver to use the finalised link parameters
in mac_link_up() rather than the parameters in mac_config(), which are
more suited to the needs of the DPAA2 MC firmware than those available
via mac_config().

Tested-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95347842

drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c

+32 −22
Original line number Diff line number Diff line
@@ -123,35 +123,16 @@ static void dpaa2_mac_config(struct phylink_config *config, unsigned int mode, 
	struct dpmac_link_state *dpmac_state = &mac->state;

	int err;



	if (state->speed != SPEED_UNKNOWN)

		dpmac_state->rate = state->speed;



	if (state->duplex != DUPLEX_UNKNOWN) {

		if (!state->duplex)

			dpmac_state->options |= DPMAC_LINK_OPT_HALF_DUPLEX;

		else

			dpmac_state->options &= ~DPMAC_LINK_OPT_HALF_DUPLEX;

	}



	if (state->an_enabled)

		dpmac_state->options |= DPMAC_LINK_OPT_AUTONEG;

	else

		dpmac_state->options &= ~DPMAC_LINK_OPT_AUTONEG;



	if (state->pause & MLO_PAUSE_RX)

		dpmac_state->options |= DPMAC_LINK_OPT_PAUSE;

	else

		dpmac_state->options &= ~DPMAC_LINK_OPT_PAUSE;



	if (!!(state->pause & MLO_PAUSE_RX) ^ !!(state->pause & MLO_PAUSE_TX))

		dpmac_state->options |= DPMAC_LINK_OPT_ASYM_PAUSE;

	else

		dpmac_state->options &= ~DPMAC_LINK_OPT_ASYM_PAUSE;



	err = dpmac_set_link_state(mac->mc_io, 0,

				   mac->mc_dev->mc_handle, dpmac_state);

	if (err)

		netdev_err(mac->net_dev, "dpmac_set_link_state() = %d\n", err);

		netdev_err(mac->net_dev, "%s: dpmac_set_link_state() = %d\n",

			   __func__, err);

}



static void dpaa2_mac_link_up(struct phylink_config *config,
@@ -165,10 +146,37 @@ static void dpaa2_mac_link_up(struct phylink_config *config, 
	int err;



	dpmac_state->up = 1;



	if (mac->if_link_type == DPMAC_LINK_TYPE_PHY) {

		/* If the DPMAC is configured for PHY mode, we need

		 * to pass the link parameters to the MC firmware.

		 */

		dpmac_state->rate = speed;



		if (duplex == DUPLEX_HALF)

			dpmac_state->options |= DPMAC_LINK_OPT_HALF_DUPLEX;

		else if (duplex == DUPLEX_FULL)

			dpmac_state->options &= ~DPMAC_LINK_OPT_HALF_DUPLEX;



		/* This is lossy; the firmware really should take the pause

		 * enablement status rather than pause/asym pause status.

		 */

		if (rx_pause)

			dpmac_state->options |= DPMAC_LINK_OPT_PAUSE;

		else

			dpmac_state->options &= ~DPMAC_LINK_OPT_PAUSE;



		if (rx_pause ^ tx_pause)

			dpmac_state->options |= DPMAC_LINK_OPT_ASYM_PAUSE;

		else

			dpmac_state->options &= ~DPMAC_LINK_OPT_ASYM_PAUSE;

	}



	err = dpmac_set_link_state(mac->mc_io, 0,

				   mac->mc_dev->mc_handle, dpmac_state);

	if (err)

		netdev_err(mac->net_dev, "dpmac_set_link_state() = %d\n", err);

		netdev_err(mac->net_dev, "%s: dpmac_set_link_state() = %d\n",

			   __func__, err);

}



static void dpaa2_mac_link_down(struct phylink_config *config,
@@ -241,6 +249,8 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) 
		goto err_close_dpmac;

	}



	mac->if_link_type = attr.link_type;



	dpmac_node = dpaa2_mac_get_node(attr.id);

	if (!dpmac_node) {

		netdev_err(net_dev, "No dpmac@%d node found.\n", attr.id);

drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ struct dpaa2_mac { 
	struct phylink_config phylink_config;

	struct phylink *phylink;

	phy_interface_t if_mode;

	enum dpmac_link_type if_link_type;

};



bool dpaa2_mac_is_type_fixed(struct fsl_mc_device *dpmac_dev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE