mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 23:50:37 +02:00
84 lines
2.2 KiB
Diff
84 lines
2.2 KiB
Diff
|
--- a/drivers/net/phy/phy.c
|
||
|
|
+++ b/drivers/net/phy/phy.c
|
||
|
|
@@ -299,6 +299,50 @@ int phy_ethtool_gset(struct phy_device *
|
||
|
|
}
|
||
|
|
EXPORT_SYMBOL(phy_ethtool_gset);
|
||
|
|
|
||
|
|
+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr)
|
||
|
|
+{
|
||
|
|
+ u32 cmd;
|
||
|
|
+ int tmp;
|
||
|
|
+ struct ethtool_cmd ecmd = { ETHTOOL_GSET };
|
||
|
|
+ struct ethtool_value edata = { ETHTOOL_GLINK };
|
||
|
|
+
|
||
|
|
+ if (get_user(cmd, (u32 *) useraddr))
|
||
|
|
+ return -EFAULT;
|
||
|
|
+
|
||
|
|
+ switch (cmd) {
|
||
|
|
+ case ETHTOOL_GSET:
|
||
|
|
+ phy_ethtool_gset(phydev, &ecmd);
|
||
|
|
+ if (copy_to_user(useraddr, &ecmd, sizeof(ecmd)))
|
||
|
|
+ return -EFAULT;
|
||
|
|
+ return 0;
|
||
|
|
+
|
||
|
|
+ case ETHTOOL_SSET:
|
||
|
|
+ if (copy_from_user(&ecmd, useraddr, sizeof(ecmd)))
|
||
|
|
+ return -EFAULT;
|
||
|
|
+ return phy_ethtool_sset(phydev, &ecmd);
|
||
|
|
+
|
||
|
|
+ case ETHTOOL_NWAY_RST:
|
||
|
|
+ /* if autoneg is off, it's an error */
|
||
|
|
+ tmp = phy_read(phydev, MII_BMCR);
|
||
|
|
+ if (tmp & BMCR_ANENABLE) {
|
||
|
|
+ tmp |= (BMCR_ANRESTART);
|
||
|
|
+ phy_write(phydev, MII_BMCR, tmp);
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
+ return -EINVAL;
|
||
|
|
+
|
||
|
|
+ case ETHTOOL_GLINK:
|
||
|
|
+ edata.data = (phy_read(phydev,
|
||
|
|
+ MII_BMSR) & BMSR_LSTATUS) ? 1 : 0;
|
||
|
|
+ if (copy_to_user(useraddr, &edata, sizeof(edata)))
|
||
|
|
+ return -EFAULT;
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return -EOPNOTSUPP;
|
||
|
|
+}
|
||
|
|
+EXPORT_SYMBOL(phy_ethtool_ioctl);
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* phy_mii_ioctl - generic PHY MII ioctl interface
|
||
|
|
* @phydev: the phy_device struct
|
||
|
|
@@ -355,8 +399,8 @@ int phy_mii_ioctl(struct phy_device *phy
|
||
|
|
}
|
||
|
|
|
||
|
|
phy_write(phydev, mii_data->reg_num, val);
|
||
|
|
-
|
||
|
|
- if (mii_data->reg_num == MII_BMCR
|
||
|
|
+
|
||
|
|
+ if (mii_data->reg_num == MII_BMCR
|
||
|
|
&& val & BMCR_RESET
|
||
|
|
&& phydev->drv->config_init) {
|
||
|
|
phy_scan_fixups(phydev);
|
||
|
|
@@ -471,7 +515,7 @@ static void phy_force_reduction(struct p
|
||
|
|
int idx;
|
||
|
|
|
||
|
|
idx = phy_find_setting(phydev->speed, phydev->duplex);
|
||
|
|
-
|
||
|
|
+
|
||
|
|
idx++;
|
||
|
|
|
||
|
|
idx = phy_find_valid(idx, phydev->supported);
|
||
|
|
--- a/include/linux/phy.h
|
||
|
|
+++ b/include/linux/phy.h
|
||
|
|
@@ -489,6 +489,7 @@ void phy_start_machine(struct phy_device
|
||
|
|
void phy_stop_machine(struct phy_device *phydev);
|
||
|
|
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
|
||
|
|
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
|
||
|
|
+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
|
||
|
|
int phy_mii_ioctl(struct phy_device *phydev,
|
||
|
|
struct mii_ioctl_data *mii_data, int cmd);
|
||
|
|
int phy_start_interrupts(struct phy_device *phydev);
|