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

Commit a4f090fd 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 update 2014-08-01

The following series of patches includes minor fixes/updates to the
driver.

- Remove some uses of spinlock around ethtool/phylib areas
- Update Rx/Tx ready check logic
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ae29223e 1fa1f2e0

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

+5 −15
Original line number Diff line number Diff line
@@ -290,13 +290,9 @@ static int xgbe_get_settings(struct net_device *netdev, 
	if (!pdata->phydev)

		return -ENODEV;



	spin_lock_irq(&pdata->lock);



	ret = phy_ethtool_gset(pdata->phydev, cmd);

	cmd->transceiver = XCVR_EXTERNAL;



	spin_unlock_irq(&pdata->lock);



	DBGPR("<--xgbe_get_settings\n");



	return ret;
@@ -315,17 +311,14 @@ static int xgbe_set_settings(struct net_device *netdev, 
	if (!pdata->phydev)

		return -ENODEV;



	spin_lock_irq(&pdata->lock);



	speed = ethtool_cmd_speed(cmd);



	ret = -EINVAL;

	if (cmd->phy_address != phydev->addr)

		goto unlock;

		return -EINVAL;



	if ((cmd->autoneg != AUTONEG_ENABLE) &&

	    (cmd->autoneg != AUTONEG_DISABLE))

		goto unlock;

		return -EINVAL;



	if (cmd->autoneg == AUTONEG_DISABLE) {

		switch (speed) {
@@ -334,16 +327,16 @@ static int xgbe_set_settings(struct net_device *netdev, 
		case SPEED_1000:

			break;

		default:

			goto unlock;

			return -EINVAL;

		}



		if (cmd->duplex != DUPLEX_FULL)

			goto unlock;

			return -EINVAL;

	}



	cmd->advertising &= phydev->supported;

	if ((cmd->autoneg == AUTONEG_ENABLE) && !cmd->advertising)

		goto unlock;

		return -EINVAL;



	ret = 0;

	phydev->autoneg = cmd->autoneg;
@@ -359,9 +352,6 @@ static int xgbe_set_settings(struct net_device *netdev, 
	if (netif_running(netdev))

		ret = phy_start_aneg(phydev);



unlock:

	spin_unlock_irq(&pdata->lock);



	DBGPR("<--xgbe_set_settings\n");



	return ret;

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

+0 −5
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ static void xgbe_adjust_link(struct net_device *netdev) 
	struct xgbe_prv_data *pdata = netdev_priv(netdev);

	struct xgbe_hw_if *hw_if = &pdata->hw_if;

	struct phy_device *phydev = pdata->phydev;

	unsigned long flags;

	int new_state = 0;



	if (phydev == NULL)
@@ -172,8 +171,6 @@ static void xgbe_adjust_link(struct net_device *netdev) 
	DBGPR_MDIO("-->xgbe_adjust_link: address=%d, newlink=%d, curlink=%d\n",

		   phydev->addr, phydev->link, pdata->phy_link);



	spin_lock_irqsave(&pdata->lock, flags);



	if (phydev->link) {

		/* Flow control support */

		if (pdata->pause_autoneg) {
@@ -229,8 +226,6 @@ static void xgbe_adjust_link(struct net_device *netdev) 
	if (new_state)

		phy_print_status(phydev);



	spin_unlock_irqrestore(&pdata->lock, flags);



	DBGPR_MDIO("<--xgbe_adjust_link\n");

}

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

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ MODULE_DESCRIPTION("AMD 10GbE (amd-xgbe) PHY driver"); 
#define XNP_MP_FORMATTED		(1 << 13)

#define XNP_NP_EXCHANGE			(1 << 15)



#define XGBE_PHY_RATECHANGE_COUNT	100

#define XGBE_PHY_RATECHANGE_COUNT	500



#ifndef MDIO_PMA_10GBR_PMD_CTRL

#define MDIO_PMA_10GBR_PMD_CTRL		0x0096
@@ -411,7 +411,7 @@ static void amd_xgbe_phy_serdes_complete_ratechange(struct phy_device *phydev) 
	/* Wait for Rx and Tx ready */

	wait = XGBE_PHY_RATECHANGE_COUNT;

	while (wait--) {

		usleep_range(10, 20);

		usleep_range(50, 75);



		status = XSIR0_IOREAD(priv, SIR0_STATUS);

		if (XSIR_GET_BITS(status, SIR0_STATUS, RX_READY) &&
@@ -419,7 +419,7 @@ static void amd_xgbe_phy_serdes_complete_ratechange(struct phy_device *phydev) 
			return;

	}



	netdev_err(phydev->attached_dev, "SerDes rx/tx not ready (%#hx)\n",

	netdev_dbg(phydev->attached_dev, "SerDes rx/tx not ready (%#hx)\n",

		   status);

}