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

Commit 6cd968f4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'amd-xgbe-fixes' 



aTom Lendacky says:

====================
amd-xgbe: AMD XGBE driver fixes 2018-04-23

This patch series addresses some issues in the AMD XGBE driver.

The following fixes are included in this driver update series:

- Improve KR auto-negotiation and training (2 patches)
  - Add pre and post auto-negotiation hooks
  - Use the pre and post auto-negotiation hooks to disable CDR tracking
    during auto-negotiation page exchange in KR mode
- Check for SFP tranceiver signal support and only use the signal if the
  SFP indicates that it is supported

This patch series is based on net.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a49e2f5d 117df655

drivers/net/ethernet/amd/xgbe/xgbe-common.h

+8 −0
Original line number Diff line number Diff line
@@ -1321,6 +1321,10 @@ 
#define MDIO_VEND2_AN_STAT		0x8002

#endif



#ifndef MDIO_VEND2_PMA_CDR_CONTROL

#define MDIO_VEND2_PMA_CDR_CONTROL	0x8056

#endif



#ifndef MDIO_CTRL1_SPEED1G

#define MDIO_CTRL1_SPEED1G		(MDIO_CTRL1_SPEED10G & ~BMCR_SPEED100)

#endif
@@ -1369,6 +1373,10 @@ 
#define XGBE_AN_CL37_TX_CONFIG_MASK	0x08

#define XGBE_AN_CL37_MII_CTRL_8BIT	0x0100



#define XGBE_PMA_CDR_TRACK_EN_MASK	0x01

#define XGBE_PMA_CDR_TRACK_EN_OFF	0x00

#define XGBE_PMA_CDR_TRACK_EN_ON	0x01



/* Bit setting and getting macros

 *  The get macro will extract the current bit field value from within

 *  the variable

drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c

+16 −0
Original line number Diff line number Diff line
@@ -519,6 +519,22 @@ void xgbe_debugfs_init(struct xgbe_prv_data *pdata) 
				   "debugfs_create_file failed\n");

	}



	if (pdata->vdata->an_cdr_workaround) {

		pfile = debugfs_create_bool("an_cdr_workaround", 0600,

					    pdata->xgbe_debugfs,

					    &pdata->debugfs_an_cdr_workaround);

		if (!pfile)

			netdev_err(pdata->netdev,

				   "debugfs_create_bool failed\n");



		pfile = debugfs_create_bool("an_cdr_track_early", 0600,

					    pdata->xgbe_debugfs,

					    &pdata->debugfs_an_cdr_track_early);

		if (!pfile)

			netdev_err(pdata->netdev,

				   "debugfs_create_bool failed\n");

	}



	kfree(buf);

}

drivers/net/ethernet/amd/xgbe/xgbe-main.c

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ int xgbe_config_netdev(struct xgbe_prv_data *pdata) 
	XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, UDP4TE, 1);



	/* Call MDIO/PHY initialization routine */

	pdata->debugfs_an_cdr_workaround = pdata->vdata->an_cdr_workaround;

	ret = pdata->phy_if.phy_init(pdata);

	if (ret)

		return ret;

drivers/net/ethernet/amd/xgbe/xgbe-mdio.c

+19 −5
Original line number Diff line number Diff line
@@ -432,11 +432,16 @@ static void xgbe_an73_disable(struct xgbe_prv_data *pdata) 
	xgbe_an73_set(pdata, false, false);

	xgbe_an73_disable_interrupts(pdata);



	pdata->an_start = 0;



	netif_dbg(pdata, link, pdata->netdev, "CL73 AN disabled\n");

}



static void xgbe_an_restart(struct xgbe_prv_data *pdata)

{

	if (pdata->phy_if.phy_impl.an_pre)

		pdata->phy_if.phy_impl.an_pre(pdata);



	switch (pdata->an_mode) {

	case XGBE_AN_MODE_CL73:

	case XGBE_AN_MODE_CL73_REDRV:
@@ -453,6 +458,9 @@ static void xgbe_an_restart(struct xgbe_prv_data *pdata) 


static void xgbe_an_disable(struct xgbe_prv_data *pdata)

{

	if (pdata->phy_if.phy_impl.an_post)

		pdata->phy_if.phy_impl.an_post(pdata);



	switch (pdata->an_mode) {

	case XGBE_AN_MODE_CL73:

	case XGBE_AN_MODE_CL73_REDRV:
@@ -505,11 +513,11 @@ static enum xgbe_an xgbe_an73_tx_training(struct xgbe_prv_data *pdata, 
		XMDIO_WRITE(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL,

			    reg);



		if (pdata->phy_if.phy_impl.kr_training_post)

			pdata->phy_if.phy_impl.kr_training_post(pdata);



		netif_dbg(pdata, link, pdata->netdev,

			  "KR training initiated\n");



		if (pdata->phy_if.phy_impl.kr_training_post)

			pdata->phy_if.phy_impl.kr_training_post(pdata);

	}



	return XGBE_AN_PAGE_RECEIVED;
@@ -637,11 +645,11 @@ static enum xgbe_an xgbe_an73_incompat_link(struct xgbe_prv_data *pdata) 
			return XGBE_AN_NO_LINK;

	}



	xgbe_an73_disable(pdata);

	xgbe_an_disable(pdata);



	xgbe_switch_mode(pdata);



	xgbe_an73_restart(pdata);

	xgbe_an_restart(pdata);



	return XGBE_AN_INCOMPAT_LINK;

}
@@ -820,6 +828,9 @@ static void xgbe_an37_state_machine(struct xgbe_prv_data *pdata) 
		pdata->an_result = pdata->an_state;

		pdata->an_state = XGBE_AN_READY;



		if (pdata->phy_if.phy_impl.an_post)

			pdata->phy_if.phy_impl.an_post(pdata);



		netif_dbg(pdata, link, pdata->netdev, "CL37 AN result: %s\n",

			  xgbe_state_as_string(pdata->an_result));

	}
@@ -903,6 +914,9 @@ static void xgbe_an73_state_machine(struct xgbe_prv_data *pdata) 
		pdata->kx_state = XGBE_RX_BPA;

		pdata->an_start = 0;



		if (pdata->phy_if.phy_impl.an_post)

			pdata->phy_if.phy_impl.an_post(pdata);



		netif_dbg(pdata, link, pdata->netdev, "CL73 AN result: %s\n",

			  xgbe_state_as_string(pdata->an_result));

	}

drivers/net/ethernet/amd/xgbe/xgbe-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ static const struct xgbe_version_data xgbe_v2a = { 
	.irq_reissue_support		= 1,

	.tx_desc_prefetch		= 5,

	.rx_desc_prefetch		= 5,

	.an_cdr_workaround		= 1,

};



static const struct xgbe_version_data xgbe_v2b = {
@@ -470,6 +471,7 @@ static const struct xgbe_version_data xgbe_v2b = { 
	.irq_reissue_support		= 1,

	.tx_desc_prefetch		= 5,

	.rx_desc_prefetch		= 5,

	.an_cdr_workaround		= 1,

};



static const struct pci_device_id xgbe_pci_table[] = {