Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee6f0988 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by David S. Miller
Browse files

can: c_can: disable one shot mode until driver is fixed 



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: default avatarJan Altenberg <jan@linutronix.de>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarKurt Van Dijck <kurt.van.dijck@eia.be>
Cc: Bhupesh Sharma <bhupesh.sharma@st.com>
Acked-by: default avatarWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53914b67

drivers/net/can/c_can/c_can.c

+4 −10
Original line number Diff line number Diff line
@@ -588,11 +588,6 @@ 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);
@@ -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;