Commit e95c3eda authored by David S. Miller's avatar David S. Miller

Merge branch 'ethoc'

Max Filippov says:

====================
OpenCores 10/100 MAC ethtool operations

this series implements ethtool callbacks for the ethoc driver as was
requested by Florian.

Changes v1->v2:
- fix {get,set}_settings return code in case there's no PHY;
- fix set_ringparam: check ring sizes, change ring sizes on the fly.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 65b80cae bee7bacd
...@@ -51,6 +51,7 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size"); ...@@ -51,6 +51,7 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");
#define ETH_HASH0 0x48 #define ETH_HASH0 0x48
#define ETH_HASH1 0x4c #define ETH_HASH1 0x4c
#define ETH_TXCTRL 0x50 #define ETH_TXCTRL 0x50
#define ETH_END 0x54
/* mode register */ /* mode register */
#define MODER_RXEN (1 << 0) /* receive enable */ #define MODER_RXEN (1 << 0) /* receive enable */
...@@ -179,6 +180,7 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size"); ...@@ -179,6 +180,7 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");
* @membase: pointer to buffer memory region * @membase: pointer to buffer memory region
* @dma_alloc: dma allocated buffer size * @dma_alloc: dma allocated buffer size
* @io_region_size: I/O memory region size * @io_region_size: I/O memory region size
* @num_bd: number of buffer descriptors
* @num_tx: number of send buffers * @num_tx: number of send buffers
* @cur_tx: last send buffer written * @cur_tx: last send buffer written
* @dty_tx: last buffer actually sent * @dty_tx: last buffer actually sent
...@@ -199,6 +201,7 @@ struct ethoc { ...@@ -199,6 +201,7 @@ struct ethoc {
int dma_alloc; int dma_alloc;
resource_size_t io_region_size; resource_size_t io_region_size;
unsigned int num_bd;
unsigned int num_tx; unsigned int num_tx;
unsigned int cur_tx; unsigned int cur_tx;
unsigned int dty_tx; unsigned int dty_tx;
...@@ -890,6 +893,102 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -890,6 +893,102 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
static int ethoc_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct ethoc *priv = netdev_priv(dev);
struct phy_device *phydev = priv->phy;
if (!phydev)
return -EOPNOTSUPP;
return phy_ethtool_gset(phydev, cmd);
}
static int ethoc_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct ethoc *priv = netdev_priv(dev);
struct phy_device *phydev = priv->phy;
if (!phydev)
return -EOPNOTSUPP;
return phy_ethtool_sset(phydev, cmd);
}
static int ethoc_get_regs_len(struct net_device *netdev)
{
return ETH_END;
}
static void ethoc_get_regs(struct net_device *dev, struct ethtool_regs *regs,
void *p)
{
struct ethoc *priv = netdev_priv(dev);
u32 *regs_buff = p;
unsigned i;
regs->version = 0;
for (i = 0; i < ETH_END / sizeof(u32); ++i)
regs_buff[i] = ethoc_read(priv, i * sizeof(u32));
}
static void ethoc_get_ringparam(struct net_device *dev,
struct ethtool_ringparam *ring)
{
struct ethoc *priv = netdev_priv(dev);
ring->rx_max_pending = priv->num_bd - 1;
ring->rx_mini_max_pending = 0;
ring->rx_jumbo_max_pending = 0;
ring->tx_max_pending = priv->num_bd - 1;
ring->rx_pending = priv->num_rx;
ring->rx_mini_pending = 0;
ring->rx_jumbo_pending = 0;
ring->tx_pending = priv->num_tx;
}
static int ethoc_set_ringparam(struct net_device *dev,
struct ethtool_ringparam *ring)
{
struct ethoc *priv = netdev_priv(dev);
if (ring->tx_pending < 1 || ring->rx_pending < 1 ||
ring->tx_pending + ring->rx_pending > priv->num_bd)
return -EINVAL;
if (ring->rx_mini_pending || ring->rx_jumbo_pending)
return -EINVAL;
if (netif_running(dev)) {
netif_tx_disable(dev);
ethoc_disable_rx_and_tx(priv);
ethoc_disable_irq(priv, INT_MASK_TX | INT_MASK_RX);
synchronize_irq(dev->irq);
}
priv->num_tx = rounddown_pow_of_two(ring->tx_pending);
priv->num_rx = ring->rx_pending;
ethoc_init_ring(priv, dev->mem_start);
if (netif_running(dev)) {
ethoc_enable_irq(priv, INT_MASK_TX | INT_MASK_RX);
ethoc_enable_rx_and_tx(priv);
netif_wake_queue(dev);
}
return 0;
}
const struct ethtool_ops ethoc_ethtool_ops = {
.get_settings = ethoc_get_settings,
.set_settings = ethoc_set_settings,
.get_regs_len = ethoc_get_regs_len,
.get_regs = ethoc_get_regs,
.get_link = ethtool_op_get_link,
.get_ringparam = ethoc_get_ringparam,
.set_ringparam = ethoc_set_ringparam,
.get_ts_info = ethtool_op_get_ts_info,
};
static const struct net_device_ops ethoc_netdev_ops = { static const struct net_device_ops ethoc_netdev_ops = {
.ndo_open = ethoc_open, .ndo_open = ethoc_open,
.ndo_stop = ethoc_stop, .ndo_stop = ethoc_stop,
...@@ -1016,6 +1115,7 @@ static int ethoc_probe(struct platform_device *pdev) ...@@ -1016,6 +1115,7 @@ static int ethoc_probe(struct platform_device *pdev)
ret = -ENODEV; ret = -ENODEV;
goto error; goto error;
} }
priv->num_bd = num_bd;
/* num_tx must be a power of two */ /* num_tx must be a power of two */
priv->num_tx = rounddown_pow_of_two(num_bd >> 1); priv->num_tx = rounddown_pow_of_two(num_bd >> 1);
priv->num_rx = num_bd - priv->num_tx; priv->num_rx = num_bd - priv->num_tx;
...@@ -1111,6 +1211,7 @@ static int ethoc_probe(struct platform_device *pdev) ...@@ -1111,6 +1211,7 @@ static int ethoc_probe(struct platform_device *pdev)
netdev->netdev_ops = &ethoc_netdev_ops; netdev->netdev_ops = &ethoc_netdev_ops;
netdev->watchdog_timeo = ETHOC_TIMEOUT; netdev->watchdog_timeo = ETHOC_TIMEOUT;
netdev->features |= 0; netdev->features |= 0;
netdev->ethtool_ops = &ethoc_ethtool_ops;
/* setup NAPI */ /* setup NAPI */
netif_napi_add(netdev, &priv->napi, ethoc_poll, 64); netif_napi_add(netdev, &priv->napi, ethoc_poll, 64);
......
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