[Socketcan-users] [RFC 2/3] [flexcan] Add support for CONFIG_CAN_DEBUG_DEVICES

[Robin Holt]

Add a wrapper function for a register dump when CONFIG_CAN_DEBUG_DEVICES
is set.

Signed-off-by: Robin Holt <h...@sgi.com>
To: Marc Kleine-Budde <m...@pengutronix.de>
Cc: socketcan-users@lists.berlios.de
---
 drivers/net/can/flexcan.c |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 74b1706..62a20df 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -220,6 +220,37 @@ static inline void flexcan_write(u32 val, void __iomem 
*addr)
 }
 #endif
 
+#ifdef CONFIG_CAN_DEBUG_DEVICES
+void _flexcan_reg_dump(struct net_device *dev, const char *file, int line,
+                      const char *func)
+{
+       const struct flexcan_priv *priv = netdev_priv(dev);
+       struct flexcan_regs __iomem *regs = priv->base;
+
+       printk(KERN_INFO "flexcan_reg_dump:%s:%d:%s()\n", file, line, func);
+       printk(KERN_INFO
+               "\t  mcr 0x%08x  ctrl 0x%08x timer 0x%08x   rxg 0x%08x",
+               flexcan_read(&regs->mcr),
+               flexcan_read(&regs->ctrl),
+               flexcan_read(&regs->timer),
+               flexcan_read(&regs->rxgmask));
+       printk(KERN_INFO
+               "\t rx14 0x%08x  rx15 0x%08x   ecr 0x%08x   esr 0x%08x",
+               flexcan_read(&regs->rx14mask),
+               flexcan_read(&regs->rx15mask),
+               flexcan_read(&regs->ecr),
+               flexcan_read(&regs->esr));
+       printk(KERN_INFO
+               "\timsk2 0x%08x imsk1 0x%08x iflg2 0x%08x iflg1 0x%08x",
+               flexcan_read(&regs->imask2),
+               flexcan_read(&regs->imask1),
+               flexcan_read(&regs->iflag2),
+               flexcan_read(&regs->iflag1));
+}
+#define flexcan_reg_dump(_d) _flexcan_reg_dump(_d, __FILE__, __LINE__, 
__func__)
+#else
+#define flexcan_reg_dump(_d)
+#endif
 /*
  * Swtich transceiver on or off
  */
@@ -280,6 +311,8 @@ static int flexcan_start_xmit(struct sk_buff *skb, struct 
net_device *dev)
        u32 can_id;
        u32 ctrl = FLEXCAN_MB_CNT_CODE(0xc) | (cf->can_dlc << 16);
 
+       flexcan_reg_dump(dev);
+
        if (can_dropped_invalid_skb(dev, skb))
                return NETDEV_TX_OK;
 
@@ -312,6 +345,8 @@ static int flexcan_start_xmit(struct sk_buff *skb, struct 
net_device *dev)
        /* tx_packets is incremented in flexcan_irq */
        stats->tx_bytes += cf->can_dlc;
 
+       flexcan_reg_dump(dev);
+
        return NETDEV_TX_OK;
 }
 
@@ -580,6 +615,8 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
        struct flexcan_regs __iomem *regs = priv->base;
        u32 reg_iflag1, reg_esr;
 
+       flexcan_reg_dump(dev);
+
        reg_iflag1 = flexcan_read(&regs->iflag1);
        reg_esr = flexcan_read(&regs->esr);
        flexcan_write(FLEXCAN_ESR_ERR_INT, &regs->esr); /* ACK err IRQ */
@@ -620,6 +657,8 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
                netif_wake_queue(dev);
        }
 
+       flexcan_reg_dump(dev);
+
        return IRQ_HANDLED;
 }
 
-- 
1.7.2.1

_______________________________________________
Socketcan-users mailing list
Socketcan-users@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/socketcan-users