can: fix assignment of error location in CAN error messages
Subsystems (6)
PATCH 1/2 can: fix assignment of error location in CAN error messages
As Dan Carpenter reported in http://marc.info/?l=linux-can&m=144793696016187
the assignment of the error location in CAN error messages had some bit wise overlaps. Indeed the value to be assigned in data[3] is no bitfield but defines a single value which points to a location inside the CAN frame on the wire.
This patch fixes the assignments for the error locations in error messages.
--- drivers/net/can/c_can/c_can.c | 6 ++---- drivers/net/can/cc770/cc770.c | 2 +- drivers/net/can/flexcan.c | 4 ++-- drivers/net/can/m_can/m_can.c | 6 ++---- drivers/net/can/pch_can.c | 3 +-- drivers/net/can/rcar_can.c | 6 +++--- drivers/net/can/ti_hecc.c | 6 ++---- drivers/net/can/usb/kvaser_usb.c | 5 ++--- drivers/net/can/usb/usb_8dev.c | 3 +-- drivers/net/can/xilinx_can.c | 5 ++--- 10 files changed, 18 insertions(+), 28 deletions(-)
drivers/net/can/c_can/c_can.c +2 -4
@@ -975,8 +975,7 @@ static int c_can_handle_bus_err(struct net_device *dev,break ;case LEC_ACK_ERROR :netdev_dbg (dev,"ack error\n" ); - cf->data[3 ] |= (CAN_ERR_PROT_LOC_ACK | -CAN_ERR_PROT_LOC_ACK_DEL ); + cf->data[3 ] =CAN_ERR_PROT_LOC_ACK ;break ;case LEC_BIT1_ERROR :netdev_dbg (dev,"bit1 error\n" );
@@ -988,8 +987,7 @@ static int c_can_handle_bus_err(struct net_device *dev,break ;case LEC_CRC_ERROR :netdev_dbg (dev,"CRC error\n" ); - cf->data[3 ] |= (CAN_ERR_PROT_LOC_CRC_SEQ | -CAN_ERR_PROT_LOC_CRC_DEL ); + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ;break ;default :break ;
drivers/net/can/cc770/cc770.c +1 -1
@@ -578,7 +578,7 @@ static int cc770_err(struct net_device *dev, u8 status) cf->data[2 ] |=CAN_ERR_PROT_BIT0 ;break ;case STAT_LEC_CRC : - cf->data[3 ] |=CAN_ERR_PROT_LOC_CRC_SEQ ; + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ;break ; } }
drivers/net/can/flexcan.c +2 -2
@@ -535,13 +535,13 @@ static void do_bus_err(struct net_device *dev,if (reg_esr &FLEXCAN_ESR_ACK_ERR ) {netdev_dbg (dev,"ACK_ERR irq\n" ); cf->can_id |=CAN_ERR_ACK ; - cf->data[3 ] |=CAN_ERR_PROT_LOC_ACK ; + cf->data[3 ] =CAN_ERR_PROT_LOC_ACK ; tx_errors =1 ; }if (reg_esr &FLEXCAN_ESR_CRC_ERR ) {netdev_dbg (dev,"CRC_ERR irq\n" ); cf->data[2 ] |=CAN_ERR_PROT_BIT ; - cf->data[3 ] |=CAN_ERR_PROT_LOC_CRC_SEQ ; + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ; rx_errors =1 ; }if (reg_esr &FLEXCAN_ESR_FRM_ERR ) {
drivers/net/can/m_can/m_can.c +2 -4
@@ -500,8 +500,7 @@ static int m_can_handle_lec_err(struct net_device *dev,break ;case LEC_ACK_ERROR :netdev_dbg (dev,"ack error\n" ); - cf->data[3 ] |= (CAN_ERR_PROT_LOC_ACK | -CAN_ERR_PROT_LOC_ACK_DEL ); + cf->data[3 ] =CAN_ERR_PROT_LOC_ACK ;break ;case LEC_BIT1_ERROR :netdev_dbg (dev,"bit1 error\n" );
@@ -513,8 +512,7 @@ static int m_can_handle_lec_err(struct net_device *dev,break ;case LEC_CRC_ERROR :netdev_dbg (dev,"CRC error\n" ); - cf->data[3 ] |= (CAN_ERR_PROT_LOC_CRC_SEQ | -CAN_ERR_PROT_LOC_CRC_DEL ); + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ;break ;default :break ;
drivers/net/can/pch_can.c +1 -2
@@ -559,8 +559,7 @@ static void pch_can_error(struct net_device *ndev, u32 status) stats->rx_errors++;break ;case PCH_CRC_ERR : - cf->data[3 ] |=CAN_ERR_PROT_LOC_CRC_SEQ | -CAN_ERR_PROT_LOC_CRC_DEL ; + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ; priv->can.can_stats.bus_error++; stats->rx_errors++;break ;
drivers/net/can/rcar_can.c +3 -3
@@ -251,7 +251,7 @@ static void rcar_can_error(struct net_device *ndev) tx_errors++;writeb (~RCAR_CAN_ECSR_ADEF , &priv->regs->ecsr);if (skb) - cf->data[3 ] |=CAN_ERR_PROT_LOC_ACK_DEL ; + cf->data[3 ] =CAN_ERR_PROT_LOC_ACK_DEL ; }if (ecsr &RCAR_CAN_ECSR_BE0F ) {netdev_dbg (priv->ndev,"Bit Error (dominant)\n" );
@@ -272,7 +272,7 @@ static void rcar_can_error(struct net_device *ndev) rx_errors++;writeb (~RCAR_CAN_ECSR_CEF , &priv->regs->ecsr);if (skb) - cf->data[3 ] |=CAN_ERR_PROT_LOC_CRC_SEQ ; + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ; }if (ecsr &RCAR_CAN_ECSR_AEF ) {netdev_dbg (priv->ndev,"ACK Error\n" );
@@ -280,7 +280,7 @@ static void rcar_can_error(struct net_device *ndev)writeb (~RCAR_CAN_ECSR_AEF , &priv->regs->ecsr);if (skb) { cf->can_id |=CAN_ERR_ACK ; - cf->data[3 ] |=CAN_ERR_PROT_LOC_ACK ; + cf->data[3 ] =CAN_ERR_PROT_LOC_ACK ; } }if (ecsr &RCAR_CAN_ECSR_FEF ) {
drivers/net/can/ti_hecc.c +2 -4
@@ -737,13 +737,11 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, }if (err_status &HECC_CANES_CRCE ) {hecc_set_bit (priv,HECC_CANES ,HECC_CANES_CRCE ); - cf->data[3 ] |=CAN_ERR_PROT_LOC_CRC_SEQ | -CAN_ERR_PROT_LOC_CRC_DEL ; + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ; }if (err_status &HECC_CANES_ACKE ) {hecc_set_bit (priv,HECC_CANES ,HECC_CANES_ACKE ); - cf->data[3 ] |=CAN_ERR_PROT_LOC_ACK | -CAN_ERR_PROT_LOC_ACK_DEL ; + cf->data[3 ] =CAN_ERR_PROT_LOC_ACK ; } }
drivers/net/can/usb/kvaser_usb.c +2 -3
@@ -944,10 +944,9 @@ static void kvaser_usb_rx_error(const struct kvaser_usb *dev, cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_PROT ;if (es->leaf.error_factor &M16C_EF_ACKE ) - cf->data[3 ] |= (CAN_ERR_PROT_LOC_ACK ); + cf->data[3 ] =CAN_ERR_PROT_LOC_ACK ;if (es->leaf.error_factor &M16C_EF_CRCE ) - cf->data[3 ] |= (CAN_ERR_PROT_LOC_CRC_SEQ | -CAN_ERR_PROT_LOC_CRC_DEL ); + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ;if (es->leaf.error_factor &M16C_EF_FORME ) cf->data[2 ] |=CAN_ERR_PROT_FORM ;if (es->leaf.error_factor &M16C_EF_STFE )
drivers/net/can/usb/usb_8dev.c +1 -2
@@ -402,8 +402,7 @@ static void usb_8dev_rx_err_msg(struct usb_8dev_priv *priv,break ;case USB_8DEV_STATUSMSG_CRC : cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ; - cf->data[3 ] |=CAN_ERR_PROT_LOC_CRC_SEQ | -CAN_ERR_PROT_LOC_CRC_DEL ; + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ; rx_errors =1 ;break ;case USB_8DEV_STATUSMSG_BIT0 :
drivers/net/can/xilinx_can.c +2 -3
@@ -618,7 +618,7 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr) stats->tx_errors++;if (skb) { cf->can_id |=CAN_ERR_ACK ; - cf->data[3 ] |=CAN_ERR_PROT_LOC_ACK ; + cf->data[3 ] =CAN_ERR_PROT_LOC_ACK ; } }
@@ -654,8 +654,7 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr) stats->rx_errors++;if (skb) { cf->can_id |=CAN_ERR_PROT ; - cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ | -CAN_ERR_PROT_LOC_CRC_DEL ; + cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ; } } priv->can.can_stats.bus_error++;
Signature · 1 line
2.1.4
RFC PATCH 2/2 can: remove obsolete assignment for CAN protocol error type
The assignment 'cf->data[2] |= CAN_ERR_PROT_UNSPEC' used at CAN error message creation time is obsolete as CAN_ERR_PROT_UNSPEC is zero and cf->data[2] is initialized with zero in alloc_can_err_skb() anyway.
So we could either assign 'cf->data[2] = CAN_ERR_PROT_UNSPEC' correctly or we can remove the obsolete OR operation entirely.
--- drivers/net/can/bfin_can.c | 2 -- drivers/net/can/c_can/c_can.c | 1 - drivers/net/can/janz-ican3.c | 1 - drivers/net/can/m_can/m_can.c | 1 - drivers/net/can/rcar_can.c | 5 ++--- drivers/net/can/sja1000/sja1000.c | 1 - drivers/net/can/sun4i_can.c | 1 - drivers/net/can/ti_hecc.c | 1 - drivers/net/can/usb/ems_usb.c | 1 - drivers/net/can/usb/esd_usb2.c | 1 - drivers/net/can/usb/usb_8dev.c | 1 - drivers/net/can/xilinx_can.c | 4 +--- 12 files changed, 3 insertions(+), 17 deletions(-)
drivers/net/can/bfin_can.c +0 -2
@@ -501,8 +501,6 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status) cf->data[2 ] |=CAN_ERR_PROT_FORM ; else if (status & SER) cf->data[2] |= CAN_ERR_PROT_STUFF; - else - cf->data[2] |= CAN_ERR_PROT_UNSPEC; } priv->can.state = state;
drivers/net/can/c_can/c_can.c +0 -1
@@ -962,7 +962,6 @@ static int c_can_handle_bus_err(struct net_device *dev,* type of the last error to occur on the CAN bus */ cf->can_id |=CAN_ERR_PROT |CAN_ERR_BUSERROR ; - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ;switch (lec_type) {case LEC_STUFF_ERROR :
drivers/net/can/janz-ican3.c +0 -1
@@ -1096,7 +1096,6 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg) cf->data[2 ] |=CAN_ERR_PROT_STUFF ;break ;default : - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ; cf->data[3 ] = ecc &ECC_SEG ;break ; }
drivers/net/can/m_can/m_can.c +0 -1
@@ -487,7 +487,6 @@ static int m_can_handle_lec_err(struct net_device *dev,* type of the last error to occur on the CAN bus */ cf->can_id |=CAN_ERR_PROT |CAN_ERR_BUSERROR ; - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ;switch (lec_type) {case LEC_STUFF_ERROR :
drivers/net/can/rcar_can.c +2 -3
@@ -241,10 +241,9 @@ static void rcar_can_error(struct net_device *ndev)u8 ecsr;netdev_dbg (priv->ndev,"Bus error interrupt:\n" ); -if (skb) { +if (skb) cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_PROT ; - cf->data[2 ] =CAN_ERR_PROT_UNSPEC ; - } + ecsr =readb (&priv->regs->ecsr);if (ecsr &RCAR_CAN_ECSR_ADEF ) {netdev_dbg (priv->ndev,"ACK Delimiter Error\n" );
drivers/net/can/sja1000/sja1000.c +0 -1
@@ -446,7 +446,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) cf->data[2 ] |=CAN_ERR_PROT_STUFF ;break ;default : - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ; cf->data[3 ] = ecc &ECC_SEG ;break ; }
drivers/net/can/sun4i_can.c +0 -1
@@ -575,7 +575,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) cf->data[2 ] |=CAN_ERR_PROT_STUFF ;break ;default : - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ; cf->data[3 ] = (ecc &SUN4I_STA_ERR_SEG_CODE ) >>16 ;break ;
drivers/net/can/ti_hecc.c +0 -1
@@ -722,7 +722,6 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,if (err_status &HECC_BUS_ERROR ) { ++priv->can.can_stats.bus_error; cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_PROT ; - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ;if (err_status &HECC_CANES_FE ) {hecc_set_bit (priv,HECC_CANES ,HECC_CANES_FE ); cf->data[2 ] |=CAN_ERR_PROT_FORM ;
drivers/net/can/usb/ems_usb.c +0 -1
@@ -377,7 +377,6 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg) cf->data[2 ] |=CAN_ERR_PROT_STUFF ;break ;default : - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ; cf->data[3 ] = ecc &SJA1000_ECC_SEG ;break ; }
drivers/net/can/usb/esd_usb2.c +0 -1
@@ -282,7 +282,6 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, cf->data[2 ] |=CAN_ERR_PROT_STUFF ;break ;default : - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ; cf->data[3 ] = ecc &SJA1000_ECC_SEG ;break ; }
drivers/net/can/usb/usb_8dev.c +0 -1
@@ -401,7 +401,6 @@ static void usb_8dev_rx_err_msg(struct usb_8dev_priv *priv, tx_errors =1 ;break ;case USB_8DEV_STATUSMSG_CRC : - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ; cf->data[3 ] =CAN_ERR_PROT_LOC_CRC_SEQ ; rx_errors =1 ;break ;
drivers/net/can/xilinx_can.c +1 -3
@@ -608,10 +608,8 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr)/* Check for error interrupt */ if (isr &XCAN_IXR_ERROR_MASK ) { -if (skb) { +if (skb) cf->can_id |=CAN_ERR_PROT |CAN_ERR_BUSERROR ; - cf->data[2 ] |=CAN_ERR_PROT_UNSPEC ; - }/* Check for Ack error interrupt */ if (err_status &XCAN_ESR_ACKER_MASK ) {
Signature · 1 line
2.1.4
Quoted 9 lines · Oliver Hartkopp
As Dan Carpenter reported in http://marc.info/?l=linux-can&m=144793696016187
the assignment of the error location in CAN error messages had some bit wise overlaps. Indeed the value to be assigned in data[3] is no bitfield but defines a single value which points to a location inside the CAN frame on the wire.This patch fixes the assignments for the error locations in error messages.
Reported-by Dan Carpenter <[email protected]>Signed-off-by Oliver Hartkopp <[email protected]>
Applied both to the can tree.
Thanks,
Marc
Signature · 4 lines
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 |