Commit 3e5c291c authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Marc Kleine-Budde
Browse files

can: add CAN_ERR_CNT flag to notify availability of error counter 

Add a dedicated flag in uapi/linux/can/error.h to notify the userland
that fields data[6] and data[7] of the CAN error frame were
respectively populated with the tx and rx error counters.

For all driver tree-wide, set up this flags whenever needed.

Link: https://lore.kernel.org/all/20220719143550.3681-12-mailhol.vincent@wanadoo.fr


Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent e70a3263

drivers/net/can/c_can/c_can_main.c

+3 −3
Original line number Diff line number Diff line
@@ -952,14 +952,14 @@ static int c_can_handle_state_change(struct net_device *dev, 


	switch (error_type) {

	case C_CAN_NO_ERROR:

		cf->can_id |= CAN_ERR_CRTL;

		cf->can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;

		cf->data[1] = CAN_ERR_CRTL_ACTIVE;

		cf->data[6] = bec.txerr;

		cf->data[7] = bec.rxerr;

		break;

	case C_CAN_ERROR_WARNING:

		/* error warning state */

		cf->can_id |= CAN_ERR_CRTL;

		cf->can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;

		cf->data[1] = (bec.txerr > bec.rxerr) ?

			CAN_ERR_CRTL_TX_WARNING :

			CAN_ERR_CRTL_RX_WARNING;
@@ -969,7 +969,7 @@ static int c_can_handle_state_change(struct net_device *dev, 
		break;

	case C_CAN_ERROR_PASSIVE:

		/* error passive state */

		cf->can_id |= CAN_ERR_CRTL;

		cf->can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;

		if (rx_err_passive)

			cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;

		if (bec.txerr > 127)

drivers/net/can/cc770/cc770.c

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ static int cc770_err(struct net_device *dev, u8 status) 


	/* Use extended functions of the CC770 */

	if (priv->control_normal_mode & CTRL_EAF) {

		cf->can_id |= CAN_ERR_CNT;

		cf->data[6] = cc770_read_reg(priv, tx_error_counter);

		cf->data[7] = cc770_read_reg(priv, rx_error_counter);

	}

drivers/net/can/ctucanfd/ctucanfd_base.c

+3 −2
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static void ctucan_err_interrupt(struct net_device *ndev, u32 isr) 
		case CAN_STATE_ERROR_PASSIVE:

			priv->can.can_stats.error_passive++;

			if (skb) {

				cf->can_id |= CAN_ERR_CRTL;

				cf->can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;

				cf->data[1] = (bec.rxerr > 127) ?

						CAN_ERR_CRTL_RX_PASSIVE :

						CAN_ERR_CRTL_TX_PASSIVE;
@@ -858,7 +858,7 @@ static void ctucan_err_interrupt(struct net_device *ndev, u32 isr) 
		case CAN_STATE_ERROR_WARNING:

			priv->can.can_stats.error_warning++;

			if (skb) {

				cf->can_id |= CAN_ERR_CRTL;

				cf->can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;

				cf->data[1] |= (bec.txerr > bec.rxerr) ?

					CAN_ERR_CRTL_TX_WARNING :

					CAN_ERR_CRTL_RX_WARNING;
@@ -867,6 +867,7 @@ static void ctucan_err_interrupt(struct net_device *ndev, u32 isr) 
			}

			break;

		case CAN_STATE_ERROR_ACTIVE:

			cf->can_id |= CAN_ERR_CNT;

			cf->data[1] = CAN_ERR_CRTL_ACTIVE;

			cf->data[6] = bec.txerr;

			cf->data[7] = bec.rxerr;

drivers/net/can/grcan.c

+1 −0
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ static void grcan_err(struct net_device *dev, u32 sources, u32 status) 
				/* There are no others at this point */

				break;

			}

			cf.can_id |= CAN_ERR_CNT;

			cf.data[6] = txerr;

			cf.data[7] = rxerr;

			priv->can.state = state;

drivers/net/can/ifi_canfd/ifi_canfd.c

+2 −2
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int ifi_canfd_handle_state_change(struct net_device *ndev, 
	switch (new_state) {

	case CAN_STATE_ERROR_WARNING:

		/* error warning state */

		cf->can_id |= CAN_ERR_CRTL;

		cf->can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;

		cf->data[1] = (bec.txerr > bec.rxerr) ?

			CAN_ERR_CRTL_TX_WARNING :

			CAN_ERR_CRTL_RX_WARNING;
@@ -501,7 +501,7 @@ static int ifi_canfd_handle_state_change(struct net_device *ndev, 
		break;

	case CAN_STATE_ERROR_PASSIVE:

		/* error passive state */

		cf->can_id |= CAN_ERR_CRTL;

		cf->can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;

		cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;

		if (bec.txerr > 127)

			cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;