target/linux/apm821xx/patches-4.14/030-0003-net-ibm-emac-support-RGMII-RX-TX-ID-phymode.patch

   1 From 0a49f0d1958440f7928047433c983eece05a3723 Mon Sep 17 00:00:00 2001
   2 From: Christian Lamparter <chunkeey@gmail.com>
   3 Date: Thu, 14 Dec 2017 19:51:50 +0100
   4 Subject: [PATCH 3/3] net: ibm: emac: support RGMII-[RX|TX]ID phymode
   5
   6 The RGMII spec allows compliance for devices that implement an internal
   7 delay on TXC and/or RXC inside the transmitter. This patch adds the
   8 necessary RGMII_[RX|TX]ID mode code to handle such PHYs with the
   9 emac driver.
  10
  11 Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  12
  13 ---
  14 v3: - replace PHY_MODE_* with PHY_INTERFACE_MODE_*
  15     - replace rgmii_mode_name() with phy_modes[]
  16
  17 v2: - utilize phy_interface_mode_is_rgmii()
  18 ---
  19  drivers/net/ethernet/ibm/emac/core.c  | 4 ++--
  20  drivers/net/ethernet/ibm/emac/rgmii.c | 7 +++++--
  21  2 files changed, 7 insertions(+), 4 deletions(-)
  22
  23 --- a/drivers/net/ethernet/ibm/emac/core.c
  24 +++ b/drivers/net/ethernet/ibm/emac/core.c
  25 @@ -199,8 +199,8 @@ static void __emac_set_multicast_list(st
  26
  27  static inline int emac_phy_supports_gige(int phy_mode)
  28  {
  29 -       return  phy_mode == PHY_INTERFACE_MODE_GMII ||
  30 -               phy_mode == PHY_INTERFACE_MODE_RGMII ||
  31 +       return  phy_interface_mode_is_rgmii(phy_mode) ||
  32 +               phy_mode == PHY_INTERFACE_MODE_GMII ||
  33                 phy_mode == PHY_INTERFACE_MODE_SGMII ||
  34                 phy_mode == PHY_INTERFACE_MODE_TBI ||
  35                 phy_mode == PHY_INTERFACE_MODE_RTBI;
  36 --- a/drivers/net/ethernet/ibm/emac/rgmii.c
  37 +++ b/drivers/net/ethernet/ibm/emac/rgmii.c
  38 @@ -52,9 +52,9 @@
  39  /* RGMII bridge supports only GMII/TBI and RGMII/RTBI PHYs */
  40  static inline int rgmii_valid_mode(int phy_mode)
  41  {
  42 -       return  phy_mode == PHY_INTERFACE_MODE_GMII ||
  43 +       return  phy_interface_mode_is_rgmii(phy_mode) ||
  44 +               phy_mode == PHY_INTERFACE_MODE_GMII ||
  45                 phy_mode == PHY_INTERFACE_MODE_MII ||
  46 -               phy_mode == PHY_INTERFACE_MODE_RGMII ||
  47                 phy_mode == PHY_INTERFACE_MODE_TBI ||
  48                 phy_mode == PHY_INTERFACE_MODE_RTBI;
  49  }
  50 @@ -63,6 +63,9 @@ static inline u32 rgmii_mode_mask(int mo
  51  {
  52         switch (mode) {
  53         case PHY_INTERFACE_MODE_RGMII:
  54 +       case PHY_INTERFACE_MODE_RGMII_ID:
  55 +       case PHY_INTERFACE_MODE_RGMII_RXID:
  56 +       case PHY_INTERFACE_MODE_RGMII_TXID:
  57                 return RGMII_FER_RGMII(input);
  58         case PHY_INTERFACE_MODE_TBI:
  59                 return RGMII_FER_TBI(input);