Skip to content

Commit

Permalink
cpmac: convert to napi_struct interface
Browse files Browse the repository at this point in the history 
Convert cpmac to new napi_struct API introduced by
bea3348 [NET]: Make NAPI polling independent
of struct net_device objects.
Only disable rx interrupts if napi actually has been scheduled.

Signed-off-by: Eugene Konev <ejka@imfi.kspu.ru>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Eugene Konev authored and Jeff Garzik committed Oct 25, 2007
1 parent df523b5 commit 67d129d
Showing 1 changed file with 37 additions and 31 deletions.
68 changes: 37 additions & 31 deletions drivers/net/cpmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ struct cpmac_priv {
struct net_device *dev;
struct work_struct reset_work;
struct platform_device *pdev;
struct napi_struct napi;
};

static irqreturn_t cpmac_irq(int, void *);
Expand Down Expand Up @@ -356,47 +357,48 @@ static void cpmac_set_multicast_list(struct net_device *dev)
}
}

static struct sk_buff *cpmac_rx_one(struct net_device *dev,
struct cpmac_priv *priv,
static struct sk_buff *cpmac_rx_one(struct cpmac_priv *priv,
struct cpmac_desc *desc)
{
struct sk_buff *skb, *result = NULL;

if (unlikely(netif_msg_hw(priv)))
cpmac_dump_desc(dev, desc);
cpmac_dump_desc(priv->dev, desc);
cpmac_write(priv->regs, CPMAC_RX_ACK(0), (u32)desc->mapping);
if (unlikely(!desc->datalen)) {
if (netif_msg_rx_err(priv) && net_ratelimit())
printk(KERN_WARNING "%s: rx: spurious interrupt\n",
dev->name);
priv->dev->name);
return NULL;
}

skb = netdev_alloc_skb(dev, CPMAC_SKB_SIZE);
skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
if (likely(skb)) {
skb_reserve(skb, 2);
skb_put(desc->skb, desc->datalen);
desc->skb->protocol = eth_type_trans(desc->skb, dev);
desc->skb->protocol = eth_type_trans(desc->skb, priv->dev);
desc->skb->ip_summed = CHECKSUM_NONE;
dev->stats.rx_packets++;
dev->stats.rx_bytes += desc->datalen;
priv->dev->stats.rx_packets++;
priv->dev->stats.rx_bytes += desc->datalen;
result = desc->skb;
dma_unmap_single(&dev->dev, desc->data_mapping, CPMAC_SKB_SIZE,
DMA_FROM_DEVICE);
dma_unmap_single(&priv->dev->dev, desc->data_mapping,
CPMAC_SKB_SIZE, DMA_FROM_DEVICE);
desc->skb = skb;
desc->data_mapping = dma_map_single(&dev->dev, skb->data,
desc->data_mapping = dma_map_single(&priv->dev->dev, skb->data,
CPMAC_SKB_SIZE,
DMA_FROM_DEVICE);
desc->hw_data = (u32)desc->data_mapping;
if (unlikely(netif_msg_pktdata(priv))) {
printk(KERN_DEBUG "%s: received packet:\n", dev->name);
cpmac_dump_skb(dev, result);
printk(KERN_DEBUG "%s: received packet:\n",
priv->dev->name);
cpmac_dump_skb(priv->dev, result);
}
} else {
if (netif_msg_rx_err(priv) && net_ratelimit())
printk(KERN_WARNING
"%s: low on skbs, dropping packet\n", dev->name);
dev->stats.rx_dropped++;
"%s: low on skbs, dropping packet\n",
priv->dev->name);
priv->dev->stats.rx_dropped++;
}

desc->buflen = CPMAC_SKB_SIZE;
Expand All @@ -405,25 +407,25 @@ static struct sk_buff *cpmac_rx_one(struct net_device *dev,
return result;
}

static int cpmac_poll(struct net_device *dev, int *budget)
static int cpmac_poll(struct napi_struct *napi, int budget)
{
struct sk_buff *skb;
struct cpmac_desc *desc;
int received = 0, quota = min(dev->quota, *budget);
struct cpmac_priv *priv = netdev_priv(dev);
int received = 0;
struct cpmac_priv *priv = container_of(napi, struct cpmac_priv, napi);

spin_lock(&priv->rx_lock);
if (unlikely(!priv->rx_head)) {
if (netif_msg_rx_err(priv) && net_ratelimit())
printk(KERN_WARNING "%s: rx: polling, but no queue\n",
dev->name);
netif_rx_complete(dev);
priv->dev->name);
netif_rx_complete(priv->dev, napi);
return 0;
}

desc = priv->rx_head;
while ((received < quota) && ((desc->dataflags & CPMAC_OWN) == 0)) {
skb = cpmac_rx_one(dev, priv, desc);
while (((desc->dataflags & CPMAC_OWN) == 0) && (received < budget)) {
skb = cpmac_rx_one(priv, desc);
if (likely(skb)) {
netif_receive_skb(skb);
received++;
Expand All @@ -433,13 +435,11 @@ static int cpmac_poll(struct net_device *dev, int *budget)

priv->rx_head = desc;
spin_unlock(&priv->rx_lock);
*budget -= received;
dev->quota -= received;
if (unlikely(netif_msg_rx_status(priv)))
printk(KERN_DEBUG "%s: poll processed %d packets\n", dev->name,
received);
printk(KERN_DEBUG "%s: poll processed %d packets\n",
priv->dev->name, received);
if (desc->dataflags & CPMAC_OWN) {
netif_rx_complete(dev);
netif_rx_complete(priv->dev, napi);
cpmac_write(priv->regs, CPMAC_RX_PTR(0), (u32)desc->mapping);
cpmac_write(priv->regs, CPMAC_RX_INT_ENABLE, 1);
return 0;
Expand Down Expand Up @@ -649,6 +649,7 @@ static void cpmac_hw_error(struct work_struct *work)
spin_unlock(&priv->rx_lock);
cpmac_clear_tx(priv->dev);
cpmac_hw_start(priv->dev);
napi_enable(&priv->napi);
netif_start_queue(priv->dev);
}

Expand All @@ -675,8 +676,10 @@ static irqreturn_t cpmac_irq(int irq, void *dev_id)

if (status & MAC_INT_RX) {
queue = (status >> 8) & 7;
netif_rx_schedule(dev);
cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 1 << queue);
if (netif_rx_schedule_prep(dev, &priv->napi)) {
cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 1 << queue);
__netif_rx_schedule(dev, &priv->napi);
}
}

cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0);
Expand All @@ -686,6 +689,7 @@ static irqreturn_t cpmac_irq(int irq, void *dev_id)
printk(KERN_ERR "%s: hw error, resetting...\n",
dev->name);
netif_stop_queue(dev);
napi_disable(&priv->napi);
cpmac_hw_stop(dev);
schedule_work(&priv->reset_work);
if (unlikely(netif_msg_hw(priv)))
Expand Down Expand Up @@ -921,6 +925,7 @@ static int cpmac_open(struct net_device *dev)
INIT_WORK(&priv->reset_work, cpmac_hw_error);
cpmac_hw_start(dev);

napi_enable(&priv->napi);
priv->phy->state = PHY_CHANGELINK;
phy_start(priv->phy);

Expand Down Expand Up @@ -959,6 +964,7 @@ static int cpmac_stop(struct net_device *dev)
netif_stop_queue(dev);

cancel_work_sync(&priv->reset_work);
napi_disable(&priv->napi);
phy_stop(priv->phy);
phy_disconnect(priv->phy);
priv->phy = NULL;
Expand Down Expand Up @@ -1048,10 +1054,10 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
dev->set_multicast_list = cpmac_set_multicast_list;
dev->tx_timeout = cpmac_tx_timeout;
dev->ethtool_ops = &cpmac_ethtool_ops;
dev->poll = cpmac_poll;
dev->weight = 64;
dev->features |= NETIF_F_MULTI_QUEUE;

netif_napi_add(dev, &priv->napi, cpmac_poll, 64);

spin_lock_init(&priv->lock);
spin_lock_init(&priv->rx_lock);
priv->dev = dev;
Expand Down

0 comments on commit 67d129d

Please sign in to comment.