From: appana.durga.rao@xilinx.com (Kedareswara rao Appana)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] can: xilinx: fix bug in bus error handling
Date: Thu, 22 Oct 2015 10:16:03 +0530 [thread overview]
Message-ID: <1445489163-11045-2-git-send-email-appanad@xilinx.com> (raw)
In-Reply-To: <1445489163-11045-1-git-send-email-appanad@xilinx.com>
Simply resetting the peripheral on bus off condition is not enough,
Because we also need to re-initialize the whole device.
This patch fixes this issue.
Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
---
drivers/net/can/xilinx_can.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 055d6f3..9aeb85f 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -529,6 +529,8 @@ static int xcan_rx(struct net_device *ndev)
return 1;
}
+static void xcan_chip_stop(struct net_device *ndev);
+
/**
* xcan_err_interrupt - error frame Isr
* @ndev: net_device pointer
@@ -558,8 +560,9 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr)
if (isr & XCAN_IXR_BSOFF_MASK) {
priv->can.state = CAN_STATE_BUS_OFF;
priv->can.can_stats.bus_off++;
- /* Leave device in Config Mode in bus-off state */
- priv->write_reg(priv, XCAN_SRR_OFFSET, XCAN_SRR_RESET_MASK);
+ /* Re-initialize the whole device in bus-off state */
+ xcan_chip_stop(ndev);
+ xcan_chip_start(ndev);
can_bus_off(ndev);
if (skb)
cf->can_id |= CAN_ERR_BUSOFF;
--
2.1.2
next prev parent reply other threads:[~2015-10-22 4:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-22 4:46 [PATCH 1/2] can: xilinx: use readl/writel instead of ioread/iowrite Kedareswara rao Appana
2015-10-22 4:46 ` Kedareswara rao Appana [this message]
2015-10-22 16:33 ` [PATCH 2/2] can: xilinx: fix bug in bus error handling Sören Brinkmann
2015-10-23 5:21 ` Appana Durga Kedareswara Rao
2015-10-22 8:14 ` [PATCH 1/2] can: xilinx: use readl/writel instead of ioread/iowrite Arnd Bergmann
2015-10-22 8:21 ` Marc Kleine-Budde
2015-10-22 8:39 ` Appana Durga Kedareswara Rao
2015-10-22 8:58 ` Arnd Bergmann
2015-10-25 20:32 ` Marc Kleine-Budde
2015-10-26 1:25 ` Arnd Bergmann
2015-10-22 8:34 ` Appana Durga Kedareswara Rao
2015-10-22 9:02 ` Arnd Bergmann
2015-10-22 9:49 ` Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445489163-11045-2-git-send-email-appanad@xilinx.com \
--to=appana.durga.rao@xilinx.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).