target/linux/ixp4xx/patches-4.4/207-npe_driver_multiphy_support.patch

   1 TODO: take care of additional PHYs through the PHY abstraction layer
   2
   3 --- a/arch/arm/mach-ixp4xx/include/mach/platform.h
   4 +++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
   5 @@ -95,12 +95,23 @@ struct ixp4xx_pata_data {
   6  #define IXP4XX_ETH_NPEB                0x10
   7  #define IXP4XX_ETH_NPEC                0x20
   8
   9 +#define IXP4XX_ETH_PHY_MAX_ADDR        32
  10 +
  11  /* Information about built-in Ethernet MAC interfaces */
  12  struct eth_plat_info {
  13         u8 phy;         /* MII PHY ID, 0 - 31 */
  14         u8 rxq;         /* configurable, currently 0 - 31 only */
  15         u8 txreadyq;
  16         u8 hwaddr[6];
  17 +
  18 +       u32 phy_mask;
  19 +#if 0
  20 +       int speed;
  21 +       int duplex;
  22 +#else
  23 +       int speed_10;
  24 +       int half_duplex;
  25 +#endif
  26  };
  27
  28  /* Information about built-in HSS (synchronous serial) interfaces */
  29 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
  30 +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
  31 @@ -610,6 +610,37 @@ static int ixp4xx_phy_connect(struct net
  32         struct eth_plat_info *plat = port->plat;
  33         char phy_id[MII_BUS_ID_SIZE + 3];
  34
  35 +       if (plat->phy == IXP4XX_ETH_PHY_MAX_ADDR) {
  36 +#if 0
  37 +               switch (plat->speed) {
  38 +               case SPEED_10:
  39 +               case SPEED_100:
  40 +                       break;
  41 +               default:
  42 +                       printk(KERN_ERR "%s: invalid speed (%d)\n",
  43 +                                       dev->name, plat->speed);
  44 +                       return -EINVAL;
  45 +               }
  46 +
  47 +               switch (plat->duplex) {
  48 +               case DUPLEX_HALF:
  49 +               case DUPLEX_FULL:
  50 +                       break;
  51 +               default:
  52 +                       printk(KERN_ERR "%s: invalid duplex mode (%d)\n",
  53 +                                       dev->name, plat->duplex);
  54 +                       return -EINVAL;
  55 +               }
  56 +               port->speed = plat->speed;
  57 +               port->duplex = plat->duplex;
  58 +#else
  59 +               port->speed = plat->speed_10 ? SPEED_10 : SPEED_100;
  60 +               port->duplex = plat->half_duplex ? DUPLEX_HALF : DUPLEX_FULL;
  61 +#endif
  62 +
  63 +               return 0;
  64 +       }
  65 +
  66         snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
  67                 mdio_bus->id, plat->phy);
  68         port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link,
  69 @@ -625,6 +656,10 @@ static int ixp4xx_phy_connect(struct net
  70
  71         port->phydev->irq = PHY_POLL;
  72
  73 +       port->link = 0;
  74 +       port->speed = 0;
  75 +       port->duplex = -1;
  76 +
  77         return 0;
  78  }
  79
  80 @@ -632,21 +667,32 @@ static void ixp4xx_phy_disconnect(struct
  81  {
  82         struct port *port = netdev_priv(dev);
  83
  84 -       phy_disconnect(port->phydev);
  85 +       if (port->phydev)
  86 +               phy_disconnect(port->phydev);
  87  }
  88
  89  static void ixp4xx_phy_start(struct net_device *dev)
  90  {
  91         struct port *port = netdev_priv(dev);
  92
  93 -       phy_start(port->phydev);
  94 +       if (port->phydev) {
  95 +               phy_start(port->phydev);
  96 +       } else {
  97 +               port->link = 1;
  98 +               ixp4xx_update_link(dev);
  99 +       }
 100  }
 101
 102  static void ixp4xx_phy_stop(struct net_device *dev)
 103  {
 104         struct port *port = netdev_priv(dev);
 105
 106 -       phy_stop(port->phydev);
 107 +       if (port->phydev) {
 108 +               phy_stop(port->phydev);
 109 +       } else {
 110 +               port->link = 0;
 111 +               ixp4xx_update_link(dev);
 112 +       }
 113  }
 114
 115  static inline void debug_pkt(struct net_device *dev, const char *func,
 116 @@ -1048,6 +1094,9 @@ static int eth_ioctl(struct net_device *
 117                         return hwtstamp_get(dev, req);
 118         }
 119
 120 +       if (!port->phydev)
 121 +               return -EOPNOTSUPP;
 122 +
 123         return phy_mii_ioctl(port->phydev, req, cmd);
 124  }
 125
 126 @@ -1068,18 +1117,30 @@ static void ixp4xx_get_drvinfo(struct ne
 127  static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 128  {
 129         struct port *port = netdev_priv(dev);
 130 +
 131 +       if (!port->phydev)
 132 +               return -EOPNOTSUPP;
 133 +
 134         return phy_ethtool_gset(port->phydev, cmd);
 135  }
 136
 137  static int ixp4xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 138  {
 139         struct port *port = netdev_priv(dev);
 140 +
 141 +       if (!port->phydev)
 142 +               return -EOPNOTSUPP;
 143 +
 144         return phy_ethtool_sset(port->phydev, cmd);
 145  }
 146
 147  static int ixp4xx_nway_reset(struct net_device *dev)
 148  {
 149         struct port *port = netdev_priv(dev);
 150 +
 151 +       if (!port->phydev)
 152 +               return -EOPNOTSUPP;
 153 +
 154         return phy_start_aneg(port->phydev);
 155  }
 156
 157 @@ -1529,10 +1590,6 @@ static int eth_init_one(struct platform_
 158         if ((err = register_netdev(dev)))
 159                 goto err_phy_dis;
 160
 161 -       port->link = 0;
 162 -       port->speed = 0;
 163 -       port->duplex = -1;
 164 -
 165         printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
 166                npe_name(port->npe));
 167