aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDong Aisheng <b29396@freescale.com>2011-11-16 17:46:59 +0800
committerEric Miao <eric.miao@linaro.org>2011-12-01 11:36:37 +0800
commit06a1a475c0e6356361ecab4e721ba397d63585aa (patch)
tree065e13f67f29ee58e0b2d43176a0c6b4c5f34c9f
parent961da8a994b800acb966b8844a800d811bcc8185 (diff)
ENGR00162364 flexcan: fix endless errors causing system hang
Clear state error to avoid ednless state error if error happens which will call napi_schedule() each time, seems a little high load, to cause system hang. Signed-off-by: Dong Aisheng <b29396@freescale.com>
-rw-r--r--drivers/net/can/flexcan.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 3111365dc30..c216a0bd111 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -435,11 +435,15 @@ static void do_state(struct net_device *dev,
static int flexcan_poll_state(struct net_device *dev, u32 reg_esr)
{
struct flexcan_priv *priv = netdev_priv(dev);
+ struct flexcan_regs __iomem *regs = priv->base;
struct sk_buff *skb;
struct can_frame *cf;
enum can_state new_state;
int flt;
+ /* clear state error if any (write 1 to clear)*/
+ writel(reg_esr, &regs->esr);
+
flt = reg_esr & FLEXCAN_ESR_FLT_CONF_MASK;
if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {
if (likely(!(reg_esr & (FLEXCAN_ESR_TX_WRN |