Skip to content

L
linux
Commit 17c5cde7 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

[netdrvr b44] ethtool_ops support

parent 4003ce2e
Show whitespace changes
Inline Side-by-side
Showing with 199 additions and 214 deletions
drivers/net/b44.c
View file @ 17c5cde7
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#define DRV_MODULE_NAME "b44" #define DRV_MODULE_NAME "b44"
#define PFX DRV_MODULE_NAME ": " #define PFX DRV_MODULE_NAME ": "
#define DRV_MODULE_VERSION "0.93" #define DRV_MODULE_VERSION "0.94"
#define DRV_MODULE_RELDATE "Mar, 2004" #define DRV_MODULE_RELDATE "May 4, 2004"
#define B44_DEF_MSG_ENABLE \ #define B44_DEF_MSG_ENABLE \
(NETIF_MSG_DRV | \ (NETIF_MSG_DRV | \
...@@ -1373,110 +1373,127 @@ static void b44_set_rx_mode(struct net_device *dev) ...@@ -1373,110 +1373,127 @@ static void b44_set_rx_mode(struct net_device *dev)
spin_unlock_irq(&bp->lock); spin_unlock_irq(&bp->lock);
} }
static int b44_ethtool_ioctl (struct net_device *dev, void __user *useraddr) static u32 b44_get_msglevel(struct net_device *dev)
{ {
struct b44 *bp = dev->priv; struct b44 *bp = netdev_priv(dev);
return bp->msg_enable;
}
static void b44_set_msglevel(struct net_device *dev, u32 value)
{
struct b44 *bp = netdev_priv(dev);
bp->msg_enable = value;
}
static void b44_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info)
{
struct b44 *bp = netdev_priv(dev);
struct pci_dev *pci_dev = bp->pdev; struct pci_dev *pci_dev = bp->pdev;
u32 ethcmd;
strcpy (info->driver, DRV_MODULE_NAME);
if (copy_from_user (&ethcmd, useraddr, sizeof (ethcmd))) strcpy (info->version, DRV_MODULE_VERSION);
return -EFAULT; strcpy (info->bus_info, pci_name(pci_dev));
}
switch (ethcmd) {
case ETHTOOL_GDRVINFO: { static int b44_nway_reset(struct net_device *dev)
struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; {
strcpy (info.driver, DRV_MODULE_NAME); struct b44 *bp = netdev_priv(dev);
strcpy (info.version, DRV_MODULE_VERSION); u32 bmcr;
memset(&info.fw_version, 0, sizeof(info.fw_version)); int r;
strcpy (info.bus_info, pci_name(pci_dev));
info.eedump_len = 0; spin_lock_irq(&bp->lock);
info.regdump_len = 0; b44_readphy(bp, MII_BMCR, &bmcr);
if (copy_to_user (useraddr, &info, sizeof (info))) b44_readphy(bp, MII_BMCR, &bmcr);
return -EFAULT; r = -EINVAL;
return 0; if (bmcr & BMCR_ANENABLE) {
b44_writephy(bp, MII_BMCR,
bmcr | BMCR_ANRESTART);
r = 0;
} }
spin_unlock_irq(&bp->lock);
return r;
}
case ETHTOOL_GSET: { static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
struct ethtool_cmd cmd = { ETHTOOL_GSET }; {
struct b44 *bp = netdev_priv(dev);
if (!(bp->flags & B44_FLAG_INIT_COMPLETE)) if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
return -EAGAIN; return -EAGAIN;
cmd.supported = (SUPPORTED_Autoneg); cmd->supported = (SUPPORTED_Autoneg);
cmd.supported |= (SUPPORTED_100baseT_Half | cmd->supported |= (SUPPORTED_100baseT_Half |
SUPPORTED_100baseT_Full | SUPPORTED_100baseT_Full |
SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Half |
SUPPORTED_10baseT_Full | SUPPORTED_10baseT_Full |
SUPPORTED_MII); SUPPORTED_MII);
cmd.advertising = 0; cmd->advertising = 0;
if (bp->flags & B44_FLAG_ADV_10HALF) if (bp->flags & B44_FLAG_ADV_10HALF)
cmd.advertising |= ADVERTISE_10HALF; cmd->advertising |= ADVERTISE_10HALF;
if (bp->flags & B44_FLAG_ADV_10FULL) if (bp->flags & B44_FLAG_ADV_10FULL)
cmd.advertising |= ADVERTISE_10FULL; cmd->advertising |= ADVERTISE_10FULL;
if (bp->flags & B44_FLAG_ADV_100HALF) if (bp->flags & B44_FLAG_ADV_100HALF)
cmd.advertising |= ADVERTISE_100HALF; cmd->advertising |= ADVERTISE_100HALF;
if (bp->flags & B44_FLAG_ADV_100FULL) if (bp->flags & B44_FLAG_ADV_100FULL)
cmd.advertising |= ADVERTISE_100FULL; cmd->advertising |= ADVERTISE_100FULL;
cmd.advertising |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; cmd->advertising |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
cmd.speed = (bp->flags & B44_FLAG_100_BASE_T) ? cmd->speed = (bp->flags & B44_FLAG_100_BASE_T) ?
SPEED_100 : SPEED_10; SPEED_100 : SPEED_10;
cmd.duplex = (bp->flags & B44_FLAG_FULL_DUPLEX) ? cmd->duplex = (bp->flags & B44_FLAG_FULL_DUPLEX) ?
DUPLEX_FULL : DUPLEX_HALF; DUPLEX_FULL : DUPLEX_HALF;
cmd.port = 0; cmd->port = 0;
cmd.phy_address = bp->phy_addr; cmd->phy_address = bp->phy_addr;
cmd.transceiver = (bp->flags & B44_FLAG_INTERNAL_PHY) ? cmd->transceiver = (bp->flags & B44_FLAG_INTERNAL_PHY) ?
XCVR_INTERNAL : XCVR_EXTERNAL; XCVR_INTERNAL : XCVR_EXTERNAL;
cmd.autoneg = (bp->flags & B44_FLAG_FORCE_LINK) ? cmd->autoneg = (bp->flags & B44_FLAG_FORCE_LINK) ?
AUTONEG_DISABLE : AUTONEG_ENABLE; AUTONEG_DISABLE : AUTONEG_ENABLE;
cmd.maxtxpkt = 0; cmd->maxtxpkt = 0;
cmd.maxrxpkt = 0; cmd->maxrxpkt = 0;
if (copy_to_user(useraddr, &cmd, sizeof(cmd)))
return -EFAULT;
return 0; return 0;
} }
case ETHTOOL_SSET: {
struct ethtool_cmd cmd; static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct b44 *bp = netdev_priv(dev);
if (!(bp->flags & B44_FLAG_INIT_COMPLETE)) if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
return -EAGAIN; return -EAGAIN;
if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
return -EFAULT;
/* We do not support gigabit. */ /* We do not support gigabit. */
if (cmd.autoneg == AUTONEG_ENABLE) { if (cmd->autoneg == AUTONEG_ENABLE) {
if (cmd.advertising & if (cmd->advertising &
(ADVERTISED_1000baseT_Half | (ADVERTISED_1000baseT_Half |
ADVERTISED_1000baseT_Full)) ADVERTISED_1000baseT_Full))
return -EINVAL; return -EINVAL;
} else if ((cmd.speed != SPEED_100 && } else if ((cmd->speed != SPEED_100 &&
cmd.speed != SPEED_10) || cmd->speed != SPEED_10) ||
(cmd.duplex != DUPLEX_HALF && (cmd->duplex != DUPLEX_HALF &&
cmd.duplex != DUPLEX_FULL)) { cmd->duplex != DUPLEX_FULL)) {
return -EINVAL; return -EINVAL;
} }
spin_lock_irq(&bp->lock); spin_lock_irq(&bp->lock);
if (cmd.autoneg == AUTONEG_ENABLE) { if (cmd->autoneg == AUTONEG_ENABLE) {
bp->flags &= ~B44_FLAG_FORCE_LINK; bp->flags &= ~B44_FLAG_FORCE_LINK;
bp->flags &= ~(B44_FLAG_ADV_10HALF | bp->flags &= ~(B44_FLAG_ADV_10HALF |
B44_FLAG_ADV_10FULL | B44_FLAG_ADV_10FULL |
B44_FLAG_ADV_100HALF | B44_FLAG_ADV_100HALF |
B44_FLAG_ADV_100FULL); B44_FLAG_ADV_100FULL);
if (cmd.advertising & ADVERTISE_10HALF) if (cmd->advertising & ADVERTISE_10HALF)
bp->flags |= B44_FLAG_ADV_10HALF; bp->flags |= B44_FLAG_ADV_10HALF;
if (cmd.advertising & ADVERTISE_10FULL) if (cmd->advertising & ADVERTISE_10FULL)
bp->flags |= B44_FLAG_ADV_10FULL; bp->flags |= B44_FLAG_ADV_10FULL;
if (cmd.advertising & ADVERTISE_100HALF) if (cmd->advertising & ADVERTISE_100HALF)
bp->flags |= B44_FLAG_ADV_100HALF; bp->flags |= B44_FLAG_ADV_100HALF;
if (cmd.advertising & ADVERTISE_100FULL) if (cmd->advertising & ADVERTISE_100FULL)
bp->flags |= B44_FLAG_ADV_100FULL; bp->flags |= B44_FLAG_ADV_100FULL;
} else { } else {
bp->flags |= B44_FLAG_FORCE_LINK; bp->flags |= B44_FLAG_FORCE_LINK;
if (cmd.speed == SPEED_100) if (cmd->speed == SPEED_100)
bp->flags |= B44_FLAG_100_BASE_T; bp->flags |= B44_FLAG_100_BASE_T;
if (cmd.duplex == DUPLEX_FULL) if (cmd->duplex == DUPLEX_FULL)
bp->flags |= B44_FLAG_FULL_DUPLEX; bp->flags |= B44_FLAG_FULL_DUPLEX;
} }
...@@ -1485,74 +1502,34 @@ static int b44_ethtool_ioctl (struct net_device *dev, void __user *useraddr) ...@@ -1485,74 +1502,34 @@ static int b44_ethtool_ioctl (struct net_device *dev, void __user *useraddr)
spin_unlock_irq(&bp->lock); spin_unlock_irq(&bp->lock);
return 0; return 0;
} }
case ETHTOOL_GMSGLVL: {
struct ethtool_value edata = { ETHTOOL_GMSGLVL };
edata.data = bp->msg_enable;
if (copy_to_user(useraddr, &edata, sizeof(edata)))
return -EFAULT;
return 0;
}
case ETHTOOL_SMSGLVL: {
struct ethtool_value edata;
if (copy_from_user(&edata, useraddr, sizeof(edata)))
return -EFAULT;
bp->msg_enable = edata.data;
return 0;
}
case ETHTOOL_NWAY_RST: {
u32 bmcr;
int r;
spin_lock_irq(&bp->lock);
b44_readphy(bp, MII_BMCR, &bmcr);
b44_readphy(bp, MII_BMCR, &bmcr);
r = -EINVAL;
if (bmcr & BMCR_ANENABLE) {
b44_writephy(bp, MII_BMCR,
bmcr | BMCR_ANRESTART);
r = 0;
}
spin_unlock_irq(&bp->lock);
return r; static void b44_get_ringparam(struct net_device *dev,
} struct ethtool_ringparam *ering)
case ETHTOOL_GLINK: { {
struct ethtool_value edata = { ETHTOOL_GLINK }; struct b44 *bp = netdev_priv(dev);
edata.data = netif_carrier_ok(bp->dev) ? 1 : 0;
if (copy_to_user(useraddr, &edata, sizeof(edata)))
return -EFAULT;
return 0;
}
case ETHTOOL_GRINGPARAM: {
struct ethtool_ringparam ering = { ETHTOOL_GRINGPARAM };
ering.rx_max_pending = B44_RX_RING_SIZE - 1; ering->rx_max_pending = B44_RX_RING_SIZE - 1;
ering.rx_pending = bp->rx_pending; ering->rx_pending = bp->rx_pending;
/* XXX ethtool lacks a tx_max_pending, oops... */ /* XXX ethtool lacks a tx_max_pending, oops... */
}
if (copy_to_user(useraddr, &ering, sizeof(ering))) static int b44_set_ringparam(struct net_device *dev,
return -EFAULT; struct ethtool_ringparam *ering)
return 0; {
} struct b44 *bp = netdev_priv(dev);
case ETHTOOL_SRINGPARAM: {
struct ethtool_ringparam ering;
if (copy_from_user(&ering, useraddr, sizeof(ering)))
return -EFAULT;
if ((ering.rx_pending > B44_RX_RING_SIZE - 1) || if ((ering->rx_pending > B44_RX_RING_SIZE - 1) ||
(ering.rx_mini_pending != 0) || (ering->rx_mini_pending != 0) ||
(ering.rx_jumbo_pending != 0) || (ering->rx_jumbo_pending != 0) ||
(ering.tx_pending > B44_TX_RING_SIZE - 1)) (ering->tx_pending > B44_TX_RING_SIZE - 1))
return -EINVAL; return -EINVAL;
spin_lock_irq(&bp->lock); spin_lock_irq(&bp->lock);
bp->rx_pending = ering.rx_pending; bp->rx_pending = ering->rx_pending;
bp->tx_pending = ering.tx_pending; bp->tx_pending = ering->tx_pending;
b44_halt(bp); b44_halt(bp);
b44_init_rings(bp); b44_init_rings(bp);
...@@ -1563,36 +1540,36 @@ static int b44_ethtool_ioctl (struct net_device *dev, void __user *useraddr) ...@@ -1563,36 +1540,36 @@ static int b44_ethtool_ioctl (struct net_device *dev, void __user *useraddr)
b44_enable_ints(bp); b44_enable_ints(bp);
return 0; return 0;
} }
case ETHTOOL_GPAUSEPARAM: {
struct ethtool_pauseparam epause = { ETHTOOL_GPAUSEPARAM }; static void b44_get_pauseparam(struct net_device *dev,
struct ethtool_pauseparam *epause)
{
struct b44 *bp = netdev_priv(dev);
epause.autoneg = epause->autoneg =
(bp->flags & B44_FLAG_PAUSE_AUTO) != 0; (bp->flags & B44_FLAG_PAUSE_AUTO) != 0;
epause.rx_pause = epause->rx_pause =
(bp->flags & B44_FLAG_RX_PAUSE) != 0; (bp->flags & B44_FLAG_RX_PAUSE) != 0;
epause.tx_pause = epause->tx_pause =
(bp->flags & B44_FLAG_TX_PAUSE) != 0; (bp->flags & B44_FLAG_TX_PAUSE) != 0;
if (copy_to_user(useraddr, &epause, sizeof(epause))) }
return -EFAULT;
return 0;
}
case ETHTOOL_SPAUSEPARAM: {
struct ethtool_pauseparam epause;
if (copy_from_user(&epause, useraddr, sizeof(epause))) static int b44_set_pauseparam(struct net_device *dev,
return -EFAULT; struct ethtool_pauseparam *epause)
{
struct b44 *bp = netdev_priv(dev);
spin_lock_irq(&bp->lock); spin_lock_irq(&bp->lock);
if (epause.autoneg) if (epause->autoneg)
bp->flags |= B44_FLAG_PAUSE_AUTO; bp->flags |= B44_FLAG_PAUSE_AUTO;
else else
bp->flags &= ~B44_FLAG_PAUSE_AUTO; bp->flags &= ~B44_FLAG_PAUSE_AUTO;
if (epause.rx_pause) if (epause->rx_pause)
bp->flags |= B44_FLAG_RX_PAUSE; bp->flags |= B44_FLAG_RX_PAUSE;
else else
bp->flags &= ~B44_FLAG_RX_PAUSE; bp->flags &= ~B44_FLAG_RX_PAUSE;
if (epause.tx_pause) if (epause->tx_pause)
bp->flags |= B44_FLAG_TX_PAUSE; bp->flags |= B44_FLAG_TX_PAUSE;
else else
bp->flags &= ~B44_FLAG_TX_PAUSE; bp->flags &= ~B44_FLAG_TX_PAUSE;
...@@ -1608,12 +1585,22 @@ static int b44_ethtool_ioctl (struct net_device *dev, void __user *useraddr) ...@@ -1608,12 +1585,22 @@ static int b44_ethtool_ioctl (struct net_device *dev, void __user *useraddr)
b44_enable_ints(bp); b44_enable_ints(bp);
return 0; return 0;
}
};
return -EOPNOTSUPP;
} }
static struct ethtool_ops b44_ethtool_ops = {
.get_drvinfo = b44_get_drvinfo,
.get_settings = b44_get_settings,
.set_settings = b44_set_settings,
.nway_reset = b44_nway_reset,
.get_link = ethtool_op_get_link,
.get_ringparam = b44_get_ringparam,
.set_ringparam = b44_set_ringparam,
.get_pauseparam = b44_get_pauseparam,
.set_pauseparam = b44_set_pauseparam,
.get_msglevel = b44_get_msglevel,
.set_msglevel = b44_set_msglevel,
};
static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
struct mii_ioctl_data __user *data = (struct mii_ioctl_data __user *)&ifr->ifr_data; struct mii_ioctl_data __user *data = (struct mii_ioctl_data __user *)&ifr->ifr_data;
...@@ -1621,9 +1608,6 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -1621,9 +1608,6 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
int err; int err;
switch (cmd) { switch (cmd) {
case SIOCETHTOOL:
return b44_ethtool_ioctl(dev, (void __user*) ifr->ifr_data);
case SIOCGMIIPHY: case SIOCGMIIPHY:
data->phy_id = bp->phy_addr; data->phy_id = bp->phy_addr;
...@@ -1797,6 +1781,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev, ...@@ -1797,6 +1781,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
dev->watchdog_timeo = B44_TX_TIMEOUT; dev->watchdog_timeo = B44_TX_TIMEOUT;
dev->change_mtu = b44_change_mtu; dev->change_mtu = b44_change_mtu;
dev->irq = pdev->irq; dev->irq = pdev->irq;
SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
err = b44_get_invariants(bp); err = b44_get_invariants(bp);
if (err) { if (err) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7