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

Commit 3418c681 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'amd-xgbe-next' 



Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver updates 2016-11-14

This patch series addresses some minor issues found in the recently
accepted patch series for the AMD XGBE driver.

The following fixes are included in this driver update series:

- Fix how a mask is applied to a Clause 37 register value
- Fix some coccinelle identified warnings

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 92547f2b 8c5385cb

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

+2 −2
Original line number Diff line number Diff line
@@ -943,8 +943,8 @@ static void xgbe_an37_init(struct xgbe_prv_data *pdata) 


	/* Set up the Control register */

	reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_CTRL);

	reg &= XGBE_AN_CL37_TX_CONFIG_MASK;

	reg &= XGBE_AN_CL37_PCS_MODE_MASK;

	reg &= ~XGBE_AN_CL37_TX_CONFIG_MASK;

	reg &= ~XGBE_AN_CL37_PCS_MODE_MASK;



	switch (pdata->an_mode) {

	case XGBE_AN_MODE_CL37:

drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c

+2 −3
Original line number Diff line number Diff line
@@ -1766,8 +1766,6 @@ static void xgbe_phy_sfi_mode(struct xgbe_prv_data *pdata) 
			XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 1);

		else if (phy_data->sfp_cable_len <= 3)

			XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 2);

		else if (phy_data->sfp_cable_len <= 5)

			XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 3);

		else

			XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 3);

	}
@@ -2346,7 +2344,8 @@ static bool xgbe_phy_valid_speed(struct xgbe_prv_data *pdata, int speed) 
static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart)

{

	struct xgbe_phy_data *phy_data = pdata->phy_data;

	unsigned int ret, reg;

	unsigned int reg;

	int ret;



	*an_restart = 0;