@@ -390,7 +390,6 @@ static int ifi_canfd_handle_lec_err(struct net_device *ndev)
return 0;
priv->can.can_stats.bus_error++;
- stats->rx_errors++;
/* Propagate the error condition to the CAN stack. */
skb = alloc_can_err_skb(ndev, &cf);
@@ -400,26 +399,40 @@ static int ifi_canfd_handle_lec_err(struct net_device *ndev)
/* Read the error counter register and check for new errors. */
cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
- if (errctr & IFI_CANFD_ERROR_CTR_OVERLOAD_FIRST)
+ if (errctr & IFI_CANFD_ERROR_CTR_OVERLOAD_FIRST) {
cf->data[2] |= CAN_ERR_PROT_OVERLOAD;
+ stats->rx_errors++;
+ }
- if (errctr & IFI_CANFD_ERROR_CTR_ACK_ERROR_FIRST)
+ if (errctr & IFI_CANFD_ERROR_CTR_ACK_ERROR_FIRST) {
cf->data[3] = CAN_ERR_PROT_LOC_ACK;
+ stats->tx_errors++;
+ }
- if (errctr & IFI_CANFD_ERROR_CTR_BIT0_ERROR_FIRST)
+ if (errctr & IFI_CANFD_ERROR_CTR_BIT0_ERROR_FIRST) {
cf->data[2] |= CAN_ERR_PROT_BIT0;
+ stats->tx_errors++;
+ }
- if (errctr & IFI_CANFD_ERROR_CTR_BIT1_ERROR_FIRST)
+ if (errctr & IFI_CANFD_ERROR_CTR_BIT1_ERROR_FIRST) {
cf->data[2] |= CAN_ERR_PROT_BIT1;
+ stats->tx_errors++;
+ }
- if (errctr & IFI_CANFD_ERROR_CTR_STUFF_ERROR_FIRST)
+ if (errctr & IFI_CANFD_ERROR_CTR_STUFF_ERROR_FIRST) {
cf->data[2] |= CAN_ERR_PROT_STUFF;
+ stats->rx_errors++;
+ }
- if (errctr & IFI_CANFD_ERROR_CTR_CRC_ERROR_FIRST)
+ if (errctr & IFI_CANFD_ERROR_CTR_CRC_ERROR_FIRST) {
cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;
+ stats->rx_errors++;
+ }
- if (errctr & IFI_CANFD_ERROR_CTR_FORM_ERROR_FIRST)
+ if (errctr & IFI_CANFD_ERROR_CTR_FORM_ERROR_FIRST) {
cf->data[2] |= CAN_ERR_PROT_FORM;
+ stats->rx_errors++;
+ }
/* Reset the error counter, ack the IRQ and re-enable the counter. */
writel(IFI_CANFD_ERROR_CTR_ER_RESET, priv->base + IFI_CANFD_ERROR_CTR);
The ifi_canfd_handle_lec_err() function was incorrectly incrementing only the receive error counter, even in cases of bit or acknowledgment errors that occur during transmission. The patch fixes the issue by incrementing the appropriate counter based on the type of error. Fixes: 5bbd655a8bd0 ("can: ifi: Add more detailed error reporting") Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- drivers/net/can/ifi_canfd/ifi_canfd.c | 29 +++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)