| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859 |
- From 121287dee1454be0ebc0e5b8c7b5b85e16570551 Mon Sep 17 00:00:00 2001
- From: John Crispin <[email protected]>
- Date: Fri, 22 Apr 2016 11:05:23 +0200
- Subject: [PATCH 80/90] net-next: mediatek: fix gigabit and flow control
- advertisement
- The current code will not setup the PHYs advertisement features correctly.
- Fix this and properly advertise Gigabit features and properly handle
- asymmetric pause frames.
- Signed-off-by: John Crispin <[email protected]>
- ---
- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
- diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- index 9928a79..204d927 100644
- --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- @@ -133,6 +133,8 @@ static int mtk_mdio_read(struct mii_bus *bus, int phy_addr, int phy_reg)
- static void mtk_phy_link_adjust(struct net_device *dev)
- {
- struct mtk_mac *mac = netdev_priv(dev);
- + u16 lcl_adv, rmt_adv = 0;
- + u8 flowctrl;
- u32 mcr = MAC_MCR_MAX_RX_1536 | MAC_MCR_IPG_CFG |
- MAC_MCR_FORCE_MODE | MAC_MCR_TX_EN |
- MAC_MCR_RX_EN | MAC_MCR_BACKOFF_EN |
- @@ -154,7 +156,16 @@ static void mtk_phy_link_adjust(struct net_device *dev)
- mcr |= MAC_MCR_FORCE_DPX;
-
- if (mac->phy_dev->pause)
- - mcr |= MAC_MCR_FORCE_RX_FC | MAC_MCR_FORCE_TX_FC;
- + rmt_adv = LPA_PAUSE_CAP;
- + if (mac->phy_dev->asym_pause)
- + rmt_adv |= LPA_PAUSE_ASYM;
- +
- + lcl_adv = mii_advertise_flowctrl(FLOW_CTRL_RX | FLOW_CTRL_TX);
- + flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);
- + if (flowctrl & FLOW_CTRL_TX)
- + mcr |= MAC_MCR_FORCE_TX_FC;
- + if (flowctrl & FLOW_CTRL_RX)
- + mcr |= MAC_MCR_FORCE_RX_FC;
-
- mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
-
- @@ -236,7 +247,8 @@ static int mtk_phy_connect(struct mtk_mac *mac)
- mac->phy_dev->autoneg = AUTONEG_ENABLE;
- mac->phy_dev->speed = 0;
- mac->phy_dev->duplex = 0;
- - mac->phy_dev->supported &= PHY_BASIC_FEATURES;
- + mac->phy_dev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause |
- + ~SUPPORTED_Asym_Pause;
- mac->phy_dev->advertising = mac->phy_dev->supported |
- ADVERTISED_Autoneg;
- phy_start_aneg(mac->phy_dev);
- --
- 1.7.10.4
|
