2 files changed, 55 insertions, 0 deletions

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index aa0dcb3833d1..eb1a48da2d43 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -498,6 +498,7 @@ struct ethtool_ops {
         int     (*get_rxnfc)(struct net_device *, struct ethtool_rxnfc *, void *);
         int     (*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *);
         int     (*flash_device)(struct net_device *, struct ethtool_flash *);
+        int     (*reset)(struct net_device *, u32 *);
 };
 #endif /* __KERNEL__ */
 
@@ -555,6 +556,7 @@ struct ethtool_ops {
 #define ETHTOOL_SRXCLSRLDEL     0x00000031 /* Delete RX classification rule */
 #define ETHTOOL_SRXCLSRLINS     0x00000032 /* Insert RX classification rule */
 #define ETHTOOL_FLASHDEV        0x00000033 /* Flash firmware to device */
+#define ETHTOOL_RESET           0x00000034 /* Reset hardware */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
@@ -685,4 +687,34 @@ struct ethtool_ops {
 
 #define RX_CLS_FLOW_DISC        0xffffffffffffffffULL
 
+/* Reset flags */
+/* The reset() operation must clear the flags for the components which
+ * were actually reset.  On successful return, the flags indicate the
+ * components which were not reset, either because they do not exist
+ * in the hardware or because they cannot be reset independently.  The
+ * driver must never reset any components that were not requested.
+ */
+enum ethtool_reset_flags {
+        /* These flags represent components dedicated to the interface
+         * the command is addressed to.  Shift any flag left by
+         * ETH_RESET_SHARED_SHIFT to reset a shared component of the
+         * same type.
+         */
+        ETH_RESET_MGMT          = 1 << 0,       /* Management processor */
+        ETH_RESET_IRQ           = 1 << 1,       /* Interrupt requester */
+        ETH_RESET_DMA           = 1 << 2,       /* DMA engine */
+        ETH_RESET_FILTER        = 1 << 3,       /* Filtering/flow direction */
+        ETH_RESET_OFFLOAD       = 1 << 4,       /* Protocol offload */
+        ETH_RESET_MAC           = 1 << 5,       /* Media access controller */
+        ETH_RESET_PHY           = 1 << 6,       /* Transceiver/PHY */
+        ETH_RESET_RAM           = 1 << 7,       /* RAM shared between
+                                                 * multiple components */
+
+        ETH_RESET_DEDICATED     = 0x0000ffff,   /* All components dedicated to
+                                                 * this interface */
+        ETH_RESET_ALL           = 0xffffffff,   /* All components used by this
+                                                 * interface, even if shared */
+};
+#define ETH_RESET_SHARED_SHIFT  16
+
 #endif /* _LINUX_ETHTOOL_H */
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index e1951084b973..d8aee584e8d1 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -302,6 +302,26 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
         return ret;
 }
 
+static int ethtool_reset(struct net_device *dev, char __user *useraddr)
+{
+        struct ethtool_value reset;
+        int ret;
+
+        if (!dev->ethtool_ops->reset)
+                return -EOPNOTSUPP;
+
+        if (copy_from_user(&reset, useraddr, sizeof(reset)))
+                return -EFAULT;
+
+        ret = dev->ethtool_ops->reset(dev, &reset.data);
+        if (ret)
+                return ret;
+
+        if (copy_to_user(useraddr, &reset, sizeof(reset)))
+                return -EFAULT;
+        return 0;
+}
+
 static int ethtool_get_wol(struct net_device *dev, char __user *useraddr)
 {
         struct ethtool_wolinfo wol = { ETHTOOL_GWOL };
@@ -1089,6 +1109,9 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_FLASHDEV:
                 rc = ethtool_flash_device(dev, useraddr);
                 break;
+        case ETHTOOL_RESET:
+                rc = ethtool_reset(dev, useraddr);
+                break;
         default:
                 rc = -EOPNOTSUPP;
         }