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

net: pcs: lynx: consolidate sgmii and 1000base-x config code 



Consolidate lynx_pcs_config_1000basex() and lynx_pcs_config_sgmii() into
a single function. The differences between these two are:

- The value that the link timer is set to.
- The value of the IF_MODE register.

Everything else is identical.

This patch depends on "net: phylink: add QSGMII support to
phylink_mii_c22_pcs_encode_advertisement()".

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Reviewed-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f56866c4

drivers/net/pcs/pcs-lynx.c

+21 −35
Original line number Diff line number Diff line
@@ -122,38 +122,23 @@ static void lynx_pcs_get_state(struct phylink_pcs *pcs, 
		state->link, state->an_enabled, state->an_complete);

}



static int lynx_pcs_config_1000basex(struct mdio_device *pcs,

				     unsigned int mode,

static int lynx_pcs_config_giga(struct mdio_device *pcs, unsigned int mode,

				phy_interface_t interface,

				const unsigned long *advertising)

{

	u32 link_timer;

	u16 if_mode;

	int err;



	if (interface == PHY_INTERFACE_MODE_1000BASEX) {

		link_timer = LINK_TIMER_VAL(IEEE8023_LINK_TIMER_NS);

		mdiodev_write(pcs, LINK_TIMER_LO, link_timer & 0xffff);

		mdiodev_write(pcs, LINK_TIMER_HI, link_timer >> 16);



	err = mdiodev_modify(pcs, IF_MODE,

			     IF_MODE_SGMII_EN | IF_MODE_USE_SGMII_AN,

			     0);

	if (err)

		return err;



	return phylink_mii_c22_pcs_config(pcs, mode,

					  PHY_INTERFACE_MODE_1000BASEX,

					  advertising);

}



static int lynx_pcs_config_sgmii(struct mdio_device *pcs, unsigned int mode,

				 const unsigned long *advertising)

{

	u16 if_mode;

	int err;



		if_mode = 0;

	} else {

		if_mode = IF_MODE_SGMII_EN;

		if (mode == MLO_AN_INBAND) {

		u32 link_timer;



			if_mode |= IF_MODE_USE_SGMII_AN;



			/* Adjust link timer for SGMII */
@@ -161,14 +146,15 @@ static int lynx_pcs_config_sgmii(struct mdio_device *pcs, unsigned int mode, 
			mdiodev_write(pcs, LINK_TIMER_LO, link_timer & 0xffff);

			mdiodev_write(pcs, LINK_TIMER_HI, link_timer >> 16);

		}

	}



	err = mdiodev_modify(pcs, IF_MODE,

			     IF_MODE_SGMII_EN | IF_MODE_USE_SGMII_AN,

			     if_mode);

	if (err)

		return err;



	return phylink_mii_c22_pcs_config(pcs, mode, PHY_INTERFACE_MODE_SGMII,

					 advertising);

	return phylink_mii_c22_pcs_config(pcs, mode, interface, advertising);

}



static int lynx_pcs_config_usxgmii(struct mdio_device *pcs, unsigned int mode,
@@ -198,10 +184,10 @@ static int lynx_pcs_config(struct phylink_pcs *pcs, unsigned int mode, 


	switch (ifmode) {

	case PHY_INTERFACE_MODE_1000BASEX:

		return lynx_pcs_config_1000basex(lynx->mdio, mode, advertising);

	case PHY_INTERFACE_MODE_SGMII:

	case PHY_INTERFACE_MODE_QSGMII:

		return lynx_pcs_config_sgmii(lynx->mdio, mode, advertising);

		return lynx_pcs_config_giga(lynx->mdio, mode, ifmode,

					    advertising);

	case PHY_INTERFACE_MODE_2500BASEX:

		if (phylink_autoneg_inband(mode)) {

			dev_err(&lynx->mdio->dev,