74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
79 lines
2.3 KiB
Diff
79 lines
2.3 KiB
Diff
From: John Crispin <john@phrozen.org>
|
|
Subject: net: phy: add phy_ethtool_ioctl()
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/net/phy/phy.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
|
include/linux/phy.h | 1 +
|
|
2 files changed, 45 insertions(+)
|
|
|
|
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
|
|
index a9be26f1f677..d0a5ac1d6445 100644
|
|
--- a/drivers/net/phy/phy.c
|
|
+++ b/drivers/net/phy/phy.c
|
|
@@ -466,6 +466,50 @@ int phy_ethtool_ksettings_get(struct phy_device *phydev,
|
|
}
|
|
EXPORT_SYMBOL(phy_ethtool_ksettings_get);
|
|
|
|
+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
|
|
diff --git a/include/linux/phy.h b/include/linux/phy.h
|
|
index bd22670e2182..93c1e74afc44 100644
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -813,6 +813,7 @@ int phy_ethtool_ksettings_get(struct phy_device *phydev,
|
|
struct ethtool_link_ksettings *cmd);
|
|
int phy_ethtool_ksettings_set(struct phy_device *phydev,
|
|
const struct ethtool_link_ksettings *cmd);
|
|
+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr);
|
|
int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);
|
|
int phy_start_interrupts(struct phy_device *phydev);
|
|
void phy_print_status(struct phy_device *phydev);
|
|
--
|
|
2.11.0
|
|
|