summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khc@pm.waw.pl>2008-12-21 00:02:34 +0100
committerKrzysztof Hałasa <khc@pm.waw.pl>2008-12-22 00:42:55 +0100
commit490b77224fe66c77ab7cb48d6b77e62cb55591a0 (patch)
tree3226880ee9dbe449b45cd1cea87a080b77d2009c /drivers
parent4954936e25cb8ce99a96cac9dd9417d7b639867a (diff)
downloadblackbird-op-linux-490b77224fe66c77ab7cb48d6b77e62cb55591a0.tar.gz
blackbird-op-linux-490b77224fe66c77ab7cb48d6b77e62cb55591a0.zip
IXP4xx: Add ethtool support to Ethernet driver.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/arm/ixp4xx_eth.c45
1 files changed, 45 insertions, 0 deletions
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 1bbb7b8cb0da..3f72eb66e7f1 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -170,6 +170,7 @@ struct port {
u32 desc_tab_phys;
int id; /* logical port ID */
int speed, duplex;
+ u8 firmware[4];
};
/* NPE message structure */
@@ -795,6 +796,45 @@ static int eth_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
}
+/* ethtool support */
+
+static void ixp4xx_get_drvinfo(struct net_device *dev,
+ struct ethtool_drvinfo *info)
+{
+ struct port *port = netdev_priv(dev);
+ strcpy(info->driver, DRV_NAME);
+ snprintf(info->fw_version, sizeof(info->fw_version), "%u:%u:%u:%u",
+ port->firmware[0], port->firmware[1],
+ port->firmware[2], port->firmware[3]);
+ strcpy(info->bus_info, "internal");
+}
+
+static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ struct port *port = netdev_priv(dev);
+ return phy_ethtool_gset(port->phydev, cmd);
+}
+
+static int ixp4xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ struct port *port = netdev_priv(dev);
+ return phy_ethtool_sset(port->phydev, cmd);
+}
+
+static int ixp4xx_nway_reset(struct net_device *dev)
+{
+ struct port *port = netdev_priv(dev);
+ return phy_start_aneg(port->phydev);
+}
+
+static struct ethtool_ops ixp4xx_ethtool_ops = {
+ .get_drvinfo = ixp4xx_get_drvinfo,
+ .get_settings = ixp4xx_get_settings,
+ .set_settings = ixp4xx_set_settings,
+ .nway_reset = ixp4xx_nway_reset,
+ .get_link = ethtool_op_get_link,
+};
+
static int request_queues(struct port *port)
{
@@ -942,6 +982,10 @@ static int eth_open(struct net_device *dev)
npe_name(npe));
return -EIO;
}
+ port->firmware[0] = msg.byte4;
+ port->firmware[1] = msg.byte5;
+ port->firmware[2] = msg.byte6;
+ port->firmware[3] = msg.byte7;
}
memset(&msg, 0, sizeof(msg));
@@ -1151,6 +1195,7 @@ static int __devinit eth_init_one(struct platform_device *pdev)
dev->hard_start_xmit = eth_xmit;
dev->stop = eth_close;
dev->do_ioctl = eth_ioctl;
+ dev->ethtool_ops = &ixp4xx_ethtool_ops;
dev->set_multicast_list = eth_set_mcast_list;
dev->tx_queue_len = 100;
OpenPOWER on IntegriCloud