renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 15:43:59 +08:00
Code

Merge branch 'amd-xgbe-next'

Browse Source 
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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2014-08-02 19:29:59 -07:00
commit a4f090fda3
3 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
View File

@ -290,13 +290,9 @@ static int xgbe_get_settings(struct net_device *netdev,
if (!pdata->phydev) if (!pdata->phydev)
return -ENODEV; return -ENODEV;
spin_lock_irq(&pdata->lock);
ret = phy_ethtool_gset(pdata->phydev, cmd); ret = phy_ethtool_gset(pdata->phydev, cmd);
cmd->transceiver = XCVR_EXTERNAL; cmd->transceiver = XCVR_EXTERNAL;
spin_unlock_irq(&pdata->lock);
DBGPR("<--xgbe_get_settings\n"); DBGPR("<--xgbe_get_settings\n");
return ret; return ret;
@ -315,17 +311,14 @@ static int xgbe_set_settings(struct net_device *netdev,
if (!pdata->phydev) if (!pdata->phydev)
return -ENODEV; return -ENODEV;
spin_lock_irq(&pdata->lock);
speed = ethtool_cmd_speed(cmd); speed = ethtool_cmd_speed(cmd);
ret = -EINVAL;
if (cmd->phy_address != phydev->addr) if (cmd->phy_address != phydev->addr)
goto unlock; return -EINVAL;
if ((cmd->autoneg != AUTONEG_ENABLE) && if ((cmd->autoneg != AUTONEG_ENABLE) &&
(cmd->autoneg != AUTONEG_DISABLE)) (cmd->autoneg != AUTONEG_DISABLE))
goto unlock; return -EINVAL;
if (cmd->autoneg == AUTONEG_DISABLE) { if (cmd->autoneg == AUTONEG_DISABLE) {
switch (speed) { switch (speed) {
@ -334,16 +327,16 @@ static int xgbe_set_settings(struct net_device *netdev,
case SPEED_1000: case SPEED_1000:
break; break;
default: default:
goto unlock; return -EINVAL;
} }
if (cmd->duplex != DUPLEX_FULL) if (cmd->duplex != DUPLEX_FULL)
goto unlock; return -EINVAL;
} }
cmd->advertising &= phydev->supported; cmd->advertising &= phydev->supported;
if ((cmd->autoneg == AUTONEG_ENABLE) && !cmd->advertising) if ((cmd->autoneg == AUTONEG_ENABLE) && !cmd->advertising)
goto unlock; return -EINVAL;
ret = 0; ret = 0;
phydev->autoneg = cmd->autoneg; phydev->autoneg = cmd->autoneg;
@ -359,9 +352,6 @@ static int xgbe_set_settings(struct net_device *netdev,
if (netif_running(netdev)) if (netif_running(netdev))
ret = phy_start_aneg(phydev); ret = phy_start_aneg(phydev);
unlock:
spin_unlock_irq(&pdata->lock);
DBGPR("<--xgbe_set_settings\n"); DBGPR("<--xgbe_set_settings\n");
return ret; return ret;

5
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
View File

@ -163,7 +163,6 @@ static void xgbe_adjust_link(struct net_device *netdev)
struct xgbe_prv_data *pdata = netdev_priv(netdev); struct xgbe_prv_data *pdata = netdev_priv(netdev);
struct xgbe_hw_if *hw_if = &pdata->hw_if; struct xgbe_hw_if *hw_if = &pdata->hw_if;
struct phy_device *phydev = pdata->phydev; struct phy_device *phydev = pdata->phydev;
unsigned long flags;
int new_state = 0; int new_state = 0;
if (phydev == NULL) 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", DBGPR_MDIO("-->xgbe_adjust_link: address=%d, newlink=%d, curlink=%d\n",
phydev->addr, phydev->link, pdata->phy_link); phydev->addr, phydev->link, pdata->phy_link);
spin_lock_irqsave(&pdata->lock, flags);
if (phydev->link) { if (phydev->link) {
/* Flow control support */ /* Flow control support */
if (pdata->pause_autoneg) { if (pdata->pause_autoneg) {
@ -229,8 +226,6 @@ static void xgbe_adjust_link(struct net_device *netdev)
if (new_state) if (new_state)
phy_print_status(phydev); phy_print_status(phydev);
spin_unlock_irqrestore(&pdata->lock, flags);
DBGPR_MDIO("<--xgbe_adjust_link\n"); DBGPR_MDIO("<--xgbe_adjust_link\n");
} }

6
drivers/net/phy/amd-xgbe-phy.c
View File

@ -95,7 +95,7 @@ MODULE_DESCRIPTION("AMD 10GbE (amd-xgbe) PHY driver");
#define XNP_MP_FORMATTED (1 << 13) #define XNP_MP_FORMATTED (1 << 13)
#define XNP_NP_EXCHANGE (1 << 15) #define XNP_NP_EXCHANGE (1 << 15)
#define XGBE_PHY_RATECHANGE_COUNT 100 #define XGBE_PHY_RATECHANGE_COUNT 500
#ifndef MDIO_PMA_10GBR_PMD_CTRL #ifndef MDIO_PMA_10GBR_PMD_CTRL
#define MDIO_PMA_10GBR_PMD_CTRL 0x0096 #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 for Rx and Tx ready */
wait = XGBE_PHY_RATECHANGE_COUNT; wait = XGBE_PHY_RATECHANGE_COUNT;
while (wait--) { while (wait--) {
usleep_range(10, 20); usleep_range(50, 75);
status = XSIR0_IOREAD(priv, SIR0_STATUS); status = XSIR0_IOREAD(priv, SIR0_STATUS);
if (XSIR_GET_BITS(status, SIR0_STATUS, RX_READY) && 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; 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); status);
} }