target/linux/generic-2.6/patches-2.6.30/600-phy_extension.patch

   1 --- a/drivers/net/phy/phy.c
   2 +++ b/drivers/net/phy/phy.c
   3 @@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
   4  }
   5  EXPORT_SYMBOL(phy_ethtool_gset);
   6
   7 +int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
   8 +{
   9 +       u32 cmd;
  10 +       int tmp;
  11 +       struct ethtool_cmd ecmd = { ETHTOOL_GSET };
  12 +       struct ethtool_value edata = { ETHTOOL_GLINK };
  13 +
  14 +       if (get_user(cmd, (u32 *) useraddr))
  15 +               return -EFAULT;
  16 +
  17 +       switch (cmd) {
  18 +       case ETHTOOL_GSET:
  19 +               phy_ethtool_gset(phydev, &ecmd);
  20 +               if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
  21 +                       return -EFAULT;
  22 +               return 0;
  23 +
  24 +       case ETHTOOL_SSET:
  25 +               if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
  26 +                       return -EFAULT;
  27 +               return phy_ethtool_sset(phydev, &ecmd);
  28 +
  29 +       case ETHTOOL_NWAY_RST:
  30 +               /* if autoneg is off, it's an error */
  31 +               tmp = phy_read(phydev, MII_BMCR);
  32 +               if (tmp & BMCR_ANENABLE) {
  33 +                       tmp |= (BMCR_ANRESTART);
  34 +                       phy_write(phydev, MII_BMCR, tmp);
  35 +                       return 0;
  36 +               }
  37 +               return -EINVAL;
  38 +
  39 +       case ETHTOOL_GLINK:
  40 +               edata.data = (phy_read(phydev,
  41 +                               MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
  42 +               if (copy_to_user(useraddr, &edata, sizeof(edata)))
  43 +                       return -EFAULT;
  44 +               return 0;
  45 +       }
  46 +
  47 +       return -EOPNOTSUPP;
  48 +}
  49 +EXPORT_SYMBOL(phy_ethtool_ioctl);
  50 +
  51  /**
  52   * phy_mii_ioctl - generic PHY MII ioctl interface
  53   * @phydev: the phy_device struct
  54 @@ -355,8 +399,8 @@ int phy_mii_ioctl(struct phy_device *phy
  55                 }
  56
  57                 phy_write(phydev, mii_data->reg_num, val);
  58 -
  59 -               if (mii_data->reg_num == MII_BMCR
  60 +
  61 +               if (mii_data->reg_num == MII_BMCR
  62                                 && val & BMCR_RESET
  63                                 && phydev->drv->config_init) {
  64                         phy_scan_fixups(phydev);
  65 @@ -471,7 +515,7 @@ static void phy_force_reduction(struct p
  66         int idx;
  67
  68         idx = phy_find_setting(phydev->speed, phydev->duplex);
  69 -
  70 +
  71         idx++;
  72
  73         idx = phy_find_valid(idx, phydev->supported);
  74 --- a/include/linux/phy.h
  75 +++ b/include/linux/phy.h
  76 @@ -477,6 +477,7 @@ void phy_start_machine(struct phy_device
  77  void phy_stop_machine(struct phy_device *phydev);
  78  int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  79  int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  80 +int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
  81  int phy_mii_ioctl(struct phy_device *phydev,
  82                 struct mii_ioctl_data *mii_data, int cmd);
  83  int phy_start_interrupts(struct phy_device *phydev);