Commit 988d4222 authored by Dario Binacchi's avatar Dario Binacchi Committed by Marc Kleine-Budde
Browse files

can: m_can: m_can_handle_lec_err(): fix {rx,tx}_errors statistics 



The m_can_handle_lec_err() function was incorrectly incrementing only the
receive error counter, even in cases of bit or acknowledgment errors that
occur during transmission.

Fix the issue by incrementing the appropriate counter based on the
type of error.

Fixes: e0d1f481 ("can: m_can: add Bosch M_CAN controller support")
Signed-off-by: default avatarDario Binacchi <dario.binacchi@amarulasolutions.com>
Link: https://patch.msgid.link/20241122221650.633981-7-dario.binacchi@amarulasolutions.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ef5034ae

drivers/net/can/m_can/m_can.c

+23 −10
Original line number Diff line number Diff line
@@ -695,47 +695,60 @@ static int m_can_handle_lec_err(struct net_device *dev, 
	u32 timestamp = 0;



	cdev->can.can_stats.bus_error++;

	stats->rx_errors++;



	/* propagate the error condition to the CAN stack */

	skb = alloc_can_err_skb(dev, &cf);

	if (unlikely(!skb))

		return 0;



	/* check for 'last error code' which tells us the

	 * type of the last error to occur on the CAN bus

	 */

	if (likely(skb))

		cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;



	switch (lec_type) {

	case LEC_STUFF_ERROR:

		netdev_dbg(dev, "stuff error\n");

		stats->rx_errors++;

		if (likely(skb))

			cf->data[2] |= CAN_ERR_PROT_STUFF;

		break;

	case LEC_FORM_ERROR:

		netdev_dbg(dev, "form error\n");

		stats->rx_errors++;

		if (likely(skb))

			cf->data[2] |= CAN_ERR_PROT_FORM;

		break;

	case LEC_ACK_ERROR:

		netdev_dbg(dev, "ack error\n");

		stats->tx_errors++;

		if (likely(skb))

			cf->data[3] = CAN_ERR_PROT_LOC_ACK;

		break;

	case LEC_BIT1_ERROR:

		netdev_dbg(dev, "bit1 error\n");

		stats->tx_errors++;

		if (likely(skb))

			cf->data[2] |= CAN_ERR_PROT_BIT1;

		break;

	case LEC_BIT0_ERROR:

		netdev_dbg(dev, "bit0 error\n");

		stats->tx_errors++;

		if (likely(skb))

			cf->data[2] |= CAN_ERR_PROT_BIT0;

		break;

	case LEC_CRC_ERROR:

		netdev_dbg(dev, "CRC error\n");

		stats->rx_errors++;

		if (likely(skb))

			cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;

		break;

	default:

		break;

	}



	if (unlikely(!skb))

		return 0;



	if (cdev->is_peripheral)

		timestamp = m_can_get_timestamp(cdev);