[PATCH 1/2 V3] can: c_can: disable one shot mode until driver is fixed
From: Marc Kleine-Budde <hidden>
Date: 2011-03-24 12:34:32
Subsystem:
can network drivers, the rest · Maintainers:
Marc Kleine-Budde, Vincent Mailhol, Linus Torvalds
This patch disables the one shot mode, until the driver has been fixed and tested to support it.
I'm quite sure I've seen a situation where msg_obj 17 "seemed" to be pending, while msg_obj 18 and 19 already have been transmitted. But in that case, I enabled ONESHOT for the can interface, which enables the DA mode (automatic retransmission is disabled).
Reported-by: Jan Altenberg <redacted> Signed-off-by: Marc Kleine-Budde <redacted> Signed-off-by: Kurt Van Dijck <kurt.van.dijck-/BeEPy95v10@public.gmane.org> Cc: Bhupesh Sharma <redacted> Acked-by: Wolfgang Grandegger <redacted> --- Changes since v2: add Wolfgang's Ack. drivers/net/can/c_can/c_can.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 110eda0..d0bffb0 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c@@ -588,14 +588,9 @@ static void c_can_chip_config(struct net_device *dev) { struct c_can_priv *priv = netdev_priv(dev); - if (priv->can.ctrlmode & CAN_CTRLMODE_ONE_SHOT) - /* disable automatic retransmission */ - priv->write_reg(priv, &priv->regs->control, - CONTROL_DISABLE_AR); - else - /* enable automatic retransmission */ - priv->write_reg(priv, &priv->regs->control, - CONTROL_ENABLE_AR); + /* enable automatic retransmission */ + priv->write_reg(priv, &priv->regs->control, + CONTROL_ENABLE_AR); if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY & CAN_CTRLMODE_LOOPBACK)) {
@@ -1112,8 +1107,7 @@ struct net_device *alloc_c_can_dev(void) priv->can.bittiming_const = &c_can_bittiming_const; priv->can.do_set_mode = c_can_set_mode; priv->can.do_get_berr_counter = c_can_get_berr_counter; - priv->can.ctrlmode_supported = CAN_CTRLMODE_ONE_SHOT | - CAN_CTRLMODE_LOOPBACK | + priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_BERR_REPORTING;
--
1.7.2.3