Commit bb0b8aec authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

net: pcs: xpcs: move Wangxun VR_XS_PCS_DIG_CTRL1 configuration 



According to commits 2a22b7ae ("net: pcs: xpcs: adapt Wangxun NICs
for SGMII mode") and 2deea43f ("net: pcs: xpcs: add 1000BASE-X AN
interrupt support"), Wangxun devices need special VR_XS_PCS_DIG_CTRL1
settings for SGMII and 1000BASE-X. Both SGMII and 1000BASE-X use the
same settings.

Rather than placing these in the individual xpcs_config_*() functions,
move it to where we already test for the Wangxun devices in
xpcs_do_config().

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5ba56193

drivers/net/pcs/pcs-xpcs.c

+8 −6
Original line number Diff line number Diff line
@@ -636,9 +636,6 @@ static int xpcs_config_aneg_c37_sgmii(struct dw_xpcs *xpcs, 
	int ret, mdio_ctrl, tx_conf;

	u16 mask, val;



	if (xpcs->info.pma == WX_TXGBE_XPCS_PMA_10G_ID)

		xpcs_write_vpcs(xpcs, DW_VR_XS_PCS_DIG_CTRL1, DW_CL37_BP | DW_EN_VSMMD1);



	/* For AN for C37 SGMII mode, the settings are :-

	 * 1) VR_MII_MMD_CTRL Bit(12) [AN_ENABLE] = 0b (Disable SGMII AN in case

	      it is already enabled)
@@ -714,9 +711,6 @@ static int xpcs_config_aneg_c37_1000basex(struct dw_xpcs *xpcs, 
	bool changed = 0;

	u16 mask, val;



	if (xpcs->info.pma == WX_TXGBE_XPCS_PMA_10G_ID)

		xpcs_write_vpcs(xpcs, DW_VR_XS_PCS_DIG_CTRL1, DW_CL37_BP | DW_EN_VSMMD1);



	/* According to Chap 7.12, to set 1000BASE-X C37 AN, AN must

	 * be disabled first:-

	 * 1) VR_MII_MMD_CTRL Bit(12)[AN_ENABLE] = 0b
@@ -806,6 +800,14 @@ static int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface, 
		ret = txgbe_xpcs_switch_mode(xpcs, interface);

		if (ret)

			return ret;



		/* Wangxun devices need backplane CL37 AN enabled for

		 * SGMII and 1000base-X

		 */

		if (interface == PHY_INTERFACE_MODE_SGMII ||

		    interface == PHY_INTERFACE_MODE_1000BASEX)

			xpcs_write_vpcs(xpcs, DW_VR_XS_PCS_DIG_CTRL1,

					DW_CL37_BP | DW_EN_VSMMD1);

	}



	switch (compat->an_mode) {