| Message ID | 1406496096-11039-1-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Sun, 27 Jul 2014 23:21:35 +0200 > This commit is similar to commit 4d12bc63ab5e ("net: mvneta: fix > operation in 10 Mbit/s mode"), but this time for the mvpp2 driver. The > driver was properly taking into account the 1 Gbit/s and 100 Mbit/s > speeds, but not the 10 Mbit/s, which was handled as 100 > Mbit/s. However, the MVPP2_GMAC_CONFIG_MII_SPEED bit in the > MVPP2_GMAC_AUTONEG_CONFIG register must remain cleared to allow 10 > Mbit/s operation. This commit therefore fixes 10 Mbit/s operation. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Applied.
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 3193a7d..3cae3d2 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -4842,7 +4842,7 @@ static void mvpp2_link_event(struct net_device *dev) if (phydev->speed == SPEED_1000) val |= MVPP2_GMAC_CONFIG_GMII_SPEED; - else + else if (phydev->speed == SPEED_100) val |= MVPP2_GMAC_CONFIG_MII_SPEED; writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
This commit is similar to commit 4d12bc63ab5e ("net: mvneta: fix operation in 10 Mbit/s mode"), but this time for the mvpp2 driver. The driver was properly taking into account the 1 Gbit/s and 100 Mbit/s speeds, but not the 10 Mbit/s, which was handled as 100 Mbit/s. However, the MVPP2_GMAC_CONFIG_MII_SPEED bit in the MVPP2_GMAC_AUTONEG_CONFIG register must remain cleared to allow 10 Mbit/s operation. This commit therefore fixes 10 Mbit/s operation. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- This commit applies on top of net-next, since the mvpp2 driver was merged there. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/net/ethernet/marvell/mvpp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)