target/linux/mediatek/patches-4.4/0080-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch

   1 From 6918f290a9019425043dbedf7b39bc82a69e23a6 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Fri, 22 Apr 2016 11:05:23 +0200
   4 Subject: [PATCH 80/91] net-next: mediatek: fix gigabit and flow control
   5  advertisement
   6
   7 The current code will not setup the PHYs advertisement features correctly.
   8 Fix this and properly advertise Gigabit features and properly handle
   9 asymmetric pause frames.
  10
  11 Signed-off-by: John Crispin <blogic@openwrt.org>
  12 ---
  13  drivers/net/ethernet/mediatek/mtk_eth_soc.c |   16 ++++++++++++++--
  14  1 file changed, 14 insertions(+), 2 deletions(-)
  15
  16 diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  17 index 9928a79..204d927 100644
  18 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  19 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  20 @@ -133,6 +133,8 @@ static int mtk_mdio_read(struct mii_bus *bus, int phy_addr, int phy_reg)
  21  static void mtk_phy_link_adjust(struct net_device *dev)
  22  {
  23         struct mtk_mac *mac = netdev_priv(dev);
  24 +       u16 lcl_adv, rmt_adv = 0;
  25 +       u8 flowctrl;
  26         u32 mcr = MAC_MCR_MAX_RX_1536 | MAC_MCR_IPG_CFG |
  27                   MAC_MCR_FORCE_MODE | MAC_MCR_TX_EN |
  28                   MAC_MCR_RX_EN | MAC_MCR_BACKOFF_EN |
  29 @@ -154,7 +156,16 @@ static void mtk_phy_link_adjust(struct net_device *dev)
  30                 mcr |= MAC_MCR_FORCE_DPX;
  31
  32         if (mac->phy_dev->pause)
  33 -               mcr |= MAC_MCR_FORCE_RX_FC | MAC_MCR_FORCE_TX_FC;
  34 +               rmt_adv = LPA_PAUSE_CAP;
  35 +       if (mac->phy_dev->asym_pause)
  36 +               rmt_adv |= LPA_PAUSE_ASYM;
  37 +
  38 +       lcl_adv = mii_advertise_flowctrl(FLOW_CTRL_RX | FLOW_CTRL_TX);
  39 +       flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);
  40 +       if (flowctrl & FLOW_CTRL_TX)
  41 +               mcr |= MAC_MCR_FORCE_TX_FC;
  42 +       if (flowctrl & FLOW_CTRL_RX)
  43 +               mcr |= MAC_MCR_FORCE_RX_FC;
  44
  45         mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
  46
  47 @@ -236,7 +247,8 @@ static int mtk_phy_connect(struct mtk_mac *mac)
  48         mac->phy_dev->autoneg = AUTONEG_ENABLE;
  49         mac->phy_dev->speed = 0;
  50         mac->phy_dev->duplex = 0;
  51 -       mac->phy_dev->supported &= PHY_BASIC_FEATURES;
  52 +       mac->phy_dev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause |
  53 +                                  ~SUPPORTED_Asym_Pause;
  54         mac->phy_dev->advertising = mac->phy_dev->supported |
  55                                     ADVERTISED_Autoneg;
  56         phy_start_aneg(mac->phy_dev);
  57 --
  58 1.7.10.4
  59