lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/macb: change debugging messages

Browse Source 
Convert some noisy netdev_dbg() statements to netdev_vdbg(). Defining
DEBUG will no longer fill up the logs; VERBOSE_DEBUG still does.
Add one more verbose debug for ISR status.

Signed-off-by: Havard Skinnemoen <havard@skinnemoen.net>
[nicolas.ferre@atmel.com: split patch in topics, add ISR status]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Havard Skinnemoen
2012-10-31 06:04:52 +00:00
committed by David S. Miller
parent 03dbe05fe4
commit a268adb1c8
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/cadence/macb.c
View File

@@ -314,7 +314,7 @@ static void macb_tx(struct macb *bp)
status = macb_readl(bp, TSR); status = macb_readl(bp, TSR);
macb_writel(bp, TSR, status); macb_writel(bp, TSR, status);
netdev_dbg(bp->dev, "macb_tx status = %02lx\n", (unsigned long)status); netdev_vdbg(bp->dev, "macb_tx status = %02lx\n", (unsigned long)status);
if (status & (MACB_BIT(UND) | MACB_BIT(TSR_RLE))) { if (status & (MACB_BIT(UND) | MACB_BIT(TSR_RLE))) {
int i; int i;
@@ -381,7 +381,7 @@ static void macb_tx(struct macb *bp)
if (!(bufstat & MACB_BIT(TX_USED))) if (!(bufstat & MACB_BIT(TX_USED)))
break; break;
netdev_dbg(bp->dev, "skb %u (data %p) TX complete\n", netdev_vdbg(bp->dev, "skb %u (data %p) TX complete\n",
tail, skb->data); tail, skb->data);
dma_unmap_single(&bp->pdev->dev, rp->mapping, skb->len, dma_unmap_single(&bp->pdev->dev, rp->mapping, skb->len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
@@ -407,7 +407,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
len = MACB_BFEXT(RX_FRMLEN, bp->rx_ring[last_frag].ctrl); len = MACB_BFEXT(RX_FRMLEN, bp->rx_ring[last_frag].ctrl);
netdev_dbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n", netdev_vdbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n",
first_frag, last_frag, len); first_frag, last_frag, len);
skb = netdev_alloc_skb(bp->dev, len + RX_OFFSET); skb = netdev_alloc_skb(bp->dev, len + RX_OFFSET);
@@ -454,7 +454,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
bp->stats.rx_packets++; bp->stats.rx_packets++;
bp->stats.rx_bytes += len; bp->stats.rx_bytes += len;
netdev_dbg(bp->dev, "received skb of length %u, csum: %08x\n", netdev_vdbg(bp->dev, "received skb of length %u, csum: %08x\n",
skb->len, skb->csum); skb->len, skb->csum);
netif_receive_skb(skb); netif_receive_skb(skb);
@@ -536,7 +536,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
work_done = 0; work_done = 0;
netdev_dbg(bp->dev, "poll: status = %08lx, budget = %d\n", netdev_vdbg(bp->dev, "poll: status = %08lx, budget = %d\n",
(unsigned long)status, budget); (unsigned long)status, budget);
work_done = macb_rx(bp, budget); work_done = macb_rx(bp, budget);
@@ -575,6 +575,8 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
break; break;
} }
netdev_vdbg(bp->dev, "isr = 0x%08lx\n", (unsigned long)status);
if (status & MACB_RX_INT_FLAGS) { if (status & MACB_RX_INT_FLAGS) {
/* /*
* There's no point taking any more interrupts * There's no point taking any more interrupts
@@ -586,7 +588,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
macb_writel(bp, IDR, MACB_RX_INT_FLAGS); macb_writel(bp, IDR, MACB_RX_INT_FLAGS);
if (napi_schedule_prep(&bp->napi)) { if (napi_schedule_prep(&bp->napi)) {
netdev_dbg(bp->dev, "scheduling RX softirq\n"); netdev_vdbg(bp->dev, "scheduling RX softirq\n");
__napi_schedule(&bp->napi); __napi_schedule(&bp->napi);
} }
} }
@@ -648,8 +650,8 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
u32 ctrl; u32 ctrl;
unsigned long flags; unsigned long flags;
#ifdef DEBUG #if defined(DEBUG) && defined(VERBOSE_DEBUG)
netdev_dbg(bp->dev, netdev_vdbg(bp->dev,
"start_xmit: len %u head %p data %p tail %p end %p\n", "start_xmit: len %u head %p data %p tail %p end %p\n",
skb->len, skb->head, skb->data, skb->len, skb->head, skb->data,
skb_tail_pointer(skb), skb_end_pointer(skb)); skb_tail_pointer(skb), skb_end_pointer(skb));
@@ -671,12 +673,12 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
} }
entry = bp->tx_head; entry = bp->tx_head;
netdev_dbg(bp->dev, "Allocated ring entry %u\n", entry); netdev_vdbg(bp->dev, "Allocated ring entry %u\n", entry);
mapping = dma_map_single(&bp->pdev->dev, skb->data, mapping = dma_map_single(&bp->pdev->dev, skb->data,
len, DMA_TO_DEVICE); len, DMA_TO_DEVICE);
bp->tx_skb[entry].skb = skb; bp->tx_skb[entry].skb = skb;
bp->tx_skb[entry].mapping = mapping; bp->tx_skb[entry].mapping = mapping;
netdev_dbg(bp->dev, "Mapped skb data %p to DMA addr %08lx\n", netdev_vdbg(bp->dev, "Mapped skb data %p to DMA addr %08lx\n",
skb->data, (unsigned long)mapping); skb->data, (unsigned long)mapping);
ctrl = MACB_BF(TX_FRMLEN, len); ctrl = MACB_BF(TX_FRMLEN, len);