diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-02 19:29:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-02 19:29:59 -0700 |
| commit | a4f090fda308c040039f060edf9a4620ce27ffed (patch) | |
| tree | 5906971e9fe2ebac9c82004a448800df9def4361 /drivers/net/phy/amd-xgbe-phy.c | |
| parent | ae29223eaf0ecf4c701457a6b40d7b8f19c90413 (diff) | |
| parent | 1fa1f2e09824abd39fa7e7bffe8769b7b0260b45 (diff) | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/amd-xgbe-phy.c')
| -rw-r--r-- | drivers/net/phy/amd-xgbe-phy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/amd-xgbe-phy.c b/drivers/net/phy/amd-xgbe-phy.c index 388e3029165..f3230eef41f 100644 --- a/drivers/net/phy/amd-xgbe-phy.c +++ b/drivers/net/phy/amd-xgbe-phy.c @@ -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); } |