[PATCH] can: flexcan: fix bus-off error state handling.

[PATCH] can: flexcan: fix bus-off error state handling.

[Andri Yngvason]

Making sure that the bus-off state gets passed to can_change_state().

Signed-off-by: Andri Yngvason <andri.yngvason@marel.com>
---
 drivers/net/can/flexcan.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 80c46ad..ee944ae 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -592,13 +592,12 @@ static int flexcan_poll_state(struct net_device *dev, u32 reg_esr)
 		rx_state = unlikely(reg_esr & FLEXCAN_ESR_RX_WRN) ?
 			   CAN_STATE_ERROR_WARNING : CAN_STATE_ERROR_ACTIVE;
 		new_state = max(tx_state, rx_state);
-	} else if (unlikely(flt == FLEXCAN_ESR_FLT_CONF_PASSIVE)) {
+	} else {
 		__flexcan_get_berr_counter(dev, &bec);
-		new_state = CAN_STATE_ERROR_PASSIVE;
+		new_state = flt == FLEXCAN_ESR_FLT_CONF_PASSIVE ?
+			    CAN_STATE_ERROR_PASSIVE : CAN_STATE_BUS_OFF;
 		rx_state = bec.rxerr >= bec.txerr ? new_state : 0;
 		tx_state = bec.rxerr <= bec.txerr ? new_state : 0;
-	} else {
-		new_state = CAN_STATE_BUS_OFF;
 	}
 
 	/* state hasn't changed */
-- 
1.9.1

Re: [PATCH] can: flexcan: fix bus-off error state handling.

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]

On 03/17/2015 02:03 PM, Andri Yngvason wrote:
> Making sure that the bus-off state gets passed to can_change_state().
> 
> Signed-off-by: Andri Yngvason <andri.yngvason@marel.com>

Applied to can with a minor change.

> ---
>  drivers/net/can/flexcan.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
> index 80c46ad..ee944ae 100644
> --- a/drivers/net/can/flexcan.c
> +++ b/drivers/net/can/flexcan.c
> @@ -592,13 +592,12 @@ static int flexcan_poll_state(struct net_device *dev, u32 reg_esr)
>  		rx_state = unlikely(reg_esr & FLEXCAN_ESR_RX_WRN) ?
>  			   CAN_STATE_ERROR_WARNING : CAN_STATE_ERROR_ACTIVE;
>  		new_state = max(tx_state, rx_state);
> -	} else if (unlikely(flt == FLEXCAN_ESR_FLT_CONF_PASSIVE)) {
> +	} else {
>  		__flexcan_get_berr_counter(dev, &bec);
> -		new_state = CAN_STATE_ERROR_PASSIVE;
> +		new_state = flt == FLEXCAN_ESR_FLT_CONF_PASSIVE ?
> +			    CAN_STATE_ERROR_PASSIVE : CAN_STATE_BUS_OFF;

converted this into a if...else

>  		rx_state = bec.rxerr >= bec.txerr ? new_state : 0;
>  		tx_state = bec.rxerr <= bec.txerr ? new_state : 0;
> -	} else {
> -		new_state = CAN_STATE_BUS_OFF;
>  	}
>  
>  	/* state hasn't changed */
> 

Thanks,
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]