[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4E3B98B6.4040003@pengutronix.de>
Date: Fri, 05 Aug 2011 09:16:06 +0200
From: Marc Kleine-Budde <mkl@...gutronix.de>
To: Robin Holt <holt@....com>
CC: Wolfgang Grandegger <wg@...ndegger.com>,
socketcan-core@...ts.berlios.de, netdev@...r.kernel.org
Subject: Re: [RFC 4/4] [flexcan] Add support for FLEXCAN_DEBUG
On 08/05/2011 04:06 AM, Robin Holt wrote:
> Add a wrapper function for a register dump when a developer defines
> FLEXCAN_DEBUG
Comments inline..however I'm not sure if we need this patch.
> Signed-off-by: Robin Holt <holt@....com>
> To: Marc Kleine-Budde <mkl@...gutronix.de>
> To: Wolfgang Grandegger <wg@...ndegger.com>
> Cc: socketcan-core@...ts.berlios.de
> Cc: netdev@...r.kernel.org
> ---
> drivers/net/can/flexcan.c | 40 ++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 40 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
> index fbb61c6..96684ca 100644
> --- a/drivers/net/can/flexcan.c
> +++ b/drivers/net/can/flexcan.c
> @@ -316,6 +316,38 @@ static inline unsigned long flexcan_clk_get_rate(struct clk *clk)
>
> #endif
>
> +#if defined(FLEXCAN_DEBUG)
> +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);
Use netdev_$LEVEL, please.
If you use dbg, you can remove the ifdef altogether.
> + printk(KERN_INFO
> + "\t mcr 0x%08x ctrl 0x%08x timer 0x%08x rxg 0x%08x",
> + flexcan_read(®s->mcr),
> + flexcan_read(®s->ctrl),
> + flexcan_read(®s->timer),
> + flexcan_read(®s->rxgmask));
> + printk(KERN_INFO
> + "\t rx14 0x%08x rx15 0x%08x ecr 0x%08x esr 0x%08x",
> + flexcan_read(®s->rx14mask),
> + flexcan_read(®s->rx15mask),
> + flexcan_read(®s->ecr),
> + flexcan_read(®s->esr));
> + printk(KERN_INFO
> + "\timsk2 0x%08x imsk1 0x%08x iflg2 0x%08x iflg1 0x%08x",
> + flexcan_read(®s->imask2),
> + flexcan_read(®s->imask1),
> + flexcan_read(®s->iflag2),
> + flexcan_read(®s->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
> */
> @@ -376,6 +408,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;
>
> @@ -408,6 +442,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;
> }
>
> @@ -676,6 +712,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(®s->iflag1);
> reg_esr = flexcan_read(®s->esr);
> flexcan_write(FLEXCAN_ESR_ERR_INT, ®s->esr); /* ACK err IRQ */
> @@ -716,6 +754,8 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
> netif_wake_queue(dev);
> }
>
> + flexcan_reg_dump(dev);
> +
> return IRQ_HANDLED;
> }
>
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Download attachment "signature.asc" of type "application/pgp-signature" (263 bytes)
Powered by blists - more mailing lists